← Back to branch summary

~matttbe/ubuntu/raring/alacarte/lp1086369

« back to all changes in this revision

Viewing changes to debian/patches/40-xdg-menu-prefix

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-06-11 17:10:44 UTC
  • mfrom: (2.2.3 sid)
  • Revision ID: package-import@ubuntu.com-20120611171044-3bzzr3vus1h2f5hy
Tags: 0.13.4-2ubuntu1
* Resynchronise with Debian unstable, remianing changes 
  - debian/patches/40-call-exo-d-i-e-on-xfce.patch: call
    exo-desktop-item-edit instead of gnome-desktop-item-edit when
    XDG_CURRENT_DESKTOP=XFCE.
* Disable 40_xdg_menu_prefix as this does not apply to Ubuntu.
* Cherry-pick patch from Debian SVN to add missing python-gi dep
* Cherry-pick upstream patch to not fix some typos relating to separators.
  Fixes some crashes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/40-xdg-menu-prefix
 
1
Description: Edit menus from gnome(or $XDG_MENU_PREFIX)-applications.menu
 
2
  instead of applications.menu
 
3
Author: Iain Lane <laney@debian.org>
 
4
Forwarded: not-needed
 
5
Bug-Debian: http://bugs.debian.org/676137
 
6
 
 
7
Index: alacarte-0.13.4/Alacarte/MenuEditor.py
 
8
===================================================================
 
9
--- alacarte-0.13.4.orig/Alacarte/MenuEditor.py 2012-06-01 07:32:20.000000000 +0100
 
10
+++ alacarte-0.13.4/Alacarte/MenuEditor.py      2012-06-05 19:14:20.650236041 +0100
 
11
@@ -48,7 +48,8 @@
 
12
 
 
13
 class MenuEditor(object):
 
14
     def __init__(self):
 
15
-        self.applications = Menu('applications.menu')
 
16
+        menu_prefix = os.getenv('XDG_MENU_PREFIX') or 'gnome-'
 
17
+        self.applications = Menu(menu_prefix + 'applications.menu')
 
18
         self.applications.tree.connect('changed', self.menuChanged)
 
19
 
 
20
     def menuChanged(self, *a):