diff options
| author | puppetmaster <puppetmaster> | 2005-07-30 11:20:47 +0000 |
|---|---|---|
| committer | puppetmaster <puppetmaster> | 2005-07-30 11:20:47 +0000 |
| commit | 60647013ec3df1c49f3f9ecc7b3781bd01b009af (patch) | |
| tree | ada8d418d921abb8bd1bceb715bfde9adda01f29 | |
| parent | various updates for compile errors (diff) | |
| download | elock-60647013ec3df1c49f3f9ecc7b3781bd01b009af.tar.xz | |
fix for XSetWindowAttributs typedef (raster remarque)
| -rw-r--r-- | ecore/src/lib/ecore_x/ecore_x_private.h | 4 | ||||
| -rw-r--r-- | ecore/src/lib/ecore_x/ecore_x_screensaver.c | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/ecore/src/lib/ecore_x/ecore_x_private.h b/ecore/src/lib/ecore_x/ecore_x_private.h index a93086d..3b50671 100644 --- a/ecore/src/lib/ecore_x/ecore_x_private.h +++ b/ecore/src/lib/ecore_x/ecore_x_private.h @@ -208,4 +208,8 @@ Ecore_X_Window_State _ecore_x_netwm_state_get(Ecore_X_Atom a); /* from sync */ +/* from XScreenSaver */ + +typedef XSetWindowAttributes Ecore_X_Set_Window_Attributes; + #endif diff --git a/ecore/src/lib/ecore_x/ecore_x_screensaver.c b/ecore/src/lib/ecore_x/ecore_x_screensaver.c index f73992f..9abd149 100644 --- a/ecore/src/lib/ecore_x/ecore_x_screensaver.c +++ b/ecore/src/lib/ecore_x/ecore_x_screensaver.c @@ -35,8 +35,8 @@ ecore_x_screensaver_free_alloc_info(XScreenSaverInfo * info) return; } -int -ecore_x_screensaver_set_attributes(XSetWindowAttributes attr) +void +ecore_x_screensaver_set_attributes(Ecore_X_Window_Set_Attributes attr) { Ecore_X_Window root; int screen; @@ -48,17 +48,14 @@ ecore_x_screensaver_set_attributes(XSetWindowAttributes attr) mask = CWBackPixel; - if (!XScreenSaverSetAttributes(_ecore_x_disp, root, 0, 0, + XScreenSaverSetAttributes(_ecore_x_disp, root, 0, 0, DisplayWidth(_ecore_x_disp, screen), DisplayHeight(_ecore_x_disp, screen), 0, CopyFromParent, CopyFromParent, CopyFromParent, - mask, &attr)) - return 1; - else - return 0; + mask, &attr); } int @@ -69,7 +66,7 @@ ecore_x_screensaver_add(void) XEvent event; Ecore_X_Window root; XScreenSaverNotifyEvent *se; - XSetWindowAttributes attributes; + Ecore_X_Set_Attributes attributes; root = DefaultRootWindow(_ecore_x_disp); screen = DefaultScreen(_ecore_x_disp); |