diff options
author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-07-19 01:57:55 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-07-19 01:57:55 +0000 |
commit | 38a3190e0daf92baa9524da4876957c990e0896a (patch) | |
tree | 3bf3574bf6f2aeb432db45eb4715a05cfd0769ea /preferred-apps.patch | |
parent | f1b22d20b9e12bf576af45eef86f6aef62874bc5 (diff) | |
download | gnome-panel-38a3190e0daf92baa9524da4876957c990e0896a.tar.gz gnome-panel-38a3190e0daf92baa9524da4876957c990e0896a.tar.xz gnome-panel-38a3190e0daf92baa9524da4876957c990e0896a.zip |
fix one more icongnome-panel-2_23_4-5_fc10
Diffstat (limited to 'preferred-apps.patch')
-rw-r--r-- | preferred-apps.patch | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/preferred-apps.patch b/preferred-apps.patch index 74f51ae..4f61b82 100644 --- a/preferred-apps.patch +++ b/preferred-apps.patch @@ -1,34 +1,15 @@ -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" - - #include "nothing.cP" -@@ -81,6 +82,7 @@ main (int argc, char **argv) - GCONF_CLIENT_PRELOAD_NONE, - NULL); - -+ 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 +diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.c +--- gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps 2008-07-18 21:44:07.000000000 -0400 ++++ gnome-panel-2.23.4/gnome-panel/launcher.c 2008-07-18 21:44:51.000000000 -0400 @@ -23,6 +23,7 @@ #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-url.h> #include <gdk/gdkx.h> +#include <gmenu-tree.h> - #include "launcher.h" + #include <libpanel-util/panel-keyfile.h> -@@ -40,6 +41,7 @@ +@@ -42,6 +43,7 @@ #include "panel-compatibility.h" #include "panel-ditem-editor.h" #include "panel-icon-names.h" @@ -36,7 +17,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps gnome-panel-2 static GdkScreen * launcher_get_screen (Launcher *launcher) -@@ -1299,3 +1301,173 @@ panel_launcher_set_dnd_enabled (Launcher +@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher } else gtk_drag_source_unset (launcher->button); } @@ -210,9 +191,9 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps gnome-panel-2 + filename, g_free, NULL); + } +} -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 +diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.h +--- gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps 2008-07-18 21:44:07.000000000 -0400 ++++ gnome-panel-2.23.4/gnome-panel/launcher.h 2008-07-18 21:44:07.000000000 -0400 @@ -14,6 +14,8 @@ #include "applet.h" #include "panel-widget.h" @@ -230,22 +211,29 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps gnome-panel-2 G_END_DECLS -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); +diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps gnome-panel-2.23.4/gnome-panel/main.c +--- gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps 2008-06-17 06:02:08.000000000 -0400 ++++ gnome-panel-2.23.4/gnome-panel/main.c 2008-07-18 21:44:07.000000000 -0400 +@@ -28,6 +28,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" +@@ -86,6 +87,7 @@ main (int argc, char **argv) + GCONF_CLIENT_PRELOAD_NONE, + NULL); - #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 ++ panel_preferred_apps_init (); + panel_global_config_load (); + panel_lockdown_init (); + panel_profile_load (); +diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c +--- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps 2008-06-17 06:02:08.000000000 -0400 ++++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c 2008-07-18 21:44:07.000000000 -0400 +@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree return list; } @@ -254,3 +242,15 @@ diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps gnome get_all_applications (void) { GMenuTree *tree; +diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h +--- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps 2008-06-17 06:02:08.000000000 -0400 ++++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h 2008-07-18 21:44:07.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__ */ |