isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-26 11:49:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-03-23 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-backend.c: Clear the event queue when
	disposing the backend object; remove the initialisation
	of the backend structure members...

	* clutter/glx/clutter-backend-glx.c: ... and keep it here
	in the backends where it belongs.
This commit is contained in:
Emmanuele Bassi 2007-03-23 23:57:24 +00:00
parent d0f1186e1d
commit 65d1a65b49
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-backend.c: Clear the event queue when
disposing the backend object; remove the initialisation
of the backend structure members...
* clutter/glx/clutter-backend-glx.c: ... and keep it here
in the backends where it belongs.
2007-03-23 Emmanuele Bassi <ebassi@openedhand.com> 2007-03-23 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-private.h: * clutter/clutter-private.h:

25
clutter/clutter-backend.c
View File

@ -34,24 +34,33 @@ G_DEFINE_ABSTRACT_TYPE (ClutterBackend,
clutter_backend, clutter_backend,
G_TYPE_OBJECT); G_TYPE_OBJECT);
static void
clutter_backend_dispose (GObject *gobject)
{
ClutterBackend *backend = CLUTTER_BACKEND (gobject);
if (backend->events_queue)
{
g_queue_foreach (backend->events_queue, (GFunc) clutter_event_free, NULL);
g_queue_free (backend->events_queue);
backend->events_queue = NULL;
}
G_OBJECT_CLASS (clutter_backend_parent_class)->dispose (gobject);
}
static void static void
clutter_backend_class_init (ClutterBackendClass *klass) clutter_backend_class_init (ClutterBackendClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = clutter_backend_dispose;
} }
static void static void
clutter_backend_init (ClutterBackend *backend) clutter_backend_init (ClutterBackend *backend)
{ {
backend->events_queue = g_queue_new ();
backend->button_click_time[0] = backend->button_click_time[1] = 0;
backend->button_number[0] = backend->button_number[1] = -1;
backend->button_x[0] = backend->button_x[1] = 0;
backend->button_y[0] = backend->button_y[1] = 0;
backend->double_click_time = 250;
backend->double_click_distance = 5;
} }
ClutterActor * ClutterActor *

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

@ -314,6 +314,7 @@ static void
clutter_backend_glx_init (ClutterBackendGlx *backend_glx) clutter_backend_glx_init (ClutterBackendGlx *backend_glx)
{ {
ClutterBackend *backend = CLUTTER_BACKEND (backend_glx); ClutterBackend *backend = CLUTTER_BACKEND (backend_glx);
backend->events_queue = g_queue_new ();
backend->button_click_time[0] = backend->button_click_time[1] = 0; backend->button_click_time[0] = backend->button_click_time[1] = 0;
backend->button_number[0] = backend->button_number[1] = -1; backend->button_number[0] = backend->button_number[1] = -1;