rpms/gnome-panel/devel gnome-panel-2.15.90-move-suspend-to-menu.patch, 1.2, 1.3 gnome-panel.spec, 1.140, 1.141
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 9 06:27:23 UTC 2006
Author: rstrode
Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12969
Modified Files:
gnome-panel-2.15.90-move-suspend-to-menu.patch
gnome-panel.spec
Log Message:
- remove suspend from logout dialog
gnome-panel-2.15.90-move-suspend-to-menu.patch:
panel-action-button.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
panel-enums.h | 1
panel-logout.c | 4 ---
panel-menu-items.c | 23 +++++++++++++++++++++-
4 files changed, 75 insertions(+), 5 deletions(-)
Index: gnome-panel-2.15.90-move-suspend-to-menu.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.15.90-move-suspend-to-menu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-panel-2.15.90-move-suspend-to-menu.patch 5 Aug 2006 13:05:55 -0000 1.2
+++ gnome-panel-2.15.90-move-suspend-to-menu.patch 9 Aug 2006 06:27:19 -0000 1.3
@@ -1,5 +1,5 @@
---- gnome-panel-2.15.90/gnome-panel/panel-menu-items.c.move-suspend-to-menu 2006-08-04 13:59:37.000000000 -0400
-+++ gnome-panel-2.15.90/gnome-panel/panel-menu-items.c 2006-08-04 14:27:02.000000000 -0400
+--- gnome-panel-2.15.90/gnome-panel/panel-menu-items.c.move-suspend-to-menu 2006-08-07 11:14:02.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-menu-items.c 2006-08-07 11:14:02.000000000 -0400
@@ -49,6 +49,7 @@
#include "panel-recent.h"
#include "panel-stock-icons.h"
@@ -8,7 +8,7 @@
#define BOOKMARKS_FILENAME ".gtk-bookmarks"
#define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
-@@ -1005,10 +1006,22 @@ panel_desktop_menu_item_new (gboolean us
+@@ -1005,10 +1006,22 @@
}
menuitem->priv->append_lock_logout = append_lock_logout;
@@ -32,7 +32,7 @@
menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
menuitem->priv->menu);
-@@ -1113,6 +1126,14 @@ panel_menu_items_append_lock_logout (Gtk
+@@ -1113,6 +1126,14 @@
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
@@ -47,9 +47,9 @@
item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
if (item != NULL) {
if (!separator_inserted)
---- gnome-panel-2.15.90/gnome-panel/panel-enums.h.move-suspend-to-menu 2006-08-04 14:04:53.000000000 -0400
-+++ gnome-panel-2.15.90/gnome-panel/panel-enums.h 2006-08-04 14:32:59.000000000 -0400
-@@ -96,6 +96,7 @@ typedef enum {
+--- gnome-panel-2.15.90/gnome-panel/panel-enums.h.move-suspend-to-menu 2006-07-24 10:50:32.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-enums.h 2006-08-07 11:14:02.000000000 -0400
+@@ -96,6 +96,7 @@
PANEL_ACTION_FORCE_QUIT,
PANEL_ACTION_CONNECT_SERVER,
PANEL_ACTION_SHUTDOWN,
@@ -58,7 +58,7 @@
PANEL_ACTION_SCREENSHOT,
PANEL_ACTION_LAST
--- gnome-panel-2.15.90/gnome-panel/panel-action-button.c.move-suspend-to-menu 2006-02-12 07:36:56.000000000 -0500
-+++ gnome-panel-2.15.90/gnome-panel/panel-action-button.c 2006-08-04 14:33:32.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-action-button.c 2006-08-07 11:14:02.000000000 -0400
@@ -47,10 +47,16 @@
#include "panel-lockdown.h"
#include "panel-logout.h"
@@ -76,7 +76,7 @@
enum {
PROP_0,
PROP_ACTION_TYPE,
-@@ -77,6 +83,7 @@ static GConfEnumStringPair panel_action_
+@@ -77,6 +83,7 @@
{ PANEL_ACTION_FORCE_QUIT, "force-quit" },
{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
{ PANEL_ACTION_SHUTDOWN, "shutdown" },
@@ -84,7 +84,7 @@
/* compatibility with GNOME < 2.13.90 */
{ PANEL_ACTION_SCREENSHOT, "screenshot" },
{ 0, NULL },
-@@ -167,12 +174,47 @@ panel_action_shutdown (GtkWidget *widget
+@@ -167,12 +174,47 @@
}
static gboolean
@@ -132,7 +132,7 @@
/* Run Application
*/
static void
-@@ -358,6 +400,16 @@ static PanelAction actions [] = {
+@@ -358,6 +400,16 @@
panel_action_shutdown, NULL, NULL,
panel_action_shutdown_is_disabled
},
@@ -149,3 +149,16 @@
/* deprecated actions */
{
PANEL_ACTION_SCREENSHOT,
+--- gnome-panel-2.15.90/gnome-panel/panel-logout.c.move-suspend-to-menu 2006-08-09 02:25:53.000000000 -0400
++++ gnome-panel-2.15.90/gnome-panel/panel-logout.c 2006-08-09 02:25:58.000000000 -0400
+@@ -334,10 +334,6 @@
+ primary_text = _("Shut down this system now?");
+
+ logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
+- if (panel_power_manager_can_suspend (logout_dialog->priv->power_manager))
+- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+- _("S_uspend"),
+- PANEL_LOGOUT_RESPONSE_STR);
+
+ if (panel_power_manager_can_hibernate (logout_dialog->priv->power_manager))
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-panel.spec 7 Aug 2006 22:39:23 -0000 1.140
+++ gnome-panel.spec 9 Aug 2006 06:27:19 -0000 1.141
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.15.90
-Release: 4%{?dist}
+Release: 5%{?dist}
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
@@ -231,7 +231,10 @@
%{_datadir}/gtk-doc
%changelog
-* Mon Aug 7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.90-4
+* Wed Aug 9 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-5
+- remove suspend from logout dialog
+
+-* Mon Aug 7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.15.90-4
- Rebuild against evolution-data-server-1.7.91
* Mon Aug 7 2006 Ray Strode <rstrode at redhat.com> - 2.15.90-3
More information about the fedora-cvs-commits
mailing list