r35104 - in /desktop/unstable/gnome-panel/debian: changelog patches/01_menus_rename.patch patches/01_panel_submenus.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon May 21 17:18:13 UTC 2012 

Author: joss
Date: Mon May 21 17:18:13 2012
New Revision: 35104

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35104
Log:
* Rename 01_panel_submenus.patch to 01_menus_rename.patch.
  + Do the applications.menu → gnome-applications.menu prefixing in 
    the rest of the sources as well. See LP#798951.

Added:
    desktop/unstable/gnome-panel/debian/patches/01_menus_rename.patch
      - copied, changed from r35103, desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch
Removed:
    desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=35104&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Mon May 21 17:18:13 2012
@@ -1,8 +1,14 @@
 gnome-panel (3.4.2.1-2) UNRELEASED; urgency=low
 
+  [ Michael Biebl ]
   * debian/patches/15_avoid_applet_loading_failures.patch: Use on_bus_acquired
     instead of on_name_acquired. This helps prevent race conditions at session
     starts which can lead to panel applets failing to load. Closes: #649779
+
+  [ Josselin Mouette ]
+  * Rename 01_panel_submenus.patch to 01_menus_rename.patch.
+    + Do the applications.menu → gnome-applications.menu prefixing in 
+      the rest of the sources as well. See LP#798951.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 15 May 2012 17:55:33 +0200
 

Copied: desktop/unstable/gnome-panel/debian/patches/01_menus_rename.patch (from r35103, desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/01_menus_rename.patch?rev=35104&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/01_menus_rename.patch [utf-8] Mon May 21 17:18:13 2012
@@ -1,8 +1,8 @@
-Index: gnome-panel-3.4.1/gnome-panel/panel-menu-button.c
+Index: gnome-panel-3.4.2.1/gnome-panel/panel-menu-button.c
 ===================================================================
---- gnome-panel-3.4.1.orig/gnome-panel/panel-menu-button.c	2012-03-15 09:56:50.000000000 +0100
-+++ gnome-panel-3.4.1/gnome-panel/panel-menu-button.c	2012-04-19 17:47:46.288533741 +0200
-@@ -73,7 +73,7 @@
+--- gnome-panel-3.4.2.1.orig/gnome-panel/panel-menu-button.c	2012-03-15 09:56:50.000000000 +0100
++++ gnome-panel-3.4.2.1/gnome-panel/panel-menu-button.c	2012-05-21 19:15:24.863011415 +0200
+@@ -73,7 +73,7 @@ typedef struct {
  } MenuPathRootItem;
  
  static MenuPathRootItem root_items [] = {
@@ -11,3 +11,64 @@
  	{ GNOMECC_MENU,      "gnomecc",      "gnomecc.menu"      }
  };
  
+Index: gnome-panel-3.4.2.1/gnome-panel/menu.c
+===================================================================
+--- gnome-panel-3.4.2.1.orig/gnome-panel/menu.c	2012-03-15 09:56:50.000000000 +0100
++++ gnome-panel-3.4.2.1/gnome-panel/menu.c	2012-05-21 19:17:19.883572374 +0200
+@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
+ {
+ 	GtkWidget *main_menu;
+ 
+-	main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
++	main_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE);
+ 
+ 	g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
+ 	/* FIXME need to update the panel on parent_set */
+Index: gnome-panel-3.4.2.1/gnome-panel/panel-addto.c
+===================================================================
+--- gnome-panel-3.4.2.1.orig/gnome-panel/panel-addto.c	2012-03-15 09:56:50.000000000 +0100
++++ gnome-panel-3.4.2.1/gnome-panel/panel-addto.c	2012-05-21 19:16:37.067364113 +0200
+@@ -665,7 +665,7 @@ panel_addto_make_application_model (Pane
+ 				    G_TYPE_POINTER,
+ 				    G_TYPE_STRING);
+ 
+-	tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++	tree = gmenu_tree_new ("gnome-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+ 
+ 	if (!gmenu_tree_load_sync (tree, NULL)) {
+ 		g_object_unref (tree);
+@@ -674,7 +674,7 @@ panel_addto_make_application_model (Pane
+ 
+ 	if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
+ 		panel_addto_make_application_list (&dialog->application_list,
+-						   root, "applications.menu",
++						   root, "gnome-applications.menu",
+ 						   PANEL_ADDTO_MENU_SHOW_ALL);
+ 		panel_addto_populate_application_model (store, NULL, dialog->application_list);
+ 
+Index: gnome-panel-3.4.2.1/gnome-panel/panel-menu-bar.c
+===================================================================
+--- gnome-panel-3.4.2.1.orig/gnome-panel/panel-menu-bar.c	2012-03-15 09:56:50.000000000 +0100
++++ gnome-panel-3.4.2.1/gnome-panel/panel-menu-bar.c	2012-05-21 19:17:02.199494097 +0200
+@@ -116,7 +116,7 @@ panel_menu_bar_init (PanelMenuBar *menub
+ 
+ 	menubar->priv->info = NULL;
+ 
+-	menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE);
++	menubar->priv->applications_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE);
+ 
+ 	menubar->priv->applications_item = panel_image_menu_item_new ();
+ 	gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
+Index: gnome-panel-3.4.2.1/gnome-panel/panel-run-dialog.c
+===================================================================
+--- gnome-panel-3.4.2.1.orig/gnome-panel/panel-run-dialog.c	2012-03-15 09:56:50.000000000 +0100
++++ gnome-panel-3.4.2.1/gnome-panel/panel-run-dialog.c	2012-05-21 19:15:49.411132255 +0200
+@@ -777,7 +777,7 @@ get_all_applications (void)
+ 	GMenuTreeDirectory *root;
+ 	GSList             *retval;
+ 
+-	tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++	tree = gmenu_tree_new ("gnome-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+ 
+ 	if (!gmenu_tree_load_sync (tree, NULL))
+ 		return NULL;

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=35104&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Mon May 21 17:18:13 2012
@@ -1,4 +1,4 @@
-01_panel_submenus.patch
+01_menus_rename.patch
 03_tasklist_orientation.patch
 10_bookmarks_limit.patch
 11_compat_options.patch

More information about the pkg-gnome-commits mailing list