rpms/gnome-panel/devel .cvsignore, 1.69, 1.70 applet-error.patch, 1.1, 1.2 desktop-file-monitoring.patch, 1.2, 1.3 gnome-panel.spec, 1.254, 1.255 preferred-apps.patch, 1.3, 1.4 sources, 1.72, 1.73

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Thu Feb 14 02:14:24 UTC 2008


Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3808

Modified Files:
	.cvsignore applet-error.patch desktop-file-monitoring.patch 
	gnome-panel.spec preferred-apps.patch sources 
Log Message:
2.21.91



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	29 Jan 2008 18:51:54 -0000	1.69
+++ .cvsignore	14 Feb 2008 02:13:40 -0000	1.70
@@ -1 +1 @@
-gnome-panel-2.21.90.tar.bz2
+gnome-panel-2.21.91.tar.bz2

applet-error.patch:

Index: applet-error.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/applet-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- applet-error.patch	21 Sep 2007 20:28:33 -0000	1.1
+++ applet-error.patch	14 Feb 2008 02:13:40 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error	2007-09-21 16:24:28.000000000 -0400
-+++ gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c	2007-09-21 16:24:32.000000000 -0400
-@@ -1253,6 +1253,21 @@ panel_applet_frame_event_listener (Bonob
+diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error	2008-02-11 16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c	2008-02-13 20:35:59.000000000 -0500
+@@ -1242,6 +1242,21 @@ panel_applet_frame_event_listener (Bonob
  		panel_applet_frame_set_size_hints_from_any (frame, any);
  }
  
@@ -21,18 +21,16 @@
 +}
 +
  static void
- panel_applet_frame_activated (Bonobo_Unknown     object,
- 			      CORBA_Environment *ev,
-@@ -1275,8 +1290,10 @@ panel_applet_frame_activated (Bonobo_Unk
- 	if (BONOBO_EX (ev) || object == CORBA_OBJECT_NIL) {
- 		error = bonobo_exception_get_text (ev);
+ panel_applet_frame_activated (CORBA_Object  object,
+ 			      const char   *error_reason,
+@@ -1266,7 +1281,9 @@ panel_applet_frame_activated (CORBA_Obje
+ 	if (error_reason != NULL || object == CORBA_OBJECT_NIL) {
  		g_warning (G_STRLOC ": failed to load applet %s:\n%s",
--			   frame->priv->iid, error);
+ 			   frame->priv->iid, error_reason);
 -		panel_applet_frame_loading_failed (frame, frame_act->id);
-+		 	  frame->priv->iid, error);
 +		if (!in_default_panel_config (frame_act->id)) {
 +			panel_applet_frame_loading_failed (frame, frame_act->id);
 +		}
  		g_free (frame_act->id);
  		g_free (frame_act);
- 		g_free (error);
+ 		return;

desktop-file-monitoring.patch:

Index: desktop-file-monitoring.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/desktop-file-monitoring.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- desktop-file-monitoring.patch	13 Sep 2007 17:42:24 -0000	1.2
+++ desktop-file-monitoring.patch	14 Feb 2008 02:13:40 -0000	1.3
@@ -1,26 +1,26 @@
-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 {
+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;
 +
-+	GnomeVFSMonitorHandle *monitor; 
++	GFileMonitor      *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
+@@ -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);
  
@@ -30,39 +30,39 @@
  
  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
+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
  destroy_launcher (GtkWidget *widget,
  		  Launcher  *launcher)
  {
-+	if (launcher->monitor)
-+		gnome_vfs_monitor_cancel (launcher->monitor);
++	if (launcher->monitor) 
++		g_object_unref (launcher->monitor);
  	launcher_properties_destroy (launcher);
  	launcher_widget_destroy_open_dialogs (launcher);
  }
-@@ -458,6 +460,37 @@ drag_data_get_cb (GtkWidget        *widg
+@@ -488,6 +490,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,
++desktop_file_changed (GFileMonitor      *monitor,
++                      GFile             *file,
++                      GFile             *other_file,
++                      GFileMonitorEvent  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) {
++	if (event_type == G_FILE_MONITOR_EVENT_CHANGED ||
++	    event_type == G_FILE_MONITOR_EVENT_CREATED) {
 +		gchar *path;
 +
-+		path = gnome_vfs_get_local_path_from_uri (monitor_uri);
++		path = g_file_get_path (file);
 +
 +		key_file = g_key_file_new ();
 +		if (g_key_file_load_from_file (key_file, path,
@@ -80,7 +80,7 @@
  static Launcher *
  create_launcher (const char *location)
  {
-@@ -534,6 +567,25 @@ create_launcher (const char *location)
+@@ -564,6 +597,21 @@ create_launcher (const char *location)
  	launcher->key_file = key_file;
  	launcher->prop_dialog = NULL;
  	launcher->destroy_handler = 0;
@@ -91,22 +91,18 @@
 +	 * file contains a X-Panel-Monitor entry.
 +	 */
 +	if (g_key_file_get_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", NULL)) {
-+		gchar *uri;
-+
-+
++		GFile *file;
 +
-+		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);
++		file = g_file_new_for_path (new_location);
++		launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
++		g_signal_connect (launcher->monitor, "changed",
++				  G_CALLBACK (desktop_file_changed), launcher);
++		g_object_unref (file);
 +	}
  
  	/* Icon will be setup later */
  	launcher->button = button_widget_new (NULL /* icon */,
-@@ -662,6 +714,15 @@ static void
+@@ -694,6 +742,15 @@ static void
  launcher_changed (PanelDItemEditor *dialog,
  		  Launcher         *launcher)
  {
@@ -115,14 +111,14 @@
 +	 * user changes.
 +	 */
 +	if (launcher->monitor) {
-+		gnome_vfs_monitor_cancel (launcher->monitor);
++		g_object_unref (launcher->monitor);
 +		launcher->monitor = NULL;
 +	}
 +
  	/* Setup the button look */
  	setup_button (launcher);
  }
-@@ -733,6 +794,43 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -765,6 +822,42 @@ launcher_save_uri (PanelDItemEditor *dia
  	return NULL;
  }
  
@@ -150,23 +146,22 @@
 +static void
 +start_monitoring (Launcher *launcher)
 +{
-+	gchar *uri;
++	GFile *file;
 +
-+	uri = g_strdup_printf ("file:%s", launcher->location);
++	file = g_file_new_for_path (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);
++		g_object_unref (launcher->monitor);
++	launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
++	g_signal_connect (launcher->monitor, "changed",
++			  G_CALLBACK (desktop_file_changed),
++			  launcher);
++	g_object_unref (file);
 +}
 + 
  static void
  launcher_saved (GtkWidget *dialog,
  		Launcher  *launcher)
-@@ -740,11 +838,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -772,11 +865,15 @@ launcher_saved (GtkWidget *dialog,
  	const char  *uri;
  	GConfClient *client;
  	const char  *key;
@@ -182,7 +177,7 @@
  	if (uri && launcher->location && strcmp (uri, launcher->location)) {
  		client = panel_gconf_get_client ();
  
-@@ -757,6 +859,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -789,6 +886,9 @@ launcher_saved (GtkWidget *dialog,
  		if (launcher->location)
  			g_free (launcher->location);
  		launcher->location = g_strdup (uri);
@@ -192,7 +187,7 @@
  	}
  }
  
-@@ -923,6 +1028,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -955,6 +1055,7 @@ launcher_new_saved (GtkWidget *dialog,
  	PanelWidget *panel;
  	int          pos;
  	const char  *uri;
@@ -200,7 +195,7 @@
  
  	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,
+@@ -962,6 +1063,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);
@@ -211,9 +206,9 @@
  	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
+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
  
  	/* the directory of the theme for the icon, see bug #119208 */


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- gnome-panel.spec	3 Feb 2008 06:55:41 -0000	1.254
+++ gnome-panel.spec	14 Feb 2008 02:13:40 -0000	1.255
@@ -1,13 +1,13 @@
 %define gettext_package gnome-panel-2.0
 
 %define gnome_desktop_version 2.11.1
+%define glib2_version 2.15.5
 %define gtk2_version 2.11.3
 %define libglade2_version 2.5.0
 %define libgnome_version 2.13.0
 %define libgnomeui_version 2.5.4
 %define libbonoboui_version 2.3.0
 %define orbit_version 2.4.0
-%define gnome_vfs2_version 2.14.2
 %define libwnck_version 2.19.5
 %define gconf_version 2.14
 %define gnome_menus_version 2.11.1
@@ -21,8 +21,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.21.90
-Release: 3%{?dist}
+Version: 2.21.91
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
@@ -95,8 +95,6 @@
 # Drop this patch for now, it should have AT LEAST been moved
 # to an upstream bugzilla by now
 #Patch6: gnome-panel-2.16.0-compiz-support.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=456371
-Patch7: clock-timezones.patch
 
 # the next three patches belong together
 # http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -109,14 +107,8 @@
 # add a hard dependency on e.g. tomboy 
 Patch11: applet-error.patch
 
-# try to deal with the 22/24 madness in icon themes
-Patch12: more-sharp-icons.patch
-
 Patch14: gnome-panel-2.21.5-ck-shutdown.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=514026
-Patch15: logout-focus.patch
-
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -157,14 +149,11 @@
 %patch3 -p1 -b .switch-user
 %patch4 -p1 -b .search
 #%patch6 -p0 -b .compiz-support
-%patch7 -p1 -b .clock-timezones
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
-%patch12 -p1 -b .more-sharp-icons
 %patch14 -p1 -b .ck-shutdown
-%patch15 -p1 -b .logout-focus
 
 . %{SOURCE6}
 
@@ -349,6 +338,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Feb 12 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.91-1
+- Update to 2.21.91
+- Update patches
+
 * Sun Feb  3 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.90-3
 - Ensure the logout dialog gets focus. 
 

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- preferred-apps.patch	10 Sep 2007 17:29:28 -0000	1.3
+++ preferred-apps.patch	14 Feb 2008 02:13:40 -0000	1.4
@@ -1,27 +1,34 @@
-diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h	2007-09-10 13:22:09.000000000 -0400
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present           (GdkScreen  *screen,
- 					 guint32    activate_time);
+diff -up gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps gnome-panel-2.21.91/gnome-panel/main.c
+--- gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps	2008-02-11 16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/main.c	2008-02-13 20:44:49.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
  
-+GSList *get_all_applications           (void);
-+
- G_END_DECLS
+ #include "nothing.cP"
+@@ -81,6 +82,7 @@ main (int argc, char **argv)
+ 			      GCONF_CLIENT_PRELOAD_NONE,
+ 			      NULL);
  
- #endif /* __PANEL_RUN_DIALOG_H__ */
-diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps gnome-panel-2.19.92/gnome-panel/launcher.c
---- gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps	2007-09-10 13:22:09.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.c	2007-09-10 13:24:09.000000000 -0400
-@@ -22,6 +22,7 @@
++	panel_preferred_apps_init ();
+ 	panel_global_config_load ();
+ 	panel_lockdown_init ();
+ 	panel_profile_load ();
+diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps gnome-panel-2.21.91/gnome-panel/launcher.c
+--- gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps	2008-02-13 20:44:49.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/launcher.c	2008-02-13 20:44:49.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include <libgnome/gnome-util.h>
  #include <libgnomeui/gnome-url.h>
- #include <libgnomevfs/gnome-vfs.h>
  #include <gdk/gdkx.h>
 +#include <gmenu-tree.h>
  
  #include "launcher.h"
  
-@@ -39,6 +40,7 @@
+@@ -40,6 +41,7 @@
  #include "panel-compatibility.h"
  #include "panel-ditem-editor.h"
  #include "panel-icon-names.h"
@@ -29,7 +36,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1284,3 +1286,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1299,3 +1301,173 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -203,10 +210,19 @@
 +					 filename, g_free, NULL);
 +	}
 +}
-diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps gnome-panel-2.19.92/gnome-panel/launcher.h
---- gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps	2007-09-10 13:22:09.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.h	2007-09-10 13:22:09.000000000 -0400
-@@ -75,6 +75,7 @@ void            launcher_properties_dest
+diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps gnome-panel-2.21.91/gnome-panel/launcher.h
+--- gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps	2008-02-13 20:44:49.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/launcher.h	2008-02-13 20:45:58.000000000 -0500
+@@ -14,6 +14,8 @@
+ #include "applet.h"
+ #include "panel-widget.h"
+ 
++#include <gio/gio.h>
++
+ G_BEGIN_DECLS
+ 
+ #define PANEL_LAUNCHERS_PATH "panel2.d/default/launchers"
+@@ -73,6 +75,7 @@ void            launcher_properties_dest
  void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
  						 gboolean  dnd_enabled);
  
@@ -214,29 +230,22 @@
  
  G_END_DECLS
  
-diff -up gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps gnome-panel-2.19.92/gnome-panel/main.c
---- gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/main.c	2007-09-10 13:22:09.000000000 -0400
-@@ -26,6 +26,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
+diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps	2008-02-11 16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h	2008-02-13 20:44:49.000000000 -0500
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present           (GdkScreen  *screen,
+ 					 guint32    activate_time);
  
- #include "nothing.cP"
-@@ -81,6 +82,7 @@ main (int argc, char **argv)
- 			      GCONF_CLIENT_PRELOAD_NONE,
- 			      NULL);
++GSList *get_all_applications           (void);
++
+ G_END_DECLS
  
-+	panel_preferred_apps_init ();
- 	panel_global_config_load ();
- 	panel_lockdown_init ();
- 	panel_profile_load ();
-diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps	2007-09-04 13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c	2007-09-10 13:22:09.000000000 -0400
-@@ -813,7 +813,7 @@ get_all_applications_from_dir (GMenuTree
+ #endif /* __PANEL_RUN_DIALOG_H__ */
+diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps	2008-02-11 16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c	2008-02-13 20:44:49.000000000 -0500
+@@ -816,7 +816,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	29 Jan 2008 18:51:54 -0000	1.72
+++ sources	14 Feb 2008 02:13:40 -0000	1.73
@@ -1 +1 @@
-12285e7794e0c59d623f2d20817e92ee  gnome-panel-2.21.90.tar.bz2
+4b2a79d02110fdb38e1573c13e85ab7a  gnome-panel-2.21.91.tar.bz2




More information about the fedora-extras-commits mailing list