diff options
author | Bastien Nocera <hadess@fedoraproject.org> | 2008-12-18 17:45:42 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@fedoraproject.org> | 2008-12-18 17:45:42 +0000 |
commit | c41fe0bdfe2d836583c0656efdb0709453d14739 (patch) | |
tree | 40b1771648c0ac6c91b46658c9f2e7bdde1e811e /preferred-apps.patch | |
parent | f6a2de691b22dd55b635feff9b08069be3822784 (diff) | |
download | gnome-panel-c41fe0bdfe2d836583c0656efdb0709453d14739.tar.gz gnome-panel-c41fe0bdfe2d836583c0656efdb0709453d14739.tar.xz gnome-panel-c41fe0bdfe2d836583c0656efdb0709453d14739.zip |
- Update preferred apps patch to apply
Diffstat (limited to 'preferred-apps.patch')
-rw-r--r-- | preferred-apps.patch | 85 |
1 files changed, 45 insertions, 40 deletions
diff --git a/preferred-apps.patch b/preferred-apps.patch index 71281e2..e1de0e5 100644 --- a/preferred-apps.patch +++ b/preferred-apps.patch @@ -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 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2. 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 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2. + 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 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2. + 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 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2. 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 @@ diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps gnome-panel-2.23.6 #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 @@ diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps gnome-panel-2.23.6 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__ */ |