From 526fd83c60219d4ec6d8039c798725970efa3aea Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Fri, 9 May 2008 12:22:59 +0000 Subject: [PATCH] Properly display the memory usage and fix signal connected on the show_cached_as_free menu item (Old svn revision: 4756) --- src/functions.c | 3 ++- src/interface.c | 2 +- src/types.h | 1 + src/xfce-taskmanager-linux.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/functions.c b/src/functions.c index 45cfc34..8d7e97b 100644 --- a/src/functions.c +++ b/src/functions.c @@ -128,8 +128,9 @@ gboolean refresh_task_list(void) 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); diff --git a/src/interface.c b/src/interface.c index b07d491..87d709d 100644 --- a/src/interface.c +++ b/src/interface.c @@ -313,7 +313,7 @@ GtkWidget* create_mainmenu (void) 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); diff --git a/src/types.h b/src/types.h index 12da981..bd6bb97 100644 --- a/src/types.h +++ b/src/types.h @@ -47,6 +47,7 @@ typedef struct guint mem_total; guint mem_free; guint mem_cached; + guint mem_buffers; guint cpu_count; guint cpu_idle; guint cpu_user; diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c index 707166f..74b4aca 100644 --- a/src/xfce-taskmanager-linux.c +++ b/src/xfce-taskmanager-linux.c @@ -248,6 +248,7 @@ gboolean get_system_status (system_status *sys_stat) 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); }