← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/sawfish/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/menus.jl

  • Committer: Bazaar Package Importer
  • Author(s): Luis Rodrigo Gallardo Cruz
  • Date: 2008-02-18 16:27:26 UTC
  • mfrom: (1.2.7 upstream) (3.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20080218162726-3a5v48p33qaki37z
Tags: 1:1.3.3-1
http://bugs.debian.org/464139
http://bugs.debian.org/269905
* New Upstream Release.
 - Fixes encoding issues introduced by the use of UTF-8 in
  1.3.2. (Closes: #464139).
 - Fixes pango fonts handling, to allow more than one to be used at a
  time (Closes: #269905).
 - Fixes interaction with KDE systray.
* Loosen overly tight build-dependency on gettext, and tighten the one
  on quilt (We use the makefile snippet from 0.40-1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/menus.jl
 
1
## menus.jl by Christian Marillat <marillat@debian.org>
 
2
## Add Debian menu entry. Change terminal menu entry to use the Debian
 
3
## default terminal.
 
4
 
 
5
--- sawfish-1.3.orig/lisp/sawfish/wm/gnome/menus.jl     2004-06-20 15:49:48.000000000 +0200
 
6
+++ sawfish-1.3/lisp/sawfish/wm/gnome/menus.jl  2004-06-20 15:50:52.000000000 +0200
 
7
@@ -73,6 +73,8 @@
 
8
   (defvar gnome-menu-roots (list (expand-file-name
 
9
                                  "apps" gnome-share-directory)
 
10
                                 "/etc/X11/applnk"      ;on RedHat systems
 
11
+                                "/usr/share/applications"
 
12
+                                "/var/lib/menu-xdg/applications/menu-xdg"
 
13
                                 "~/.gnome/apps")
 
14
     "List of directories to read GNOME menu entries from.")
 
15
 
 
16
@@ -148,7 +150,7 @@
 
17
               ;; create a menu item
 
18
               `(,(or name exec)
 
19
                 (system ,(concat (if terminal
 
20
-                                     (concat "gnome-terminal -e " exec)
 
21
+                                     (concat "x-terminal-emulator -e " exec)
 
22
                                    exec) " &"))))))))
 
23
 
 
24
   (define (gnome-menu-read-order filename)