rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch, 1.4, 1.5 gnome-panel.spec, 1.114, 1.115

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14081

Modified Files:
	gnome-panel-2.13.91-gpm-integration.patch gnome-panel.spec 
Log Message:
- bring back shutdown menu item


gnome-panel-2.13.91-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   57 +++-
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   30 +-
 gnome-panel/panel-menu-items.c    |   26 +
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 724 insertions(+), 12 deletions(-)

Index: gnome-panel-2.13.91-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.13.91-gpm-integration.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 14:36:24 -0000	1.4
+++ gnome-panel-2.13.91-gpm-integration.patch	19 Feb 2006 23:52:11 -0000	1.5
@@ -676,7 +676,7 @@
  panel_action_shutdown_is_disabled (void)
  {
  	return (panel_lockdown_get_disable_log_out() ||
-+		panel_action_can_suspend() ||
++		/* panel_action_can_suspend() || */
  		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
  }
  


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-panel.spec	15 Feb 2006 14:36:24 -0000	1.114
+++ gnome-panel.spec	19 Feb 2006 23:52:11 -0000	1.115
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.91
-Release: 2
+Release: 3
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -206,6 +206,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-3
+- bring back shutdown menu item
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
 - fix up the gnome-power-manager integration patch