2.29.5.1

1 files changed, 68 insertions, 68 deletions

diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
index 14a5ea3..ff3f6c2 100644
--- a/desktop-file-monitoring.patch
+++ b/desktop-file-monitoring.patch
@@ -1,39 +1,7 @@
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/launcher.h
---- gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring	2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.h	2008-02-13 17:50:59.000000000 -0500
-@@ -29,6 +29,8 @@ typedef struct {
- 	GSList 		  *error_dialogs;
- 
- 	gulong             destroy_handler;
-+
-+	GFileMonitor      *monitor; 
- } Launcher;
- 
- void panel_launcher_create           (PanelToplevel *toplevel,
-@@ -58,7 +60,6 @@ void            launcher_load_from_gconf
- 						 gint         position,
- 						 const char  *id);
- 
--void            panel_launcher_delete           (Launcher *launcher);
- 
- void		ask_about_launcher		(const char *file,
- 						 PanelWidget *panel,
-diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h
---- gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h	2008-02-13 17:34:43.000000000 -0500
-@@ -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.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/launcher.c
---- gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring	2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.c	2008-02-13 18:04:07.000000000 -0500
-@@ -307,6 +307,8 @@ static void
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/launcher.c
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring	2010-01-13 22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.c	2010-01-17 18:06:14.640537280 -0500
+@@ -237,6 +237,8 @@ static void
  destroy_launcher (GtkWidget *widget,
  		  Launcher  *launcher)
  {
@@ -42,7 +10,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  	launcher_properties_destroy (launcher);
  	launcher_widget_destroy_open_dialogs (launcher);
  }
-@@ -488,6 +490,37 @@ drag_data_get_cb (GtkWidget        *widg
+@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget        *widg
  
  }
  
@@ -80,7 +48,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  static Launcher *
  create_launcher (const char *location)
  {
-@@ -564,6 +597,21 @@ create_launcher (const char *location)
+@@ -482,6 +515,21 @@ create_launcher (const char *location)
  	launcher->key_file = key_file;
  	launcher->prop_dialog = NULL;
  	launcher->destroy_handler = 0;
@@ -102,7 +70,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  
  	/* Icon will be setup later */
  	launcher->button = button_widget_new (NULL /* icon */,
-@@ -694,6 +742,15 @@ static void
+@@ -612,6 +660,15 @@ static void
  launcher_changed (PanelDItemEditor *dialog,
  		  Launcher         *launcher)
  {
@@ -118,7 +86,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  	/* Setup the button look */
  	setup_button (launcher);
  }
-@@ -765,6 +822,42 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia
  	return NULL;
  }
  
@@ -161,7 +129,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  static void
  launcher_saved (GtkWidget *dialog,
  		Launcher  *launcher)
-@@ -772,11 +865,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog,
  	const char  *uri;
  	GConfClient *client;
  	const char  *key;
@@ -177,7 +145,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  	if (uri && launcher->location && strcmp (uri, launcher->location)) {
  		client = panel_gconf_get_client ();
  
-@@ -789,6 +886,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog,
  		if (launcher->location)
  			g_free (launcher->location);
  		launcher->location = g_strdup (uri);
@@ -187,7 +155,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  	}
  }
  
-@@ -955,6 +1055,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog,
  	PanelWidget *panel;
  	int          pos;
  	const char  *uri;
@@ -195,7 +163,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  
  	pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
  	panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -962,6 +1063,10 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -878,6 +979,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);
@@ -206,21 +174,41 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
  	panel_launcher_create (panel->toplevel, pos, uri);
  }
  
-diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c
---- gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2008-02-13 17:34:43.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c	2008-02-13 17:34:43.000000000 -0500
-@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/launcher.h
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.h	2010-01-17 18:06:14.638537025 -0500
+@@ -27,6 +27,8 @@ typedef struct {
+ 	GSList 		  *error_dialogs;
  
- 	/* the directory of the theme for the icon, see bug #119208 */
- 	char *icon_theme_dir;
+ 	gulong             destroy_handler;
 +
-+	char *orig_desktop_file;
++	GFileMonitor      *monitor; 
+ } Launcher;
+ 
+ void panel_launcher_create           (PanelToplevel *toplevel,
+@@ -56,7 +58,6 @@ void            launcher_load_from_gconf
+ 						 gint         position,
+ 						 const char  *id);
+ 
+-void            panel_launcher_delete           (Launcher *launcher);
+ 
+ void		ask_about_launcher		(const char *file,
+ 						 PanelWidget *panel,
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+--- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring	2010-01-17 18:06:14.635278719 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c	2010-01-17 18:11:39.921279627 -0500
+@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate
+ 	GtkWidget *close_button;
+ 	GtkWidget *cancel_button;
+ 	GtkWidget *ok_button;
++
++	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;
+@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o
+ 		g_free (dialog->priv->uri);
+ 	dialog->priv->uri = NULL;
  
 +	if (dialog->priv->orig_desktop_file != NULL)
 +		g_free (dialog->priv->orig_desktop_file);
@@ -243,21 +231,21 @@ diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monit
  	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);
+@@ -992,6 +1005,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);
++               /* 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_free (name);
+                g_free (comment);
+                g_free (icon);
+@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito
  		g_assert_not_reached ();
  	}
  
@@ -265,7 +253,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monit
  	chooser = dialog->priv->command_browse_filechooser;
  
  	gtk_window_set_title (GTK_WINDOW (chooser),
-@@ -1835,3 +1856,12 @@ panel_ditem_register_save_uri_func (Pane
+@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane
  	dialog->priv->save_uri = save_uri;
  	dialog->priv->save_uri_data = data;
  }
@@ -278,3 +266,15 @@ diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monit
 +	return dialog->priv->orig_desktop_file;
 +}
 +
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h
+--- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h	2010-01-17 18:06:14.638537025 -0500
+@@ -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,