rpms/gnome-panel/devel gnome-panel-about.patch, NONE, 1.1 gnome-panel.spec, 1.361, 1.362 panel-icons.patch, 1.1, 1.2

Matthias Clasen mclasen at fedoraproject.org
Sat Aug 1 00:09:53 UTC 2009 

Author: mclasen

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

Modified Files:
	gnome-panel.spec panel-icons.patch 
Added Files:
	gnome-panel-about.patch 
Log Message:
Reduce excessive 'about'-ing in the System menu


gnome-panel-about.patch:
 panel-menu-items.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnome-panel-about.patch ---
diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about	2009-07-31 18:29:02.635601324 -0400
+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-31 18:30:18.129605780 -0400
@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
 		add_menu_separator (menu);
 
 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
-	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+	if (panel_has_desktop_file ("about-this-computer.desktop"))
+		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
 
 	if (parent->priv->append_lock_logout)
 		panel_menu_items_append_lock_logout (menu);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -p -r1.361 -r1.362
--- gnome-panel.spec	27 Jul 2009 14:01:58 -0000	1.361
+++ gnome-panel.spec	1 Aug 2009 00:09:52 -0000	1.362
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.27.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
 
@@ -91,12 +91,8 @@ BuildRequires: libtool
 
 Patch0: gnome-panel-2.23.4-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch4: gnome-panel-2.25.3-search.patch
-# Drop this patch for now, it should have AT LEAST been moved
-# to an upstream bugzilla by now
-#Patch6: gnome-panel-2.16.0-compiz-support.patch
-Patch7: gnome-panel-2.21.92-about-this-computer.patch
+Patch2: gnome-panel-2.25.3-search.patch
+Patch3: gnome-panel-about.patch
 
 # the next three patches belong together
 # http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -162,10 +158,8 @@ Panel Applets using the libpanel-applet 
 
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p1 -b .about-fedora
-%patch4 -p0 -b .search
-##%patch6 -p0 -b .compiz-support
-%patch7 -p1 -b .about-this-computer
+%patch2 -p0 -b .search
+%patch3 -p1 -b .about
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
@@ -378,6 +372,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-5
+- Reduce the excessive 'about'-ing in the System menu
+
 * Mon Jul 27 2009 Matthias Clasen <mclasen at redhat.com> 2.27.4-4
 - Drop unneeded direct deps
 

panel-icons.patch:
 menu.c             |    2 +-
 panel-menu-items.c |   34 +++++++++++++++++++++++-----------
 panel-recent.c     |    2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

Index: panel-icons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/panel-icons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- panel-icons.patch	22 Jul 2009 21:32:55 -0000	1.1
+++ panel-icons.patch	1 Aug 2009 00:09:52 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons gnome-panel-2.27.4/gnome-panel/menu.c
 --- gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/menu.c	2009-07-22 16:36:34.928388257 -0400
++++ gnome-panel-2.27.4/gnome-panel/menu.c	2009-07-31 18:31:52.836622831 -0400
 @@ -1389,7 +1389,7 @@ create_submenu_entry (GtkWidget         
  {
  	GtkWidget *menuitem;
@@ -11,8 +11,8 @@ diff -up gnome-panel-2.27.4/gnome-panel/
  					panel_menu_icon_get_size (),
  					NULL, NULL,
 diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons	2009-07-22 16:36:34.768127904 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-22 16:39:57.329131999 -0400
+--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons	2009-07-31 18:31:52.737846416 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-31 18:34:05.243598174 -0400
 @@ -1,4 +1,5 @@
 -/*
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
@@ -95,16 +95,12 @@ diff -up gnome-panel-2.27.4/gnome-panel/
          }
  
  
-@@ -1158,11 +1170,11 @@ panel_desktop_menu_item_append_menu (Gtk
+@@ -1158,9 +1170,9 @@ panel_desktop_menu_item_append_menu (Gtk
  	if (add_separator)
  		add_menu_separator (menu);
  
 -	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
--	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
--	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
 +	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
-+	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
-+	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL, FALSE);
  	if (panel_has_desktop_file ("about-this-computer.desktop"))
 -		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
 +		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL, FALSE);
@@ -113,7 +109,7 @@ diff -up gnome-panel-2.27.4/gnome-panel/
  		panel_menu_items_append_lock_logout (menu);
 diff -up gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-recent.c
 --- gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-07-22 16:36:34.933388684 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-07-31 18:31:52.839621328 -0400
 @@ -188,7 +188,7 @@ panel_recent_append_documents_menu (GtkW
  	GtkWidget      *menu_item;
  	int             size;

More information about the scm-commits mailing list