diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-12-28 02:26:34 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-12-28 02:26:34 +0000 |
| commit | aff26148a2444130a4418fbfbe75501bbda94cb8 (patch) | |
| tree | ab2811862c61544de469083f4b3a7f75f26247e8 | |
| parent | 7b673c5ff4ac992ad6877fc8beb9001766a720c5 (diff) | |
More fixes. Should be 100% working by now ;P
| -rw-r--r-- | hardinfo2/benchmark.conf | 16 | ||||
| -rw-r--r-- | hardinfo2/shell.c | 11 |
2 files changed, 15 insertions, 12 deletions
diff --git a/hardinfo2/benchmark.conf b/hardinfo2/benchmark.conf index 56297777..e4d320e1 100644 --- a/hardinfo2/benchmark.conf +++ b/hardinfo2/benchmark.conf @@ -1,15 +1,15 @@ [ZLib] # RAM:1024,Board:GA-7NNXP,OS:Linux 2.6.15 -AMD Athlon XP 3200+=4.33 +AMD Athlon XP 3200+=4.33 # RAM:512,Board:Toshiba M45-S165,OS:Linux 2.6.15,Compiler:GCC 3.3.5 Intel Celeron M 1.5GHz=5.63 AMD Athlon XP 2200+=7.38 # RAM:128,Board:XingLing,OS:Linux 2.4.20 -Intel Pentium 200MHz=117.79 +Intel Pentium 200MHz=117.79 # RAM:1024,Board:GA-7NNXP,OS:Linux 2.6.15 -Valgrind/AMD Athlon XP 3200+=155.91 +Valgrind/AMD Athlon XP 3200+=155.91 # RAM:32,Board:Toshiba Libretto 50CT,OS:Linux 2.4.20 -Intel Pentium 75MHz=173.06 +Intel Pentium 75MHz=173.06 [Fibonacci] # RAM:1024,Board:GA-7NNXP,OS:Linux 2.6.15 @@ -18,18 +18,18 @@ AMD Athlon XP 3200+=7.34 # RAM:768,Board:Toshiba M45-S165,OS:Linux 2.6.17,Compiler:GCC 4.1.2 Intel Celeron M 1.5GHz=8.064 # RAM:128,Board:XingLing,OS:Linux 2.4.20 -#Intel Pentium 200MHz=35.02 +#Intel Pentium 200MHz=35.02 # RAM:32,Board:Toshiba Libretto 50CT,OS:Linux 2.4.20 -#Intel Pentium 75MHz=110.20 +#Intel Pentium 75MHz=110.20 # RAM:1024,Board:GA-7NNXP,OS:Linux 2.6.15 -#Valgrind/AMD Athlon XP 3200+=164.92 +#Valgrind/AMD Athlon XP 3200+=164.92 [MD5] # RAM:512,Board:Toshiba M45-S165,OS:Linux 2.6.15,Compiler:GCC 3.3.5 Intel Celeron M 1.5GHz=3.42 # RAM:1024,Board:GA-7NNXP,OS:Linux 2.6.15 -AMD Athlon XP 3200+=5.04 +AMD Athlon XP 3200+=5.04 [SHA1] # RAM:1024,Board:GA-7NNXP,OS:Linux 2.6.15 diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 9ceea6a2..96458758 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -557,7 +557,7 @@ update_field(gpointer data) if (iter) { GtkTreeStore *store = GTK_TREE_STORE(shell->info->model); - gtk_tree_store_set(store, iter, INFO_TREE_COL_VALUE, value, -1); + gtk_tree_store_set(store, iter, INFO_TREE_COL_VALUE, g_strchug(value), -1); g_free(value); return TRUE; @@ -754,7 +754,7 @@ group_handle_normal(GKeyFile * key_file, ShellModuleEntry * entry, } else { gtk_tree_store_append(store, &child, &parent); } - gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, value, -1); + gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, g_strchug(value), -1); strend(key, '#'); @@ -802,7 +802,7 @@ moreinfo_handle_normal(GKeyFile * key_file, gchar * group, gchar ** keys) strend(key, '#'); gtk_tree_store_append(store, &child, &parent); - gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, value, + gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, g_strchug(value), INFO_TREE_COL_NAME, key, -1); } @@ -858,7 +858,8 @@ update_progress() cur = 100 - 100 * atof(tmp) / maxv + 100 - maxp; - gtk_tree_store_set(store, &iter, INFO_TREE_COL_PROGRESS, cur, -1); + gtk_tree_store_set(store, &iter, + INFO_TREE_COL_PROGRESS, cur, -1); g_free(tmp); } while (gtk_tree_model_iter_next(model, &iter)); @@ -1094,6 +1095,8 @@ info_tree_new(gboolean extra) gtk_tree_view_column_pack_start(column, cr_progress, TRUE); gtk_tree_view_column_add_attribute(column, cr_progress, "value", INFO_TREE_COL_PROGRESS); + gtk_tree_view_column_add_attribute(column, cr_progress, "text", + INFO_TREE_COL_VALUE); gtk_tree_view_column_set_visible(column, FALSE); if (!extra) { |