tsst

[skippy-xd] / skippy.c

diff --git a/skippy.c b/skippy.c
index 03581fe..083197c 100644 (file)
--- a/skippy.c
+++ b/skippy.c
@@ -20,7 +20,6 @@
 #include "skippy.h"
 
 const char *f7prog;
-const char *f6prog;
 static int DIE_NOW = 0;
 
 static int
@@ -244,19 +243,12 @@ skippy_run(MainWin *mw, dlist *clients, Window focus, Window leader, Bool all_xi
                        }
                                
                }
-               else if(ev.type == KeyRelease && ev.xkey.keycode == mw->key_escape)
+               else if(ev.type == KeyRelease && (ev.xkey.keycode == mw->key_f6 || ev.xkey.keycode == mw->key_escape))
                 {
                         refocus = True;
                         die = 1;
                         break;
                 }
-                else if(ev.type == KeyRelease && ev.xkey.keycode == mw->key_f6)
-                {
-                        system(f6prog);
-                        refocus = True;
-                        die = 1;
-                        break;
-                }
                 else if(ev.type == KeyRelease && ev.xkey.keycode == mw->key_f7)
                {
                        system(f7prog);
@@ -392,9 +384,7 @@ main(void)
 
        client_msg(dpy, focused, "_NET_ACTIVE_WINDOW", 0, 0, 0, 0, 0);
        XSetInputFocus(dpy, focused, RevertToParent, CurrentTime);
-
-
-        f6prog = config_get(config, "maemo", "f6prog", "/usr/bin/dbus-send --system --type=method_call --dest=com.nokia.mce /com/nokia/mce/request com.nokia.mce.request.req_tklock_mode_change string:locked &");     
+       
        f7prog = config_get(config, "maemo", "f7prog", "/usr/bin/osso-xterm &");
        mw->gquality = atoi(config_get(config, "maemo", "gQuality", "0"));
        printf("Filter: %d\n", mw->gquality);