isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

2008-04-10 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/eglx/clutter-backend-egl.c:
	(clutter_backend_egl_ensure_context): Sync up with the GLX
	backend.

	(clutter_backend_egl_create_stage): Dumb compilation fix.

	* clutter/glx/clutter-backend-glx.c:
	(clutter_backend_glx_create_stage): Unref the stage if we are
	erroring out.
This commit is contained in:
Emmanuele Bassi 2008-04-10 19:58:47 +00:00
parent c97bcb37ba
commit 0535283b77
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-04-10 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/eglx/clutter-backend-egl.c:
(clutter_backend_egl_ensure_context): Sync up with the GLX
backend.
(clutter_backend_egl_create_stage): Dumb compilation fix.
* clutter/glx/clutter-backend-glx.c:
(clutter_backend_glx_create_stage): Unref the stage if we are
erroring out.
2008-04-10 Emmanuele Bassi <ebassi@openedhand.com> 2008-04-10 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/eglx/clutter-stage-egl.c: * clutter/eglx/clutter-stage-egl.c:

5
clutter/eglx/clutter-backend-egl.c
View File

@ -77,7 +77,8 @@ clutter_backend_egl_ensure_context (ClutterBackend *backend,
stage_egl = CLUTTER_STAGE_EGL (impl); stage_egl = CLUTTER_STAGE_EGL (impl);
stage_x11 = CLUTTER_STAGE_X11 (impl); stage_x11 = CLUTTER_STAGE_X11 (impl);
g_return_if_fail (backend_egl->egl_context != NULL); if (!backend_egl->egl_context)
return;
/* we might get here inside the final dispose cycle, so we /* we might get here inside the final dispose cycle, so we
* need to handle this gracefully * need to handle this gracefully
@ -220,6 +221,8 @@ clutter_backend_egl_create_stage (ClutterBackend *backend,
GError **error) GError **error)
{ {
ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend); ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
ClutterStageX11 *stage_x11;
ClutterActor *stage;
CLUTTER_NOTE (BACKEND, "Creating stage of type `%s'", CLUTTER_NOTE (BACKEND, "Creating stage of type `%s'",
g_type_name (CLUTTER_STAGE_TYPE)); g_type_name (CLUTTER_STAGE_TYPE));

1
clutter/glx/clutter-backend-glx.c
View File

@ -503,6 +503,7 @@ clutter_backend_glx_create_stage (ClutterBackend *backend,
g_set_error (error, CLUTTER_INIT_ERROR, g_set_error (error, CLUTTER_INIT_ERROR,
CLUTTER_INIT_ERROR_INTERNAL, CLUTTER_INIT_ERROR_INTERNAL,
"Unable to realize the main stage"); "Unable to realize the main stage");
g_object_unref (stage);
return NULL; return NULL;
} }