4 files changed, 14 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 4999d42b9..bd67543ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
         * added api to automatically disable widgets when checkboxes are checked or unchecked
         * added e_widget_on_disable_hook_set
         * added option for preventing all keyboard layout changes
+        * moved "allow windows above fullscreen windows" option to geometry settings dialog
 
 2013-02-05 Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index d6b347921..9fc6316d4 100644
--- a/NEWS
+++ b/NEWS
@@ -48,7 +48,6 @@ Changes:
     Config:
         * move winlist_warp_speed option to pointer_warp_speed
 
-
 Deprecations:
     *
 
@@ -155,3 +154,4 @@ Fixes:
     * fix list update on deletion of personal app launchers
     * fix button toggling in personal app launchers dialog
     * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
+    * moved "allow windows above fullscreen windows" option to geometry settings dialog
diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c
index 7c687b5d5..fe448d38a 100644
--- a/src/modules/conf_window_manipulation/e_int_config_focus.c
+++ b/src/modules/conf_window_manipulation/e_int_config_focus.c
@@ -32,7 +32,6 @@ struct _E_Config_Dialog_Data
    double auto_raise_delay;
    int    border_raise_on_mouse_action;
    int    border_raise_on_focus;
-   int    allow_above_fullscreen;
 };
 
 /* a nice easy setup function that does the dirty work */
@@ -87,7 +86,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->border_raise_on_mouse_action =
      e_config->border_raise_on_mouse_action;
    cfdata->border_raise_on_focus = e_config->border_raise_on_focus;
-   cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen;
 }
 
 static void *
@@ -191,7 +189,6 @@ _advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    e_config->auto_raise_delay = cfdata->auto_raise_delay;
    e_config->border_raise_on_mouse_action = cfdata->border_raise_on_mouse_action;
    e_config->border_raise_on_focus = cfdata->border_raise_on_focus;
-   e_config->allow_above_fullscreen = cfdata->allow_above_fullscreen;
    e_border_button_bindings_grab_all();
    e_config_save_queue();
    return 1; /* Apply was OK */
@@ -214,8 +211,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c
           (e_config->use_auto_raise != cfdata->use_auto_raise) ||
           (e_config->auto_raise_delay != cfdata->auto_raise_delay) ||
           (e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) ||
-          (e_config->border_raise_on_focus != cfdata->border_raise_on_focus) ||
-          (e_config->allow_above_fullscreen != cfdata->allow_above_fullscreen);
+          (e_config->border_raise_on_focus != cfdata->border_raise_on_focus);
 }
 
 /**--GUI--**/
@@ -302,9 +298,6 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
    ob = e_widget_check_add(evas, _("Raise when focusing"),
                            &(cfdata->border_raise_on_focus));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_check_add(evas, _("Allow windows above fullscreen window"),
-                           &(cfdata->allow_above_fullscreen));
-   e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(ol, of, 1, 0, 0.5);
    e_widget_toolbook_page_append(otb, NULL, _("Stacking"), ol,
                                  1, 0, 1, 0, 0.5, 0.0);
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
index 3a24639c9..b4ebad98e 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
@@ -41,6 +41,7 @@ struct _E_Config_Dialog_Data
    int maximize_direction;
    int maximized_allow_manip;
    int border_fix_on_shelf_toggle;
+   int    allow_above_fullscreen;
 };
 
 E_Config_Dialog *
@@ -88,6 +89,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
    cfdata->transient.desktop = e_config->transient.desktop;
    cfdata->transient.iconify = e_config->transient.iconify;
    cfdata->maximize_policy = (e_config->maximize_policy & E_MAXIMIZE_TYPE);
+   cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen;
    if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
      cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
    cfdata->maximize_direction = 
@@ -130,6 +132,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
      (cfdata->maximize_policy | cfdata->maximize_direction);
    e_config->allow_manip = cfdata->maximized_allow_manip;
    e_config->border_fix_on_shelf_toggle = cfdata->border_fix_on_shelf_toggle;
+   e_config->allow_above_fullscreen = cfdata->allow_above_fullscreen;
    e_config_save_queue();
    return 1; /* Apply was OK */
 }
@@ -157,7 +160,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
            (e_config->transient.iconify != cfdata->transient.iconify) ||
            (e_config->maximize_policy != (cfdata->maximize_policy | cfdata->maximize_direction)) ||
            (e_config->allow_manip != cfdata->maximized_allow_manip) ||
-           (e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle));
+           (e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle) ||
+           (e_config->allow_above_fullscreen != cfdata->allow_above_fullscreen));
 }
 
 static Evas_Object *
@@ -219,9 +223,14 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
    ow = e_widget_radio_add(evas, _("Both"), E_MAXIMIZE_BOTH, rg);
    e_widget_framelist_object_append(of, ow);
    e_widget_list_object_append(ol, of, 1, 0, 0.5);
+   of = e_widget_framelist_add(evas, _("Manipulation"), 0);
    ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"), 
                            &(cfdata->maximized_allow_manip));
-   e_widget_list_object_append(ol, ow, 1, 0, 0.5);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Allow windows above fullscreen window"),
+                           &(cfdata->allow_above_fullscreen));
+   e_widget_framelist_object_append(of, ow);
+   e_widget_list_object_append(ol, of, 1, 0, 0.5);
    e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol, 
                                  1, 0, 1, 0, 0.5, 0.0);