[Goodies-commits] r4756 - xfce4-taskmanager/trunk/src

[Mike Massonnet]

Author: mmassonnet
Date: 2008-05-09 12:22:59 +0000 (Fri, 09 May 2008)
New Revision: 4756

Modified:
   xfce4-taskmanager/trunk/src/functions.c
   xfce4-taskmanager/trunk/src/interface.c
   xfce4-taskmanager/trunk/src/types.h
   xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c
Log:
Properly display the memory usage and fix signal connected on the show_cached_as_free menu item


Modified: xfce4-taskmanager/trunk/src/functions.c
===================================================================
--- xfce4-taskmanager/trunk/src/functions.c	2008-05-09 12:22:54 UTC (rev 4755)
+++ xfce4-taskmanager/trunk/src/functions.c	2008-05-09 12:22:59 UTC (rev 4756)
@@ -128,8 +128,9 @@
 	if ( show_cached_as_free )
 	{
 		memory_used-=sys_stat->mem_cached;
+		memory_used-=sys_stat->mem_buffers;
 	}
-	mem_tooltip = g_strdup_printf (_("%d kB of %d kB used"), memory_used / 1024, sys_stat->mem_total / 1024);
+	mem_tooltip = g_strdup_printf (_("%d MB of %d MB used"), memory_used / 1024, sys_stat->mem_total / 1024);
 	gtk_tooltips_set_tip (tooltips, mem_usage_progress_bar_box, mem_tooltip, NULL);
 	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (mem_usage_progress_bar),  (gdouble)memory_used / sys_stat->mem_total);
 

Modified: xfce4-taskmanager/trunk/src/interface.c
===================================================================
--- xfce4-taskmanager/trunk/src/interface.c	2008-05-09 12:22:54 UTC (rev 4755)
+++ xfce4-taskmanager/trunk/src/interface.c	2008-05-09 12:22:59 UTC (rev 4756)
@@ -313,7 +313,7 @@
 	g_signal_connect ((gpointer) show_user_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)own_uid);
 	g_signal_connect ((gpointer) show_root_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)0);
 	g_signal_connect ((gpointer) show_other_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)-1);
-	g_signal_connect ((gpointer) show_other_tasks1, "toggled", G_CALLBACK (on_show_cached_as_free_toggled), (void *)0);
+	g_signal_connect ((gpointer) show_cached_as_free1, "toggled", G_CALLBACK (on_show_cached_as_free_toggled), (void *)0);
 
 	gtk_menu_set_accel_group (GTK_MENU (mainmenu), accel_group);
 

Modified: xfce4-taskmanager/trunk/src/types.h
===================================================================
--- xfce4-taskmanager/trunk/src/types.h	2008-05-09 12:22:54 UTC (rev 4755)
+++ xfce4-taskmanager/trunk/src/types.h	2008-05-09 12:22:59 UTC (rev 4756)
@@ -47,6 +47,7 @@
 	guint mem_total;
 	guint mem_free;
 	guint mem_cached;
+	guint mem_buffers;
 	guint cpu_count;
 	guint cpu_idle;
 	guint cpu_user;

Modified: xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c
===================================================================
--- xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c	2008-05-09 12:22:54 UTC (rev 4755)
+++ xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c	2008-05-09 12:22:59 UTC (rev 4756)
@@ -248,6 +248,7 @@
 			sscanf (buffer, "MemTotal:\t%u kB", &sys_stat->mem_total);
 			sscanf (buffer, "MemFree:\t%u kB", &sys_stat->mem_free);
 			sscanf (buffer, "Cached:\t%u kB", &sys_stat->mem_cached);
+			sscanf (buffer, "Buffers:\t%u kB", &sys_stat->mem_buffers);
 		}
 		fclose (file);
 	}