rpms/gnome-panel/devel tryexec.patch, NONE, 1.1 gnome-panel.spec, 1.322, 1.323

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Added Files:
	tryexec.patch 
Log Message:
fix menu item visibility


tryexec.patch:

--- NEW FILE tryexec.patch ---
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");


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- gnome-panel.spec	29 Sep 2008 18:39:12 -0000	1.322
+++ gnome-panel.spec	9 Oct 2008 17:56:19 -0000	1.323
@@ -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 @@
 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 @@
 %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 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct  9 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-5
+- Don't show menuitems which fail the tryexec test
+
 * Fri Sep 26 2008 Ray Strode  <rstrode at redhat.com> - 2.24.0-4
 - Try to make initial panel slide-in animation be smooth