Change clutter_glx_get_default_screen() to return a Screen pointer

Now that we have clutter_backend_get_screen_number(), we can directly
return the Screen pointer inside the GLX backend API.
This commit is contained in:
Emmanuele Bassi 2007-04-19 15:28:04 +00:00
parent 842dde6ba9
commit a8749a5b64
2 changed files with 5 additions and 5 deletions

View File

@ -388,22 +388,22 @@ clutter_glx_get_default_display (void)
/** /**
* clutter_glx_get_default_screen: * clutter_glx_get_default_screen:
* *
* FIXME * Gets the pointer to the default X Screen object.
* *
* Return value: FIXME * Return value: FIXME
* *
* Since: 0.4 * Since: 0.4
*/ */
gint Screen *
clutter_glx_get_default_screen (void) clutter_glx_get_default_screen (void)
{ {
if (!backend_singleton) if (!backend_singleton)
{ {
g_critical ("GLX backend has not been initialised"); g_critical ("GLX backend has not been initialised");
return -1; return NULL;
} }
return backend_singleton->xscreen_num; return backend_singleton->xscreen;
} }
/** /**

View File

@ -37,7 +37,7 @@ void clutter_glx_trap_x_errors (void);
gint clutter_glx_untrap_x_errors (void); gint clutter_glx_untrap_x_errors (void);
Display *clutter_glx_get_default_display (void); Display *clutter_glx_get_default_display (void);
gint clutter_glx_get_default_screen (void); Screen * clutter_glx_get_default_screen (void);
Window clutter_glx_get_root_window (void); Window clutter_glx_get_root_window (void);
Window clutter_glx_get_stage_window (ClutterStage *stage); Window clutter_glx_get_stage_window (ClutterStage *stage);