summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpuppetmaster <puppetmaster>2005-07-28 21:18:15 +0000
committerpuppetmaster <puppetmaster>2005-07-28 21:18:15 +0000
commit2bb1ad5e69cc70ea2de82c961c0c44280e0488c2 (patch)
tree686854b19fb3c46387c48f8fc3d4fd9ec39c92a2
parentupdate for ecore_x_event_scrnsaver_id (diff)
downloadelock-2bb1ad5e69cc70ea2de82c961c0c44280e0488c2.tar.xz
caro's update
-rw-r--r--ecore/src/lib/ecore_x/ecore_x.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/ecore/src/lib/ecore_x/ecore_x.c b/ecore/src/lib/ecore_x/ecore_x.c
index 66ef643..7fb0924 100644
--- a/ecore/src/lib/ecore_x/ecore_x.c
+++ b/ecore/src/lib/ecore_x/ecore_x.c
@@ -223,17 +223,14 @@ ecore_x_init(const char *name)
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 (XScreenSaverQueryVersion(ecore_x_disp, v_major, v_minor))
_ecore_x_event_scrnsaver_id = 0;
- }
- else
- {
- _ecore_x_event_scrnsaver_id = scrnsaver_base + ScreenSaverNotify;
-
- if (_ecore_x_event_scrnsaver_id >= LASTEvent)
+
+ if (_ecore_x_event_scrnsaver_id >= LASTEvent)
_ecore_x_event_handlers_num = _ecore_x_event_scrnsaver_id + 1;
- }
}
/***********************************/