rpms/gnome-panel/devel gnome-panel.spec, 1.337, 1.338 preferred-apps.patch, 1.8, 1.9

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28337

Modified Files:
	gnome-panel.spec preferred-apps.patch 
Log Message:
- Update preferred apps patch to apply



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- gnome-panel.spec	18 Dec 2008 17:15:19 -0000	1.337
+++ gnome-panel.spec	18 Dec 2008 17:45:41 -0000	1.338
@@ -165,7 +165,7 @@
 %patch7 -p1 -b .about-this-computer
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
-%patch10 -p1 -b .preferred-apps
+%patch10 -p0 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 #%patch25 -p1 -b .smoother-slide-in
@@ -375,7 +375,7 @@
 %changelog
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-3
 - Remove the mixer from the default panel config as well
-- Update search patch
+- Update search and preferred apps patches
 
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- preferred-apps.patch	5 Aug 2008 16:44:17 -0000	1.8
+++ preferred-apps.patch	18 Dec 2008 17:45:42 -0000	1.9
@@ -1,9 +1,36 @@
-diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.6/gnome-panel/launcher.c
---- gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps	2008-08-05 12:31:49.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/launcher.c	2008-08-05 12:35:46.000000000 -0400
-@@ -22,6 +22,7 @@
+Index: gnome-panel/panel-run-dialog.c
+===================================================================
+--- gnome-panel/panel-run-dialog.c	(revision 11419)
++++ gnome-panel/panel-run-dialog.c	(working copy)
+@@ -789,7 +789,7 @@
+ 	return list;
+ }
+ 
+-static GSList *
++GSList *
+ get_all_applications (void)
+ {
+ 	GMenuTree          *tree;
+Index: gnome-panel/panel-run-dialog.h
+===================================================================
+--- gnome-panel/panel-run-dialog.h	(revision 11419)
++++ gnome-panel/panel-run-dialog.h	(working copy)
+@@ -32,6 +32,8 @@
+ void panel_run_dialog_present           (GdkScreen  *screen,
+ 					 guint32    activate_time);
+ 
++GSList *get_all_applications           (void);
++
+ G_END_DECLS
+ 
+ #endif /* __PANEL_RUN_DIALOG_H__ */
+Index: gnome-panel/launcher.c
+===================================================================
+--- gnome-panel/launcher.c	(revision 11419)
++++ gnome-panel/launcher.c	(working copy)
+@@ -21,6 +21,7 @@
+ #include <glib/gi18n.h>
  #include <gio/gio.h>
- #include <libgnome/gnome-util.h>
  #include <gdk/gdkx.h>
 +#include <gmenu-tree.h>
  
@@ -17,7 +44,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1282,3 +1284,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1110,3 +1112,173 @@
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -191,9 +218,10 @@
 +					 filename, g_free, NULL);
 +	}
 +}
-diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.6/gnome-panel/launcher.h
---- gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps	2008-08-05 12:31:49.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/launcher.h	2008-08-05 12:31:49.000000000 -0400
+Index: gnome-panel/launcher.h
+===================================================================
+--- gnome-panel/launcher.h	(revision 11419)
++++ gnome-panel/launcher.h	(working copy)
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -202,8 +230,8 @@
 +
  G_BEGIN_DECLS
  
- #define PANEL_LAUNCHERS_PATH "panel2.d/default/launchers"
-@@ -73,6 +75,7 @@ void            launcher_properties_dest
+ typedef struct {
+@@ -70,6 +72,7 @@
  void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
  						 gboolean  dnd_enabled);
  
@@ -211,10 +239,11 @@
  
  G_END_DECLS
  
-diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps gnome-panel-2.23.6/gnome-panel/main.c
---- gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps	2008-08-04 16:43:10.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/main.c	2008-08-05 12:31:49.000000000 -0400
-@@ -28,6 +28,7 @@
+Index: gnome-panel/main.c
+===================================================================
+--- gnome-panel/main.c	(revision 11419)
++++ gnome-panel/main.c	(working copy)
+@@ -27,6 +27,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
  #include "panel-icon-names.h"
@@ -222,7 +251,7 @@
  #include "xstuff.h"
  
  #include "nothing.cP"
-@@ -86,6 +87,7 @@ main (int argc, char **argv)
+@@ -86,6 +87,7 @@
  			      GCONF_CLIENT_PRELOAD_NONE,
  			      NULL);
  
@@ -230,27 +259,3 @@
  	panel_global_config_load ();
  	panel_lockdown_init ();
  	panel_profile_load ();
-diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps	2008-08-04 16:43:10.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c	2008-08-05 12:31:49.000000000 -0400
-@@ -797,7 +797,7 @@ get_all_applications_from_dir (GMenuTree
- 	return list;
- }
- 
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- 	GMenuTree          *tree;
-diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps	2008-08-04 16:43:10.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h	2008-08-05 12:31:49.000000000 -0400
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present           (GdkScreen  *screen,
- 					 guint32    activate_time);
- 
-+GSList *get_all_applications           (void);
-+
- G_END_DECLS
- 
- #endif /* __PANEL_RUN_DIALOG_H__ */