Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_config.c e_int_config_display.c 


Log Message:


pass distcheck...

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- e_config.c  10 Mar 2006 16:35:12 -0000      1.154
+++ e_config.c  12 Mar 2006 10:40:47 -0000      1.155
@@ -785,46 +785,46 @@
                    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
                    "window_shaded_toggle", NULL);
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_by", "-1");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Right",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_by", "1");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F1",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "0");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F2",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "1");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F3",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "2");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F4",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "3");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F5",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "4");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F6",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "5");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F7",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "6");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F8",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "7");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F9",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "8");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "9");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F11",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "10");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F12",
-                   E_BINDING_MODIFIER_CTRL, 0,
+                   E_BINDING_MODIFIER_ALT, 0,
                    "desk_linear_flip_to", "11");
        CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "m",
                    E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_display.c      3 Mar 2006 09:04:26 -0000       1.3
+++ e_int_config_display.c      12 Mar 2006 10:40:47 -0000      1.4
@@ -91,6 +91,7 @@
 {
    char buf[4096];
    
+   if (!sb->dia) return;
    snprintf(buf, sizeof(buf),
            _("Does this look OK? Press <hilight>Yes</hilight> if it does, or 
No if not.<br>"
              "If you do not press a button the old resolution of<br>"
@@ -120,6 +121,7 @@
        e_config_save_queue();
        sb->timer = NULL;
        e_object_del(E_OBJECT(sb->dia));
+       sb->dia = NULL;
        return 0;
      }
    return 1;




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to