diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.h

--- gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400

+++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-13 12:23:44.000000000 -0400

@@ -13,6 +13,7 @@

 #include "applet.h"

 #include "panel-widget.h"

+#include <libgnomevfs/gnome-vfs.h>

 G_BEGIN_DECLS

@@ -29,6 +30,8 @@ typedef struct {

 	GSList 		  *error_dialogs;

 	gulong             destroy_handler;

+

+	GnomeVFSMonitorHandle *monitor; 

 } Launcher;

 void panel_launcher_create           (PanelToplevel *toplevel,

diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h

--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400

+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h	2007-09-13 12:23:44.000000000 -0400

@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI

 				 const char       *uri);

 G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);

+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog);

+

 void panel_ditem_register_save_uri_func (PanelDItemEditor  *dialog,

 					 PanelDitemSaveUri  save_uri,

diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/launcher.c

--- gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring	2007-09-04 13:34:26.000000000 -0400

+++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-13 12:23:44.000000000 -0400

@@ -285,6 +285,8 @@ static void

 destroy_launcher (GtkWidget *widget,

 		  Launcher  *launcher)

 {

+	if (launcher->monitor)

+		gnome_vfs_monitor_cancel (launcher->monitor);

 	launcher_properties_destroy (launcher);

 	launcher_widget_destroy_open_dialogs (launcher);

 }

@@ -458,6 +460,37 @@ drag_data_get_cb (GtkWidget        *widg

 }

+static void setup_button (Launcher *launcher);

+

+static void

+desktop_file_changed (GnomeVFSMonitorHandle    *handle,

+		      const gchar              *monitor_uri,

+		      const gchar              *info_uri,

+		      GnomeVFSMonitorEventType  event_type,

+		      gpointer                  user_data)

+{

+	Launcher *launcher = user_data;

+	GKeyFile *key_file;

+

+	if (event_type == GNOME_VFS_MONITOR_EVENT_CHANGED ||

+	    event_type == GNOME_VFS_MONITOR_EVENT_CREATED) {

+		gchar *path;

+

+		path = gnome_vfs_get_local_path_from_uri (monitor_uri);

+

+		key_file = g_key_file_new ();

+		if (g_key_file_load_from_file (key_file, path,

+					       G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,

+					       NULL)) {

+			g_key_file_free (launcher->key_file);

+			launcher->key_file = key_file;

+			setup_button (launcher);        

+		}

+

+		g_free (path);

+	}

+}

+

 static Launcher *

 create_launcher (const char *location)

 {

@@ -534,6 +567,25 @@ create_launcher (const char *location)

 	launcher->key_file = key_file;

 	launcher->prop_dialog = NULL;

 	launcher->destroy_handler = 0;

+	launcher->monitor = NULL;

+

+	/* Watch for changes to the desktop file. Since we don't want 

+	 * to do this for every launcher, we only do it if the desktop 

+	 * file contains a X-Panel-Monitor entry.

+	 */

+	if (g_key_file_get_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", NULL)) {

+		gchar *uri;

+

+

+

+		uri = g_strdup_printf ("file:%s", new_location);

+		gnome_vfs_monitor_add (&launcher->monitor, 

+				       uri,

+				       GNOME_VFS_MONITOR_FILE,

+				       desktop_file_changed,

+				       launcher);

+		g_free (uri);

+	}

 	/* Icon will be setup later */

 	launcher->button = button_widget_new (NULL /* icon */,

@@ -662,6 +714,15 @@ static void

 launcher_changed (PanelDItemEditor *dialog,

 		  Launcher         *launcher)

 {

+	/* If the user manually changes launcher properties,

+	 * we stop monitoring the desktop file to not overwrite

+	 * user changes.

+	 */

+	if (launcher->monitor) {

+		gnome_vfs_monitor_cancel (launcher->monitor);

+		launcher->monitor = NULL;

+	}

+

 	/* Setup the button look */

 	setup_button (launcher);

 }

@@ -733,6 +794,43 @@ launcher_save_uri (PanelDItemEditor *dia

 	return NULL;

 }

+static const char *

+desktop_file_to_monitor (PanelDItemEditor *editor)

+{

+	const char *entry;

+	GKeyFile *key_file;

+

+	/* When the user selects a desktop file in the ditem editor,

+	 * start monitoring the desktop file for changes.

+	 */

+	entry = panel_ditem_editor_get_orig_desktop_file (editor);

+	if (entry) {

+		key_file = g_key_file_new ();

+		if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||

+		    !panel_util_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE)) 

+			entry = NULL;

+		g_key_file_free (key_file);

+	}

+

+	return entry;

+}

+

+static void

+start_monitoring (Launcher *launcher)

+{

+	gchar *uri;

+

+	uri = g_strdup_printf ("file:%s", launcher->location);

+	if (launcher->monitor)

+		gnome_vfs_monitor_cancel (launcher->monitor);

+	gnome_vfs_monitor_add (&launcher->monitor, 

+			       uri,

+			       GNOME_VFS_MONITOR_FILE,

+			       desktop_file_changed,

+			       launcher);

+	g_free (uri);

+}

+ 

 static void

 launcher_saved (GtkWidget *dialog,

 		Launcher  *launcher)

@@ -740,11 +838,15 @@ launcher_saved (GtkWidget *dialog,

 	const char  *uri;

 	GConfClient *client;

 	const char  *key;

+	const char *path;

 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));

 	if (panel_launcher_get_filename (uri) != NULL)

 		uri = panel_launcher_get_filename (uri);

+	if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)

+		uri = path;

+

 	if (uri && launcher->location && strcmp (uri, launcher->location)) {

 		client = panel_gconf_get_client ();

@@ -757,6 +859,9 @@ launcher_saved (GtkWidget *dialog,

 		if (launcher->location)

 			g_free (launcher->location);

 		launcher->location = g_strdup (uri);

+

+		if (path)

+			start_monitoring (launcher);

 	}

 }

@@ -923,6 +1028,7 @@ launcher_new_saved (GtkWidget *dialog,

 	PanelWidget *panel;

 	int          pos;

 	const char  *uri;

+	const char  *path;

 	pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));

 	panel = g_object_get_data (G_OBJECT (dialog), "panel");

@@ -930,6 +1036,10 @@ launcher_new_saved (GtkWidget *dialog,

 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));

 	if (panel_launcher_get_filename (uri) != NULL)

 		uri = panel_launcher_get_filename (uri);

+

+	if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)

+		uri = path;

+

 	panel_launcher_create (panel->toplevel, pos, uri);

 }

diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c

--- gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2007-09-13 12:23:44.000000000 -0400

+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c	2007-09-13 12:31:03.000000000 -0400

@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate

 	/* the directory of the theme for the icon, see bug #119208 */

 	char *icon_theme_dir;

+

+	char *orig_desktop_file;

 };

 /* Time in seconds after which we save the file on the disk */

@@ -367,6 +369,10 @@ panel_ditem_editor_destroy (GtkObject *o

 		g_free (dialog->priv->icon_theme_dir);

 	dialog->priv->icon_theme_dir = NULL;

+	if (dialog->priv->orig_desktop_file != NULL)

+		g_free (dialog->priv->orig_desktop_file);

+	dialog->priv->orig_desktop_file = NULL;

+

 	GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object);

 }

@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd

 							   TRUE);

 	}

+	/* When the user changes any fields, unset the orig_desktop_file

+	 * field since the editor contents are not entirely from a desktop

+	 * file anymore.

+	 */ 

+	g_free (dialog->priv->orig_desktop_file);

+	dialog->priv->orig_desktop_file = NULL;

+

 	dialog->priv->dirty = TRUE;

 	g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);

 }

@@ -1005,6 +1018,13 @@ update_editor_from_desktop_file (PanelDI

 		 */ 

 		setup_icon_entry (dialog, icon);

+                /* We set the orig_desktop_file field to let the

+                 * launcher know that the editor contents are coming

+                 * directly from a desktop file.

+                 */ 

+                g_free (dialog->priv->orig_desktop_file);

+                dialog->priv->orig_desktop_file = g_strdup (uri);

+

 		g_free (name);

 		g_free (comment);

 		g_free (icon);

@@ -1079,6 +1099,7 @@ update_chooser_for_type (PanelDItemEdito

 		g_assert_not_reached ();

 	}

+

 	chooser = dialog->priv->command_browse_filechooser;

 	gtk_window_set_title (GTK_WINDOW (chooser),

@@ -1835,3 +1856,12 @@ panel_ditem_register_save_uri_func (Pane

 	dialog->priv->save_uri = save_uri;

 	dialog->priv->save_uri_data = data;

 }

+

+G_CONST_RETURN char *

+panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog)

+{

+	g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);

+

+	return dialog->priv->orig_desktop_file;

+}

+