From 437e43308bc69e6d40d8252bd932276e2ba68a8e Mon Sep 17 00:00:00 2001
From: 05356787 <05356787@localhost.localdomain>
Date: Thu, 30 Oct 2008 08:48:41 -0200
Subject: Allow adding more information per column

---
 hardinfo2/arch/linux/common/net.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'hardinfo2/arch/linux/common')

diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h
index de978ee1..23cfa9da 100644
--- a/hardinfo2/arch/linux/common/net.h
+++ b/hardinfo2/arch/linux/common/net.h
@@ -314,7 +314,7 @@ static void scan_net_interfaces_24(void)
 	    gint trash;
 	    gchar ifacename[16];
 	    gchar *buf = buffer;
-	    gchar *iface_type, *iface_icon, *ip;
+	    gchar *iface_type, *iface_icon;
 	    gint i;
 
 	    buf = g_strstrip(buf);
@@ -340,13 +340,11 @@ static void scan_net_interfaces_24(void)
 
 	    devid = g_strdup_printf("NET%s", ifacename);
 
-	    ip = g_strdup_printf(" (%s)", ni.ip);
 	    network_interfaces =
 		h_strdup_cprintf
-		("$%s$%s=Sent %.2lfMiB, received %.2lfMiB%s\n",
-		 network_interfaces, devid, ifacename, trans_mb, recv_mb,
-		 ni.ip[0] ? ip : "");
-	    g_free(ip);
+		("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB|%s\n",
+		 network_interfaces, devid, ifacename, ni.ip[0] ? ni.ip : "",
+		 trans_mb, recv_mb);
 
 	    net_get_iface_type(ifacename, &iface_type, &iface_icon, &ni);
 	    
-- 
cgit v1.2.3


From ff03a5d1bf53392f324e4653764b3079bd94c4bf Mon Sep 17 00:00:00 2001
From: 05356787 <05356787@localhost.localdomain>
Date: Thu, 30 Oct 2008 09:17:45 -0200
Subject: Cleanups

---
 hardinfo2/arch/linux/common/filesystem.h | 4 ++--
 hardinfo2/arch/linux/common/net.h        | 5 ++---
 hardinfo2/computer.c                     | 3 ++-
 hardinfo2/shell.c                        | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'hardinfo2/arch/linux/common')

diff --git a/hardinfo2/arch/linux/common/filesystem.h b/hardinfo2/arch/linux/common/filesystem.h
index 3581ccbb..b3008387 100644
--- a/hardinfo2/arch/linux/common/filesystem.h
+++ b/hardinfo2/arch/linux/common/filesystem.h
@@ -81,9 +81,9 @@ scan_filesystems(void)
 					  stravail);
 		g_hash_table_insert(moreinfo, g_strdup_printf("FS%d", ++count), strhash);
 
-		fs_list = h_strdup_cprintf("$FS%d$%s=%s total, %s free\n",
+		fs_list = h_strdup_cprintf("$FS%d$%s=%s|%s\n",
 					  fs_list,
-					  count, tmp[0], strsize, stravail);
+					  count, tmp[0], stravail, strsize);
 
 		g_free(strsize);
 		g_free(stravail);
diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h
index 23cfa9da..8c083a9e 100644
--- a/hardinfo2/arch/linux/common/net.h
+++ b/hardinfo2/arch/linux/common/net.h
@@ -342,12 +342,11 @@ static void scan_net_interfaces_24(void)
 
 	    network_interfaces =
 		h_strdup_cprintf
-		("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB|%s\n",
+		("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB\n",
 		 network_interfaces, devid, ifacename, ni.ip[0] ? ni.ip : "",
 		 trans_mb, recv_mb);
-
 	    net_get_iface_type(ifacename, &iface_type, &iface_icon, &ni);
-	    
+
 	    network_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n",
 					     network_icons, devid,
 					     ifacename, iface_icon);
diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c
index 379a091c..74244762 100644
--- a/hardinfo2/computer.c
+++ b/hardinfo2/computer.c
@@ -316,7 +316,8 @@ gchar *callback_fs()
 			   "ViewType=1\n"
 			   "ReloadInterval=5000\n"
 			   "ColumnTitle$TextValue=Mount Point\n"
-			   "ColumnTitle$Value=Total / Free Space\n"
+			   "ColumnTitle$Value=Free\n"
+			   "ColumnTitle$Extra1=Total\n"
 			   "ShowColumnHeaders=true\n"
 			   "[Mounted File Systems]\n%s\n", fs_list);
 }
diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c
index 01b56fa5..2a61246b 100644
--- a/hardinfo2/shell.c
+++ b/hardinfo2/shell.c
@@ -1109,6 +1109,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload)
 
     g_object_ref(shell->info->model);
     gtk_tree_view_set_model(GTK_TREE_VIEW(shell->info->view), NULL);
+    gdk_window_freeze_updates(shell->window->window);
 
     gtk_tree_store_clear(store);
 
@@ -1141,6 +1142,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload)
 	update_progress();
     }
 
+    gdk_window_thaw_updates(shell->window->window);
     shell_set_note_from_entry(entry);
 
     g_strfreev(groups);
-- 
cgit v1.2.3