rpms/gnome-system-monitor/devel gnome-system-monitor-2.22.0-system-tab-arg.patch, NONE, 1.1 about-this-computer.desktop, 1.2, 1.3 gnome-system-monitor.spec, 1.112, 1.113 gnome-system-monitor-2.21.92-system-tab-arg.patch, 1.1, NONE

[Will Woods (wwoods)]

Author: wwoods

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3297

Modified Files:
	about-this-computer.desktop gnome-system-monitor.spec 
Added Files:
	gnome-system-monitor-2.22.0-system-tab-arg.patch 
Removed Files:
	gnome-system-monitor-2.21.92-system-tab-arg.patch 
Log Message:
Update translations for about-this-computer.desktop, tweak patch a bit

gnome-system-monitor-2.22.0-system-tab-arg.patch:

--- NEW FILE gnome-system-monitor-2.22.0-system-tab-arg.patch ---
diff -up gnome-system-monitor-2.22.0/src/procman.h.system-tab-arg gnome-system-monitor-2.22.0/src/procman.h
--- gnome-system-monitor-2.22.0/src/procman.h.system-tab-arg	2008-04-01 17:09:29.000000000 -0400
+++ gnome-system-monitor-2.22.0/src/procman.h	2008-04-01 17:09:29.000000000 -0400
@@ -58,6 +58,7 @@ enum
 static const unsigned MIN_UPDATE_INTERVAL =   1 * 1000;
 static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000;
 
+#define SHOW_SYSTEM_TAB_CMD "SHOWSYSTAB" /* elegant, eh */
 
 enum ProcmanTab
 {
diff -up gnome-system-monitor-2.22.0/src/procman.cpp.system-tab-arg gnome-system-monitor-2.22.0/src/procman.cpp
--- gnome-system-monitor-2.22.0/src/procman.cpp.system-tab-arg	2008-04-01 17:09:29.000000000 -0400
+++ gnome-system-monitor-2.22.0/src/procman.cpp	2008-04-01 17:10:20.000000000 -0400
@@ -626,14 +626,19 @@ cb_server (const gchar *msg, gpointer us
 {
 	GdkWindow *window;
 	ProcData *procdata;
-	guint32 timestamp;
+	guint32 timestamp = 0;
 
 	window = gdk_get_default_root_window ();
 
 	procdata = *(ProcData**)user_data;
 	g_assert (procdata != NULL);
 
-	timestamp = strtoul(msg, NULL, 0);
+    procman_debug("cb_server(%s)", msg);
+	if (msg != NULL && strcmp(SHOW_SYSTEM_TAB_CMD, msg) == 0) {
+		procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);
+	} else 
+		timestamp = strtoul(msg, NULL, 0);
 
 	if (timestamp == 0)
 	{
@@ -669,12 +674,28 @@ main (int argc, char *argv[])
 	ProcData *procdata;
 	BaconMessageConnection *conn;
 
+	/* Parse commandline arguments */
+	GError *error = NULL;
+	GOptionContext *context;
+	static gboolean show_system_tab = FALSE;
+	static GOptionEntry entries[] = 
+	{
+		{ "show-system-tab", 's', 0, G_OPTION_ARG_NONE, &show_system_tab, "Show the System tab", NULL },
+		{ NULL }
+	};
+
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
 	startup_timestamp = get_startup_timestamp();
 
+	context = g_option_context_new("- a simple process and system monitor.");
+	g_option_context_set_ignore_unknown_options(context, TRUE);
+	g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+	g_option_context_parse(context, &argc, &argv, &error);
+	g_option_context_free(context);
+
 	Gtk::Main kit(&argc, &argv);
 	procman_debug("post gtk_init");
 
@@ -691,6 +712,9 @@ main (int argc, char *argv[])
 
 		timestamp = g_strdup_printf ("%" G_GUINT32_FORMAT, startup_timestamp);
 
+		if (show_system_tab)
+			bacon_message_connection_send(conn, SHOW_SYSTEM_TAB_CMD);
+
 		bacon_message_connection_send (conn, timestamp);
 
 		gdk_notify_startup_complete ();
@@ -727,6 +751,11 @@ main (int argc, char *argv[])
 
 	g_assert(procdata->app);
 			
+	if (show_system_tab) {
+		procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);
+	}
+
  	gtk_widget_show(procdata->app);
        
 	procman_debug("begin gtk_main");


Index: about-this-computer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/about-this-computer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- about-this-computer.desktop	10 Mar 2008 05:50:10 -0000	1.2
+++ about-this-computer.desktop	4 Apr 2008 19:18:42 -0000	1.3
@@ -1,8 +1,30 @@
 [Desktop Entry]
 Name=About This Computer
-Name[en_US]=About This Computer 
-Comment=Get some basic information about this computer 
-Comment[en_US]=Get some basic information about this computer
+Name[en]=About This Computer
+Name[cs]=O tomto počítači
+Name[el]=Σχετικά με τον υπολογιστή
+Name[fi]=Tietoja tästä tietokoneesta
+Name[de]=Ãœber diesen Computer
+Name[pl]=Informacje o komputerze
+Name[sr]=О овом рачунару
+Name[sr at latin]=O ovom računaru
+Name[nl]=Over Deze Computer
+Name[sv]=Om den här datorn
+Name[es]=Acerca de esta Computadora
+Name[zh_CN]=关于本计算机
+Comment=Get some basic information about this computer
+Comment[en]=Get some basic information about this computer
+Comment[cs]=Základní informace o tomto počítači
+Comment[el]=Δείτε βασικές πληροφορίες για αυτόν τον υπολογιστή
+Comment[fi]=Perustietoja tästä tietokoneesta
+Comment[de]=Erhalten Sie Basis-Informationen über dieses System
+Comment[pl]=Więcej informacji o komputerze
+Comment[sr]=Сазнајте основне информације о овом рачунару
+Comment[sr at latin]=Saznajte osnovne informacije o ovom računaru
+Comment[nl]=Geef basis informatie weer over deze computer
+Comment[sv]=Få grundläggande information om den här datorn
+Comment[es]=Obten información básica sobre esta computadora
+Comment[zh_CN]=获取本计算机的一些基本信息
 Exec=gnome-system-monitor --show-system-tab
 Icon=computer
 Terminal=false


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- gnome-system-monitor.spec	17 Mar 2008 15:38:36 -0000	1.112
+++ gnome-system-monitor.spec	4 Apr 2008 19:18:42 -0000	1.113
@@ -13,7 +13,7 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -43,8 +43,8 @@
 
 # send upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462
 Patch0: gnome-system-monitor-2.21.92-polkit.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=522988
-Patch1: gnome-system-monitor-2.21.92-system-tab-arg.patch
+# Upstreamed. See http://bugzilla.gnome.org/show_bug.cgi?id=522988
+Patch1: gnome-system-monitor-2.22.0-system-tab-arg.patch
 
 Requires: PolicyKit-gnome >= %{polkit_gnome_version}
 Requires(pre): GConf2 >= %{gconf_version}
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Fri Apr  4 2008 Will Woods <wwoods at redhat.com> - 2.22.0-2
+- Update translations in about-this-computer.desktop
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0
 


--- gnome-system-monitor-2.21.92-system-tab-arg.patch DELETED ---