[packages/mate-panel] no hardcoded mate- prefix for applications.menu

[glen]

commit ee8e5e1a429499e4d5aaf0529dbed8d152e11d16
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 16 12:39:55 2013 +0200

    no hardcoded mate- prefix for applications.menu

 mate-panel.spec          |  4 +++-
 no-xdg-menu-prefix.patch | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index 2c75bb3..2ae41cc 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -11,12 +11,13 @@
 Summary:	MATE Desktop panel applets
 Name:		mate-panel
 Version:	1.5.3
-Release:	2
+Release:	3
 # libs are LGPLv2+ applications GPLv2+
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 # Source0-md5:	72029cbcd38bee447df92c8774452bf3
+Patch0:		no-xdg-menu-prefix.patch
 URL:		http://wiki.mate-desktop.org/mate-panel
 BuildRequires:	NetworkManager-gtk-lib-devel
 BuildRequires:	dbus-glib-devel
@@ -88,6 +89,7 @@ Dokumentacja API %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
diff --git a/no-xdg-menu-prefix.patch b/no-xdg-menu-prefix.patch
new file mode 100644
index 0000000..1d60afd
--- /dev/null
+++ b/no-xdg-menu-prefix.patch
@@ -0,0 +1,61 @@
+--- mate-panel-1.5.3/./mate-panel/panel-menu-bar.c~	2012-12-20 00:48:49.000000000 +0200
++++ mate-panel-1.5.3/./mate-panel/panel-menu-bar.c	2013-01-16 12:07:54.282974605 +0200
+@@ -116,7 +116,7 @@
+ 	menubar->priv->info = NULL;
+ 
+ 
+-	menubar->priv->applications_menu = create_applications_menu("mate-applications.menu", NULL, TRUE);
++	menubar->priv->applications_menu = create_applications_menu("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), _("Applications"));
+--- mate-panel-1.5.3/./mate-panel/menu.c~	2012-12-20 00:48:49.000000000 +0200
++++ mate-panel-1.5.3/./mate-panel/menu.c	2013-01-16 12:08:04.950133393 +0200
+@@ -1793,7 +1793,7 @@
+ {
+ 	GtkWidget* main_menu;
+ 
+-	main_menu = create_applications_menu("mate-applications.menu", NULL, TRUE);
++	main_menu = create_applications_menu("applications.menu", NULL, TRUE);
+ 
+ 	g_object_set_data(G_OBJECT(main_menu), "menu_panel", panel);
+ 	/* FIXME need to update the panel on parent_set */
+--- mate-panel-1.5.3/./mate-panel/panel-menu-button.c~	2012-12-20 00:48:49.000000000 +0200
++++ mate-panel-1.5.3/./mate-panel/panel-menu-button.c	2013-01-16 12:08:17.590716557 +0200
+@@ -77,7 +77,7 @@
+ } MenuPathRootItem;
+ 
+ static MenuPathRootItem root_items[] = {
+-	{APPLICATIONS_MENU, "mate-applications", "mate-applications.menu"},
++	{APPLICATIONS_MENU, "applications", "applications.menu"},
+ 	{SETTINGS_MENU, "mate-settings", "mate-settings.menu"}
+ };
+ 
+--- mate-panel-1.5.3/./mate-panel/panel-addto.c~	2012-12-20 00:48:50.000000000 +0200
++++ mate-panel-1.5.3/./mate-panel/panel-addto.c	2013-01-16 12:08:31.741369388 +0200
+@@ -692,12 +692,12 @@
+ 
+ 	store = gtk_tree_store_new(NUMBER_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
+ 
+-	tree = matemenu_tree_lookup("mate-applications.menu", MATEMENU_TREE_FLAGS_NONE);
++	tree = matemenu_tree_lookup("applications.menu", MATEMENU_TREE_FLAGS_NONE);
+ 	matemenu_tree_set_sort_key(tree, MATEMENU_TREE_SORT_DISPLAY_NAME);
+ 
+ 	if ((root = matemenu_tree_get_root_directory (tree)))
+ 	{
+-		panel_addto_make_application_list(&dialog->application_list, root, "mate-applications.menu");
++		panel_addto_make_application_list(&dialog->application_list, root, "applications.menu");
+ 		panel_addto_populate_application_model(store, NULL, dialog->application_list);
+ 
+ 		matemenu_tree_item_unref(root);
+--- mate-panel-1.5.3/./mate-panel/panel-run-dialog.c~	2012-12-20 00:48:50.000000000 +0200
++++ mate-panel-1.5.3/./mate-panel/panel-run-dialog.c	2013-01-16 12:08:41.471818295 +0200
+@@ -857,7 +857,7 @@
+ 	MateMenuTreeDirectory* root;
+ 	GSList* retval;
+ 
+-	tree = matemenu_tree_lookup("mate-applications.menu", MATEMENU_TREE_FLAGS_NONE);
++	tree = matemenu_tree_lookup("applications.menu", MATEMENU_TREE_FLAGS_NONE);
+ 	matemenu_tree_set_sort_key(tree, MATEMENU_TREE_SORT_DISPLAY_NAME);
+ 
+ 	root = matemenu_tree_get_root_directory(tree);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-panel.git/commitdiff/ee8e5e1a429499e4d5aaf0529dbed8d152e11d16