diff options
| -rw-r--r-- | hardinfo2/arch/common/languages.h | 12 | ||||
| -rw-r--r-- | hardinfo2/computer.c | 4 | ||||
| -rw-r--r-- | hardinfo2/computer.h | 2 | ||||
| -rw-r--r-- | hardinfo2/devices.c | 2 | ||||
| -rw-r--r-- | hardinfo2/pixmaps/inputdevices.png | bin | 0 -> 1242 bytes | |||
| -rw-r--r-- | hardinfo2/pixmaps/language.png | bin | 1210 -> 950 bytes | |||
| -rw-r--r-- | hardinfo2/shell.c | 8 | ||||
| -rw-r--r-- | hardinfo2/syncmanager.c | 2 | ||||
| -rw-r--r-- | hardinfo2/util.c | 12 |
9 files changed, 26 insertions, 16 deletions
diff --git a/hardinfo2/arch/common/languages.h b/hardinfo2/arch/common/languages.h index afadbae1..786b829f 100644 --- a/hardinfo2/arch/common/languages.h +++ b/hardinfo2/arch/common/languages.h @@ -66,6 +66,7 @@ scan_languages(OperatingSystem * os) retval = g_strdup_printf("%s$%s$%s=%s\n", retval, name, name, title); +#define FIELD(f) f ? f : "(Unknown)" currlocale = g_strdup_printf("[Locale Information]\n" "Name=%s (%s)\n" "Source=%s\n" @@ -75,10 +76,13 @@ scan_languages(OperatingSystem * os) "Territory=%s\n" "Revision=%s\n" "Date=%s\n" - "Codeset=%s\n", name, title, - source, address, email, language, - territory, revision, date, - codeset); + "Codeset=%s\n", + FIELD(name), FIELD(title), + FIELD(source), FIELD(address), + FIELD(email), FIELD(language), + FIELD(territory), FIELD(revision), + FIELD(date), FIELD(codeset)); +#undef FIELD g_hash_table_insert(moreinfo, g_strdup(name), currlocale); diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 817282c0..cf20c6d6 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -101,6 +101,7 @@ static Computer *computer = NULL; #include <arch/this/nfs.h> #include <arch/this/net.h> #include <arch/common/users.h> +#include <arch/this/boots.h> gchar * hi_more_info(gchar * entry) @@ -162,6 +163,7 @@ void scan_modules(gboolean reload) void scan_boots(gboolean reload) { SCAN_START(); + scan_boots_real(); SCAN_END(); } @@ -284,7 +286,7 @@ gchar *callback_modules() gchar *callback_boots() { - return g_strdup("[Duh]\nNot implemented yet=\n"); + return g_strdup(computer->os->boots); } gchar *callback_locales() diff --git a/hardinfo2/computer.h b/hardinfo2/computer.h index 590ab88b..a6956122 100644 --- a/hardinfo2/computer.h +++ b/hardinfo2/computer.h @@ -136,6 +136,8 @@ struct _OperatingSystem { gchar *desktop; gchar *username; + + gchar *boots; }; struct _MemoryInfo { diff --git a/hardinfo2/devices.c b/hardinfo2/devices.c index 87fa1999..76049068 100644 --- a/hardinfo2/devices.c +++ b/hardinfo2/devices.c @@ -67,7 +67,7 @@ static ModuleEntry entries[] = { {"Printers", "printer.png", callback_printers, scan_printers,}, {"Battery", "battery.png", callback_battery, scan_battery}, {"Sensors", "therm.png", callback_sensors, scan_sensors}, - {"Input Devices", "keyboard.png", callback_input, scan_input}, + {"Input Devices", "inputdevices.png", callback_input, scan_input}, {"Storage", "hdd.png", callback_storage, scan_storage}, { NULL } }; diff --git a/hardinfo2/pixmaps/inputdevices.png b/hardinfo2/pixmaps/inputdevices.png Binary files differnew file mode 100644 index 00000000..985bcde5 --- /dev/null +++ b/hardinfo2/pixmaps/inputdevices.png diff --git a/hardinfo2/pixmaps/language.png b/hardinfo2/pixmaps/language.png Binary files differindex 38b36b48..ed0480b1 100644 --- a/hardinfo2/pixmaps/language.png +++ b/hardinfo2/pixmaps/language.png diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 2f67e3e7..228ce9ee 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -802,8 +802,8 @@ group_handle_special(GKeyFile * key_file, ShellModuleEntry * entry, gtk_tree_store_set(GTK_TREE_STORE(shell->info->model), iter, INFO_TREE_COL_PBUF, icon_cache_get_pixbuf_at_size(file, - 24, - 24), + 22, + 22), -1); g_free(file); } @@ -1010,9 +1010,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) /* recreate the iter hash table */ if (!reload) { if (update_tbl) { - DEBUG("cleaning update_tbl"); - g_hash_table_foreach_remove(update_tbl, (GHRFunc) gtk_true, - NULL); + g_hash_table_foreach_remove(update_tbl, (GHRFunc) gtk_true, NULL); } else { update_tbl = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); diff --git a/hardinfo2/syncmanager.c b/hardinfo2/syncmanager.c index c99b134f..72e338d0 100644 --- a/hardinfo2/syncmanager.c +++ b/hardinfo2/syncmanager.c @@ -66,7 +66,7 @@ static GQuark err_quark; #define XMLRPC_SERVER_URI "http://hardinfo.berlios.de/xmlrpc/" #define XMLRPC_SERVER_API_VERSION 1 -#define LABEL_SYNC_DEFAULT "<big><b>Synchronize with Central Database</b></big>\n" \ +#define LABEL_SYNC_DEFAULT "<big><b>Synchronize with Central Database</b></big>\n" \ "The following information may be synchronized " \ "with the HardInfo central database." #define LABEL_SYNC_SYNCING "<big><b>Synchronizing</b></big>\n" \ diff --git a/hardinfo2/util.c b/hardinfo2/util.c index 713e2c6f..27e3758d 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -411,8 +411,9 @@ void open_url(gchar * url) const gchar *browsers[] = { "xdg-open", "gnome-open", "kfmclient openURL", "sensible-browser", "firefox", "epiphany", - "galeon", "mozilla", "opera", "konqueror", - "netscape", "links -g", NULL + "iceweasel", "seamonkey", "galeon", "mozilla", + "opera", "konqueror", "netscape", "links -g", + NULL }; gint i; @@ -623,7 +624,8 @@ ModuleAbout *module_get_about(ShellModule *module) { ModuleAbout *(*get_about)(void); - if (g_module_symbol(module->dll, "hi_module_get_about", (gpointer) &get_about)) { + if (g_module_symbol(module->dll, "hi_module_get_about", + (gpointer) &get_about)) { return get_about(); } @@ -907,9 +909,10 @@ void module_entry_scan_all_except(ModuleEntry *entries, gint except_entry) { ModuleEntry entry; gint i = 0; - void (*scan_callback)(gboolean reload); + shell_view_set_enabled(FALSE); + for (entry = entries[0]; entry.name; entry = entries[++i]) { if (i == except_entry) continue; @@ -921,6 +924,7 @@ void module_entry_scan_all_except(ModuleEntry *entries, gint except_entry) } } + shell_view_set_enabled(TRUE); shell_status_update("Done."); } |
