[Xfce4-commits] r25842 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-06-23 18:47:41 +0000 (Sat, 23 Jun 2007)
New Revision: 25842

Modified:
   xfwm4/trunk/src/settings.c
   xfwm4/trunk/src/settings.h
Log:
Reorder to ease readability

Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c	2007-06-23 18:03:08 UTC (rev 25841)
+++ xfwm4/trunk/src/settings.c	2007-06-23 18:47:41 UTC (rev 25842)
@@ -1281,6 +1281,9 @@
     parseKeyString (dpy, &screen_info->params->keys[KEY_CYCLE_WINDOWS], getValue ("cycle_windows_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_DEL_WORKSPACE], getValue ("del_workspace_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_DOWN_WORKSPACE], getValue ("down_workspace_key", rc));
+    parseKeyString (dpy, &screen_info->params->keys[KEY_FILL_HORIZ], getValue ("fill_horiz_key", rc));
+    parseKeyString (dpy, &screen_info->params->keys[KEY_FILL_VERT], getValue ("fill_vert_key", rc));
+    parseKeyString (dpy, &screen_info->params->keys[KEY_FILL_WINDOW], getValue ("fill_window_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_HIDE_WINDOW], getValue ("hide_window_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_LEFT_WORKSPACE], getValue ("left_workspace_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_LOWER_WINDOW], getValue ("lower_window_key", rc));
@@ -1336,9 +1339,6 @@
     parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_10], getValue ("workspace_10_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_11], getValue ("workspace_11_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_12], getValue ("workspace_12_key", rc));
-    parseKeyString (dpy, &screen_info->params->keys[KEY_FILL_HORIZ], getValue ("fill_horiz_key", rc));
-    parseKeyString (dpy, &screen_info->params->keys[KEY_FILL_VERT], getValue ("fill_vert_key", rc));
-    parseKeyString (dpy, &screen_info->params->keys[KEY_FILL_WINDOW], getValue ("fill_window_key", rc));
 
     myScreenUngrabKeys (screen_info);
     myScreenGrabKeys (screen_info);

Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h	2007-06-23 18:03:08 UTC (rev 25841)
+++ xfwm4/trunk/src/settings.h	2007-06-23 18:47:41 UTC (rev 25842)
@@ -48,6 +48,9 @@
     KEY_CYCLE_WINDOWS,
     KEY_DEL_WORKSPACE,
     KEY_DOWN_WORKSPACE,
+    KEY_FILL_HORIZ,
+    KEY_FILL_VERT,
+    KEY_FILL_WINDOW,
     KEY_HIDE_WINDOW,
     KEY_LEFT_WORKSPACE,
     KEY_LOWER_WINDOW,
@@ -65,6 +68,9 @@
     KEY_MOVE_UP,
     KEY_MOVE_UP_WORKSPACE,
     KEY_MOVE_WORKSPACE_1,
+    KEY_MOVE_WORKSPACE_10,
+    KEY_MOVE_WORKSPACE_11,
+    KEY_MOVE_WORKSPACE_12,
     KEY_MOVE_WORKSPACE_2,
     KEY_MOVE_WORKSPACE_3,
     KEY_MOVE_WORKSPACE_4,
@@ -73,9 +79,6 @@
     KEY_MOVE_WORKSPACE_7,
     KEY_MOVE_WORKSPACE_8,
     KEY_MOVE_WORKSPACE_9,
-    KEY_MOVE_WORKSPACE_10,
-    KEY_MOVE_WORKSPACE_11,
-    KEY_MOVE_WORKSPACE_12,
     KEY_NEXT_WORKSPACE,
     KEY_POPUP_MENU,
     KEY_PREV_WORKSPACE,
@@ -102,10 +105,7 @@
     KEY_WORKSPACE_9,
     KEY_WORKSPACE_10,
     KEY_WORKSPACE_11,
-    KEY_WORKSPACE_12,
-    KEY_FILL_HORIZ,
-    KEY_FILL_VERT,
-    KEY_FILL_WINDOW,
+    KEY_WORKSPACE_12
     KEY_COUNT
 };