Fix segfaults, cleanups.

6 files changed, 21 insertions, 11 deletions

diff --git a/hardinfo2/arch/common/languages.h b/hardinfo2/arch/common/languages.h
index 082a2433..afadbae1 100644
--- a/hardinfo2/arch/common/languages.h
+++ b/hardinfo2/arch/common/languages.h
@@ -15,6 +15,7 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+
 void
 scan_languages(OperatingSystem * os)
 {
diff --git a/hardinfo2/arch/linux/common/devmemory.h b/hardinfo2/arch/linux/common/devmemory.h
index c7ffdc08..0adea960 100644
--- a/hardinfo2/arch/linux/common/devmemory.h
+++ b/hardinfo2/arch/linux/common/devmemory.h
@@ -48,7 +48,7 @@ static void __scan_memory()
         
         tmp = g_strconcat(lginterval,
                           "LoadGraphInterval$", newkeys[0], "=500\n",
-                          "UpdateInterval$", newkeys[0], "=500\n", NULL);
+                          "UpdateInterval$", newkeys[0], "=1000\n", NULL);
         g_free(lginterval);
         lginterval = tmp;
 
diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/hardinfo2/arch/linux/common/inputdevices.h
index 0742bb3b..1a5baff8 100644
--- a/hardinfo2/arch/linux/common/inputdevices.h
+++ b/hardinfo2/arch/linux/common/inputdevices.h
@@ -22,8 +22,6 @@ static gboolean
 remove_input_devices(gpointer key, gpointer value, gpointer data)
 {
     if (!strncmp((gchar *) key, "INP", 3)) {
-	g_free((gchar *) key);
-	g_free((GtkTreeIter *) value);
 	return TRUE;
     }
 
diff --git a/hardinfo2/arch/linux/common/usb.h b/hardinfo2/arch/linux/common/usb.h
index 606bb0fb..d59f5f01 100644
--- a/hardinfo2/arch/linux/common/usb.h
+++ b/hardinfo2/arch/linux/common/usb.h
@@ -20,11 +20,6 @@ static gboolean
 remove_usb_devices(gpointer key, gpointer value, gpointer data)
 {
     if (!strncmp((gchar *) key, "USB", 3)) {
-	GtkTreeIter *iter = (GtkTreeIter *) data;
-
-	g_free((gchar *) value);
-	g_free(iter);
-
 	return TRUE;
     }
     return FALSE;
diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c
index 9be3dcba..b1676b0f 100644
--- a/hardinfo2/computer.c
+++ b/hardinfo2/computer.c
@@ -35,6 +35,7 @@ enum {
     COMPUTER_SUMMARY,
     COMPUTER_OPERATING_SYSTEM,
     COMPUTER_KERNEL_MODULES,
+    COMPUTER_BOOTS,
     COMPUTER_LANGUAGE,
     COMPUTER_FILESYSTEMS,
     COMPUTER_SHARES,
@@ -47,6 +48,7 @@ enum {
 gchar *callback_summary();
 gchar *callback_os();
 gchar *callback_modules();
+gchar *callback_boots();
 gchar *callback_locales();
 gchar *callback_fs();
 gchar *callback_shares();
@@ -58,6 +60,7 @@ gchar *callback_users();
 void scan_summary(gboolean reload);
 void scan_os(gboolean reload);
 void scan_modules(gboolean reload);
+void scan_boots(gboolean reload);
 void scan_locales(gboolean reload);
 void scan_fs(gboolean reload);
 void scan_shares(gboolean reload);
@@ -69,6 +72,7 @@ static ModuleEntry entries[] = {
     { "Summary",		"summary.png",		callback_summary,	scan_summary },
     { "Operating System",	"os.png",		callback_os,		scan_os },
     { "Kernel Modules",		"module.png",		callback_modules,	scan_modules },
+    { "Boots",			"boot.png",		callback_boots,		scan_boots },
     { "Languages",		"language.png",		callback_locales,	scan_locales },
     { "Filesystems",		"dev_removable.png",	callback_fs,		scan_fs },
     { "Shared Directories",	"shares.png",		callback_shares,	scan_shares },
@@ -155,9 +159,16 @@ void scan_modules(gboolean reload)
     SCAN_END();
 }
 
+void scan_boots(gboolean reload)
+{
+    SCAN_START();
+    SCAN_END();
+}
+
 void scan_locales(gboolean reload)
 {
     SCAN_START();
+    scan_os(FALSE);
     scan_languages(computer->os);
     SCAN_END();
 }
@@ -271,6 +282,11 @@ gchar *callback_modules()
                            module_list);
 }
 
+gchar *callback_boots()
+{
+    return g_strdup("[Duh]\nNot implemented yet=\n");
+}
+
 gchar *callback_locales()
 {
     return g_strdup_printf("[$ShellParam$]\n"
diff --git a/hardinfo2/util.c b/hardinfo2/util.c
index c0b7d35e..ecd2b6fa 100644
--- a/hardinfo2/util.c
+++ b/hardinfo2/util.c
@@ -816,9 +816,9 @@ static gboolean __idle_free_do(gpointer ptr)
 
 gpointer idle_free(gpointer ptr)
 {
-    DEBUG("Will free mem @ %p in 5000ms", ptr);
+    DEBUG("Will free mem @ %p in 10000ms", ptr);
     
-    g_timeout_add(5000, __idle_free_do, ptr);
+    g_timeout_add(10000, __idle_free_do, ptr);
     
     return ptr;
 }
@@ -834,7 +834,7 @@ void module_entry_scan_all_except(ModuleEntry *entries, gint except_entry)
         if (i == except_entry)
             continue;
             
-        shell_status_update(idle_free(g_strdup_printf("Scanning: %s...", entry.name)));
+        shell_status_update(idle_free(g_strdup_printf("<b>Scanning:</b> %s...", entry.name)));
         
         if ((scan_callback = entry.scan_callback)) {
             scan_callback(FALSE);