rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch, 1.1, 1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Feb 15 05:42:51 UTC 2006 

Author: mclasen

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

Modified Files:
	gnome-panel-2.13.91-gpm-integration.patch 
Log Message:
fix patch


gnome-panel-2.13.91-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   60 ++++
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   30 +-
 gnome-panel/panel-menu-items.c    |   38 ++
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 737 insertions(+), 14 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:26:02 -0000	1.1
+++ gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:42:48 -0000	1.2
@@ -1,5 +1,5 @@
 --- gnome-panel-2.13.91/gnome-panel/Makefile.am.gpm-integration	2006-02-12 14:07:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 00:31:14.000000000 -0500
 @@ -116,6 +116,7 @@
  	panel-addto.c		\
  	panel-logout.c		\
@@ -16,8 +16,8 @@
  	$(EGG_RECENT_FILES_H)	\
  	$(NULL)
  
---- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 00:21:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 00:21:03.000000000 -0500
+--- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 00:31:14.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 00:31:14.000000000 -0500
 @@ -32,6 +32,7 @@
  
  #include "panel-logout.h"
@@ -114,8 +114,8 @@
  					       _("_Suspend"),
  					       PANEL_LOGOUT_RESPONSE_STD);
 --- gnome-panel-2.13.91/gnome-panel/panel-action-button.c.gpm-integration	2006-02-12 07:36:56.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 00:24:35.000000000 -0500
-@@ -47,10 +47,15 @@
++++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 00:42:37.000000000 -0500
+@@ -47,10 +47,16 @@
  #include "panel-lockdown.h"
  #include "panel-logout.h"
  #include "panel-compatibility.h"
@@ -125,13 +125,14 @@
  #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
  
 +static gboolean panel_action_can_suspend (void);
++static gboolean panel_action_logout_is_disabled (void);
 +static gboolean panel_action_suspend_is_disabled (void);
 +static void panel_action_suspend (GtkWidget *widget);
 +
  enum {
  	PROP_0,
  	PROP_ACTION_TYPE,
-@@ -77,6 +82,7 @@
+@@ -77,6 +83,7 @@
  	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
  	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
  	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
@@ -139,12 +140,12 @@
  	/* compatibility with GNOME < 2.13.90 */
  	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
  	{ 0,                           NULL             },
-@@ -158,6 +164,13 @@
+@@ -158,6 +165,13 @@
  			  gtk_get_current_event_time ());
  }
  
 +static gboolean
-+panel_action_shutdown_is_disabled (void)
++panel_action_logout_is_disabled (void)
 +{
 +  return panel_action_can_suspend () ||
 +	 panel_lockdown_get_disable_log_out ();
@@ -153,7 +154,7 @@
  static void
  panel_action_shutdown (GtkWidget *widget)
  {
-@@ -173,6 +186,39 @@
+@@ -173,6 +187,39 @@
  		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
  }
  
@@ -193,12 +194,12 @@
  /* Run Application
   */
  static void
-@@ -308,7 +354,17 @@
+@@ -308,7 +355,17 @@
  		"gospanel-20",
  		"ACTION:logout:NEW",
  		panel_action_logout, NULL, NULL,
 -		panel_lockdown_get_disable_log_out
-+                panel_action_shutdown_is_disabled
++                panel_action_logout_is_disabled
 +        },
 +        {
 +                PANEL_ACTION_SUSPEND,
@@ -212,7 +213,7 @@
  	},
  	{
  		PANEL_ACTION_RUN,
-@@ -861,6 +917,7 @@
+@@ -861,6 +918,7 @@
  		actions [button->priv->type].invoke_menu (button, callback_name);
  }
  
@@ -221,7 +222,7 @@
  panel_action_button_load_from_drag (PanelToplevel *toplevel,
  				    int            position,
 --- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 00:31:14.000000000 -0500
 @@ -0,0 +1,83 @@
 +/* panel-power-manager.h - functions for powering down, restarting, and
 + *                         suspending the computer
@@ -307,7 +308,7 @@
 +G_END_DECLS
 +#endif /* PANEL_POWER_MANAGER_H */
 --- gnome-panel-2.13.91/gnome-panel/panel-enums.h.gpm-integration	2006-01-22 07:08:24.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 00:31:14.000000000 -0500
 @@ -96,6 +96,7 @@
  	PANEL_ACTION_FORCE_QUIT,
  	PANEL_ACTION_CONNECT_SERVER,
@@ -316,8 +317,8 @@
  	/* compatibility with GNOME < 2.13.90 */
          PANEL_ACTION_SCREENSHOT,
          PANEL_ACTION_LAST
---- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 00:21:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 00:21:03.000000000 -0500
+--- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 00:31:14.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 00:31:14.000000000 -0500
 @@ -49,6 +49,7 @@
  #include "panel-recent.h"
  #include "panel-stock-icons.h"
@@ -326,7 +327,26 @@
  
  #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
  #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
-@@ -1011,8 +1012,21 @@
+@@ -633,9 +634,15 @@
+ 
+ 	add_menu_separator (places_menu);
+ 
+-	panel_menu_items_append_from_desktop (places_menu,
+-					      "gnome-search-tool.desktop",
+-					      NULL);
++        if (panel_is_program_in_path ("beagle-search")) {
++              panel_menu_items_append_from_desktop (places_menu,
++                                                    "gnome-beagle-search.desktop",
++                                                    NULL);
++        } else {
++              panel_menu_items_append_from_desktop (places_menu,
++                                                    "gnome-search-tool.desktop",
++                                                    NULL);
++        }
+ 
+ 	*recent_view = panel_recent_append_documents_menu (places_menu,
+ 							   *recent_view);
+@@ -1011,8 +1018,21 @@
  
  	menuitem->priv->append_lock_logout = append_lock_logout;
  	if (append_lock_logout)
@@ -350,7 +370,7 @@
  
  	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
  	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
-@@ -1118,6 +1132,14 @@
+@@ -1118,6 +1138,14 @@
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	}
  
@@ -366,7 +386,7 @@
  	if (item != NULL) {
  		if (!separator_inserted)
 --- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 00:31:14.000000000 -0500
 @@ -0,0 +1,533 @@
 +/* panel-power-manager.c - functions for powering down, restarting, and
 + *                         suspending the computer
@@ -902,7 +922,7 @@
 +}
 +#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */
 --- gnome-panel-2.13.91/configure.in.gpm-integration	2006-02-13 13:30:38.000000000 -0500
-+++ gnome-panel-2.13.91/configure.in	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/configure.in	2006-02-15 00:31:14.000000000 -0500
 @@ -58,10 +58,12 @@
  LIBECAL_REQUIRED=0.0.97
  LIBEDATASERVERUI_REQUIRED=1.2.0

More information about the fedora-cvs-commits mailing list