diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-10-09 17:56:19 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-10-09 17:56:19 +0000 |
| commit | 3b36adea91801b50fb078ec56efb69ad44f78119 (patch) | |
| tree | ae4f7e8e056de188aef2de97fefc3f3a1f734b5e | |
| parent | 1830c93dc27d221147a20a89b2abf990c9faece3 (diff) | |
| download | gnome-panel-3b36adea91801b50fb078ec56efb69ad44f78119.tar.gz gnome-panel-3b36adea91801b50fb078ec56efb69ad44f78119.tar.xz gnome-panel-3b36adea91801b50fb078ec56efb69ad44f78119.zip | |
fix menu item visibilitygnome-panel-2_24_0-5_fc10
| -rw-r--r-- | gnome-panel.spec | 8 | ||||
| -rw-r--r-- | tryexec.patch | 29 |
2 files changed, 36 insertions, 1 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index 8bae54c..e6164e4 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.24.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2 @@ -117,6 +117,8 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch Patch25: gnome-panel-2.24.0-smoother-slide-in.patch Patch35: clock-wakeups.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=555710 +Patch36: tryexec.patch Conflicts: gnome-power-manager < 2.15.3 @@ -165,6 +167,7 @@ Panel Applets using the libpanel-applet library. %patch24 -p1 -b .allow-spurious-view-done-signals %patch25 -p1 -b .smoother-slide-in %patch35 -p1 -b .clock-wakeups +%patch36 -p1 -b .tryexec . %{SOURCE6} @@ -364,6 +367,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Thu Oct 9 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-5 +- Don't show menuitems which fail the tryexec test + * Fri Sep 26 2008 Ray Strode <rstrode@redhat.com> - 2.24.0-4 - Try to make initial panel slide-in animation be smooth diff --git a/tryexec.patch b/tryexec.patch new file mode 100644 index 0000000..7226f38 --- /dev/null +++ b/tryexec.patch @@ -0,0 +1,29 @@ +diff -up gnome-panel-2.24.0/gnome-panel/panel-menu-items.c.tryexec gnome-panel-2.24.0/gnome-panel/panel-menu-items.c +--- gnome-panel-2.24.0/gnome-panel/panel-menu-items.c.tryexec 2008-10-09 13:31:01.000000000 -0400 ++++ gnome-panel-2.24.0/gnome-panel/panel-menu-items.c 2008-10-09 13:36:29.000000000 -0400 +@@ -151,6 +151,8 @@ panel_menu_items_append_from_desktop (Gt + char *icon; + char *name; + char *comment; ++ char *tryexec; ++ char *prog; + + path_freeme = NULL; + +@@ -189,6 +191,16 @@ panel_menu_items_append_from_desktop (Gt + g_free (path_freeme); + return; + } ++ tryexec = panel_key_file_get_string (key_file, "TryExec"); ++ if (tryexec) { ++ prog = g_find_program_in_path (tryexec); ++ g_free (tryexec); ++ if (!prog) { ++ g_key_file_free (key_file); ++ return; ++ } ++ g_free (prog); ++ } + + icon = panel_key_file_get_locale_string (key_file, "Icon"); + comment = panel_key_file_get_locale_string (key_file, "Comment"); |