diff options
| author | puppetmaster <puppetmaster> | 2005-07-28 21:07:17 +0000 |
|---|---|---|
| committer | puppetmaster <puppetmaster> | 2005-07-28 21:07:17 +0000 |
| commit | 561807338e05649b28375f1e1b33c986f229efb3 (patch) | |
| tree | f57b195e7074cbec6036ab15892bada4c7cccfe1 | |
| parent | adding test for ecore_event_handler_num (caro) (diff) | |
| download | elock-561807338e05649b28375f1e1b33c986f229efb3.tar.xz | |
fix for code placement
| -rw-r--r-- | ecore/src/lib/ecore_x/ecore_x.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ecore/src/lib/ecore_x/ecore_x.c b/ecore/src/lib/ecore_x/ecore_x.c index d9919a1..02b29a1 100644 --- a/ecore/src/lib/ecore_x/ecore_x.c +++ b/ecore/src/lib/ecore_x/ecore_x.c @@ -205,22 +205,6 @@ ecore_x_init(const char *name) _ecore_x_event_sync_id = 0; } - /* For XScreenSaver extention of X */ - if (XScreenSaverQueryExtension(_ecore_x_disp, &scrnsaver_base, &scrnsaver_err_base)) - { - _ecore_x_event_scrnsaver_id = scrnsaver_base + ScreenSaverNotify; - - if (_ecore_x_event_scrnsaver_id >= LASTEvent) - _ecore_x_event_handlers_num = _ecore_x_event_scrnsaver_id + 1; - - int v_major, v_minor; - if (XScreenSaverQueryVersion(ecore_x_disp, v_major, v_minor)) - { - /*FIXME*/ - } - } - - /***********************************/ if (_ecore_x_event_sync_id + XSyncAlarmNotify >= LASTEvent) _ecore_x_event_handlers_num = _ecore_x_event_sync_id + XSyncAlarmNotify + 1; @@ -233,6 +217,22 @@ ecore_x_init(const char *name) _ecore_x_disp = NULL; return 0; } + + + /* For XScreenSaver extention of X */ + if (XScreenSaverQueryExtension(_ecore_x_disp, &scrnsaver_base, &scrnsaver_err_base)) + { + int v_major, v_minor; + if (XScreenSaverQueryVersion(ecore_x_disp, v_major, v_minor)) + { + _ecore_x_event_scrnsaver_id = scrnsaver_base + ScreenSaverNotify; + + if (_ecore_x_event_scrnsaver_id >= LASTEvent) + _ecore_x_event_handlers_num = _ecore_x_event_scrnsaver_id + 1; + } + } + + /***********************************/ #ifdef ECORE_XCURSOR _ecore_x_xcursor = XcursorSupportsARGB(_ecore_x_disp); #endif |