gnome-applets r10836 - trunk/multiload

[callum svn gnome org]

Author: callum
Date: Sat May 10 06:59:26 2008
New Revision: 10836
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10836&view=rev

Log:
Patch from Arthur Taylor to make the program launched from the multiload applet configurable.

Modified:
   trunk/multiload/ChangeLog
   trunk/multiload/main.c
   trunk/multiload/multiload.schemas.in

Modified: trunk/multiload/main.c
==============================================================================
--- trunk/multiload/main.c	(original)
+++ trunk/multiload/main.c	Sat May 10 06:59:26 2008
@@ -94,10 +94,15 @@
 {
 	GError *error = NULL;
 	GnomeDesktopItem *ditem;
+	gchar *monitor;
 
 	g_return_if_fail (ma != NULL);
 
-	if ((ditem = gnome_desktop_item_new_from_basename ("gnome-system-monitor.desktop", 0, NULL))) {
+	monitor = panel_applet_gconf_get_string (ma->applet, "system_monitor", NULL);
+	if (monitor == NULL)
+	        monitor = g_strdup ("gnome-system-monitor.desktop");
+
+	if ((ditem = gnome_desktop_item_new_from_basename (monitor, 0, NULL))) {
 		gnome_desktop_item_set_launch_time (ditem, gtk_get_current_event_time ());
 		gnome_desktop_item_launch_on_screen (ditem, NULL,
 		                                     GNOME_DESKTOP_ITEM_LAUNCH_ONLY_ONE,
@@ -110,6 +115,7 @@
 				gtk_widget_get_screen (GTK_WIDGET (ma->applet)),
 				"gnome-system-monitor", &error);
 	}
+	g_free (monitor);
 
 	if (error) {
 		GtkWidget *dialog;

Modified: trunk/multiload/multiload.schemas.in
==============================================================================
--- trunk/multiload/multiload.schemas.in	(original)
+++ trunk/multiload/multiload.schemas.in	Sat May 10 06:59:26 2008
@@ -279,6 +279,15 @@
 		<short>Background color for disk load graph</short>
 	</locale>
 </schema>
+<schema>
+	<key>/schemas/apps/multiload/prefs/system_monitor</key>
+	<owner>multiload_applet-2</owner>
+	<type>string</type>
+	<default>gnome-system-monitor.desktop</default>
+	<locale name="C">
+		<short>The desktop descriptiong file to execute as the system monitor</short>
+	</locale>
+</schema>
 
 </schemalist>
 </gconfschemafile>