Updated patches for ion-3ds-20070318.

[ion3.git] / debian / patches / 202_fix-menus.diff

diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff
index 968ffa46ecf8be0b48baad7984f12ffd6f2f1b9b..6961ec8496f95ffe6db522195dc98e7750529af7 100755 (executable)
--- a/debian/patches/202_fix-menus.diff
+++ b/debian/patches/202_fix-menus.diff
@@ -15,9 +15,12 @@ exit 0
 diff -Nur ion3-20060524.orig/etc/cfg_ioncore.lua ion3-20060524/etc/cfg_ioncore.lua
 --- ion3-20060524.orig/etc/cfg_ioncore.lua     2006-05-24 18:23:26.000000000 +0200
 +++ ion3-20060524/etc/cfg_ioncore.lua  2006-07-29 11:14:57.000000000 +0200
-@@ -276,22 +276,20 @@
+@@ -330,11 +330,14 @@
+ -- Main menu
  defmenu("mainmenu", {
-     submenu("Programs",         "appmenu"),
+     menuentry("Run...",         "mod_query.query_exec(_)"),
+-    menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'xterm')"),
++    menuentry("Terminal",       "ioncore.exec_on(_, 'x-terminal-emulator')"),
      menuentry("Lock screen",    "ioncore.exec_on(_, 'xlock')"),
 +    menuentry("Lock screen",                                                                                                                                  
 +              "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),                                                                                       
@@ -28,17 +31,3 @@ diff -Nur ion3-20060524.orig/etc/cfg_ioncore.lua ion3-20060524/etc/cfg_ioncore.l
      submenu("Session",          "sessionmenu"),
  })
  
- 
- -- Application menu
- defmenu("appmenu", {
--    menuentry("XTerm",          "ioncore.exec_on(_, 'xterm')"),
--    menuentry("W3M",            "ioncore.exec_on(_, ':w3m -v')"),
--    menuentry("Rxvt",           "ioncore.exec_on(_, 'rxvt')"),
--    menuentry("Opera",          "ioncore.exec_on(_, 'opera')"),
--    menuentry("Links",          "ioncore.exec_on(_, ':links')"),
--    menuentry("Konqueror",      "ioncore.exec_on(_, 'konqueror')"),
--    menuentry("Dillo",          "ioncore.exec_on(_, 'dillo')"),
-+    menuentry("Terminal",       "ioncore.exec_on(_, 'x-terminal-emulator')"),                                                                                 
-+    menuentry("Browser",        "ioncore.exec_on(_, 'sensible-browser')"),                                                                                    
-     menuentry("Run...",         "mod_query.query_exec(_)"),
- })