? birnan
? depcomp
? gnome-system-monitor-dont-truncate-sizes-rhel3-2.patch
Index: configure.in
===================================================================
RCS file: /cvs/gnome/procman/configure.in,v
retrieving revision 1.162
diff -u -p -u -r1.162 configure.in
--- configure.in	7 Jan 2006 01:09:04 -0000	1.162
+++ configure.in	9 Jan 2006 21:08:42 -0000
@@ -5,7 +5,7 @@ AC_PREREQ(2.52)
 AC_INIT([gnome-system-monitor], [2.13.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor])
 AC_CONFIG_SRCDIR(configure.in)
-AC_CONFIG_HEADERS(config.h)
+AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
Index: src/interface.c
===================================================================
RCS file: /cvs/gnome/procman/src/interface.c,v
retrieving revision 1.151
diff -u -p -u -r1.151 interface.c
--- src/interface.c	29 Oct 2005 19:24:59 -0000	1.151
+++ src/interface.c	9 Jan 2006 21:08:42 -0000
@@ -40,7 +40,6 @@
 #include "disks.h"
 
 static void	cb_toggle_tree (GtkAction *action, gpointer data);
-static void	cb_toggle_threads (GtkAction *action, gpointer data);
 
 static const GtkActionEntry menu_entries[] =
 {
@@ -87,9 +86,6 @@ static const GtkToggleActionEntry toggle
 	{ "ShowDependencies", NULL, N_("_Dependencies"), "<control>D",
 	  N_("Show parent/child relationship between processes"),
 	  G_CALLBACK (cb_toggle_tree), TRUE },
-	{ "ShowThreads", NULL, N_("_Threads"), "<control>T",
-	  N_("Show each thread as a separate process"),
-	  G_CALLBACK (cb_toggle_threads), FALSE }
 };
 
 
@@ -126,7 +122,6 @@ static const char ui_info[] =
 "      <menuitem name=\"ViewMyProcesses\" action=\"ShowMyProcesses\" />"
 "      <separator />"
 "      <menuitem name=\"ViewDependenciesMenu\" action=\"ShowDependencies\" />"
-"      <menuitem name=\"ViewThreadsMenu\" action=\"ShowThreads\" />"
 "      <separator />"
 "      <menuitem name=\"ViewHideProcessMenu\" action=\"HideProcess\" />"
 "      <menuitem name=\"ViewHiddenProcessesMenu\" action=\"HiddenProcesses\" />"
@@ -774,11 +769,6 @@ create_main_window (ProcData *procdata)
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 				      procdata->config.show_tree);
 
-	action = gtk_action_group_get_action (procdata->action_group, "ShowThreads");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-				      procdata->config.show_threads);
-
-
 	procdata->app = app;
 }
 
@@ -845,18 +835,4 @@ cb_toggle_tree (GtkAction *action, gpoin
 		return;
 
 	gconf_client_set_bool (client, "/apps/procman/show_tree", show, NULL);
-}
-
-static void		
-cb_toggle_threads (GtkAction *action, gpointer data)
-{
-	ProcData *procdata = data;
-	GConfClient *client = procdata->client;
-	gboolean show;
-
-	show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-	if (show == procdata->config.show_threads)
-		return;
-
-	gconf_client_set_bool (client, "/apps/procman/show_threads", show, NULL);
 }
Index: src/procman.c
===================================================================
RCS file: /cvs/gnome/procman/src/procman.c,v
retrieving revision 1.103
diff -u -p -u -r1.103 procman.c
--- src/procman.c	2 Jan 2006 09:28:58 -0000	1.103
+++ src/procman.c	9 Jan 2006 21:08:43 -0000
@@ -55,18 +55,6 @@ tree_changed_cb (GConfClient *client, gu
 }
 
 static void
-threads_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	ProcData *procdata = data;
-	GConfValue *value = gconf_entry_get_value (entry);
-	
-	procdata->config.show_threads = gconf_value_get_bool (value);
-	proctable_clear_tree (procdata);
-	proctable_update_all (procdata);
-	
-}
-
-static void
 view_as_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
 	ProcData *procdata = data;
@@ -259,9 +247,6 @@ procman_data_new (GConfClient *client)
 	pd->config.show_hide_message = gconf_client_get_bool (client, "/apps/procman/hide_message",
 							      NULL);
 	gconf_client_notify_add (client, "/apps/procman/hide_message", warning_changed_cb,
-				 pd, NULL, NULL);
-	pd->config.show_threads = gconf_client_get_bool (client, "/apps/procman/show_threads", NULL);
-	gconf_client_notify_add (client, "/apps/procman/show_threads", threads_changed_cb,
 				 pd, NULL, NULL);
 	pd->config.update_interval = gconf_client_get_int (client, "/apps/procman/update_interval", 
 							   NULL);
Index: src/procman.h
===================================================================
RCS file: /cvs/gnome/procman/src/procman.h,v
retrieving revision 1.88
diff -u -p -u -r1.88 procman.h
--- src/procman.h	2 Jan 2006 09:28:58 -0000	1.88
+++ src/procman.h	9 Jan 2006 21:08:43 -0000
@@ -57,7 +57,6 @@ struct _ProcConfig
         gboolean	show_kill_warning;
         gboolean	show_hide_message;
         gboolean	show_tree;
-        gboolean	show_threads;
 	gboolean	show_all_fs;
 	guint		update_interval;
  	gint		graph_update_interval;
@@ -107,7 +106,6 @@ struct _ProcInfo
 
 	guint		is_visible	: 1;
 	guint		is_running	: 1;
-	guint		is_thread	: 1;
 	guint		is_blacklisted	: 1;
 };
 
Index: src/proctable.c
===================================================================
RCS file: /cvs/gnome/procman/src/proctable.c,v
retrieving revision 1.164
diff -u -p -u -r1.164 proctable.c
--- src/proctable.c	2 Jan 2006 09:06:22 -0000	1.164
+++ src/proctable.c	9 Jan 2006 21:08:43 -0000
@@ -654,13 +654,7 @@ insert_info_to_tree (ProcInfo *info, Pro
 	}
 	info->is_blacklisted = FALSE;
 
-	/* Don't show threads */
-	if (!procdata->config.show_threads && info->is_thread)
-		return;
-	else if (info->is_thread)
-		name = g_strdup_printf(_("%s (thread)"), info->name);
-	else
-		name = g_strdup (info->name);
+	name = g_strdup (info->name);
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
 	if (info->parent && procdata->config.show_tree && info->parent->is_visible) {
@@ -864,9 +858,6 @@ procinfo_new (ProcData *procdata, gint p
 	info->parent = find_parent (procdata, procuid.ppid);
 	if (info->parent) {
 		info->parent->children = g_slist_prepend (info->parent->children, info);
-		if(g_str_equal(info->name, info->parent->name)
-		   && info->parent->vmsize == info->vmsize)
-			info->is_thread = TRUE;
 	}
 
 	info->is_visible = FALSE;
