[EGIT] [core/enlightenment] master 12/28: move comp_x randr init to screen init function

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=36ea1ba3725fd46bc4dc0713f8b6f6d65420a8e8

commit 36ea1ba3725fd46bc4dc0713f8b6f6d65420a8e8
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Apr 22 18:06:26 2015 -0400

    move comp_x randr init to screen init function
---
 src/bin/e_comp_x.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 569330c..2e5a5ca 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4568,6 +4568,8 @@ _e_comp_x_xinerama_setup(int rw, int rh)
    E_Randr2_Screen *s, *s2, *s_chosen;
    Eina_Bool removed;
 
+   if (!e_randr2_init()) return 0;
+
    // put screens in tmp list
    EINA_LIST_FOREACH(e_randr2->screens, l, s)
      {
@@ -5332,13 +5334,11 @@ e_comp_x_init(void)
    e_desklock_show_hook_add(_e_comp_x_desklock_show);
    e_desklock_hide_hook_add(_e_comp_x_desklock_hide);
 
-   if (!e_randr2_init()) return 0;
-   E_LIST_HANDLER_APPEND(handlers, E_EVENT_RANDR_CHANGE, 
_e_comp_x_randr_change, NULL);
-
    if (!e_atoms_init()) return 0;
    if (!_e_comp_x_screens_setup()) return EINA_FALSE;
    if (!e_xsettings_init())
      e_error_message_show(_("Enlightenment cannot initialize the XSettings 
system.\n"));
+   E_LIST_HANDLER_APPEND(handlers, E_EVENT_RANDR_CHANGE, 
_e_comp_x_randr_change, NULL);
 
    ecore_x_sync();
 

--