X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F202_fix-menus.diff;h=c762b1f13dbac140083ab1118a403a3b6843cfbc;hb=98ddceff44888e84c1539a88130b59d4a20cf166;hp=6961ec8496f95ffe6db522195dc98e7750529af7;hpb=d2a43a53786878c1273313249d3b49f6cd559b00;p=ion3.git

diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff
index 6961ec8..c762b1f 100755
--- a/debian/patches/202_fix-menus.diff
+++ b/debian/patches/202_fix-menus.diff
@@ -1,29 +1,14 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)  
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1;;
-esac 
-exit 0
-@DPATCH@
-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
-@@ -330,11 +330,14 @@
+--- ion3.orig/etc/cfg_ioncore.lua
++++ ion3/etc/cfg_ioncore.lua
+@@ -330,11 +330,13 @@
  -- Main menu
  defmenu("mainmenu", {
      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'))"),                                                                                       
+-    menuentry("Lock screen",    "ioncore.exec_on(_, 'xlock')"),
++    menuentry("Lock screen",
++              "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),
      menuentry("Help",           "mod_query.query_man(_)"),
      menuentry("About Ion",      "mod_query.show_about_ion(_)"),
      submenu("Styles",           "stylemenu"),