From e36e5ade27d31202191c5533dafb56af7e0016af Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 14 Nov 2008 10:53:03 +0000 Subject: [PATCH] fix restart! mouse bindings broken! manage windows and use config before config loaded! SVN revision: 37619 --- src/bin/e_main.c | 15 ++++++++++++++- src/bin/e_manager.c | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index e3e9a29d9..d4fbcc2d6 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -65,6 +65,7 @@ static int _e_main_dirs_init(void); static int _e_main_dirs_shutdown(void); static int _e_main_screens_init(void); static int _e_main_screens_shutdown(void); +static void _e_main_manage_all(void); static int _e_main_path_init(void); static int _e_main_path_shutdown(void); @@ -1016,6 +1017,9 @@ main(int argc, char **argv) TS("shelf config init"); e_shelf_config_init(); + TS("manage all windows"); + _e_main_manage_all(); + /* an idle enterer to be called after all others */ _e_main_idle_enterer_after = ecore_idle_enterer_add(_e_main_cb_idler_after, NULL); @@ -1242,7 +1246,7 @@ _e_main_screens_init(void) e_grabinput_focus(con->bg_win, E_FOCUS_METHOD_PASSIVE); e_hints_manager_init(man); _e_main_desk_restore(man, con); - e_manager_manage_windows(man); +// e_manager_manage_windows(man); } else { @@ -1278,6 +1282,15 @@ _e_main_screens_shutdown(void) return 1; } +static void +_e_main_manage_all(void) +{ + Eina_List *l; + + for (l = e_manager_list(); l; l = l->next) + e_manager_manage_windows(l->data); +} + static int _e_main_path_init(void) { diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c index f9de57866..0216301d2 100644 --- a/src/bin/e_manager.c +++ b/src/bin/e_manager.c @@ -285,7 +285,7 @@ e_manager_manage_windows(E_Manager *man) /* FIXME: * It's enough to set the desk, the zone will * be set according to the desk */ - if (zone) e_border_zone_set(bd, zone); +// if (zone) e_border_zone_set(bd, zone); if (desk) e_border_desk_set(bd, desk); } }