Commit d494aa72 authored by Christian Dywan's avatar Christian Dywan Committed by Christian Dywan
Browse files

Bug 559622 – GdkDevice test segfaults

2008-11-30  Christian Dywan  <christian@imendio.com>

	Bug 559622 – GdkDevice test segfaults

	* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_dispose):
	* gdk/x11/gdkinput.c (gdk_device_class_init), (gdk_device_dispose):
	Free and reset device in dispose. Patch by Michael Natterer and myself.

svn path=/trunk/; revision=21834
parent e0ce0916
2008-11-30 Christian Dywan <christian@imendio.com>
Bug 559622 – GdkDevice test segfaults
* gdk/x11/gdkdisplay-x11.c (gdk_display_x11_dispose):
* gdk/x11/gdkinput.c (gdk_device_class_init), (gdk_device_dispose):
Free and reset device in dispose. Patch by Michael Natterer and myself.
2008-11-30 Christian Dywan <christian@imendio.com>
Bug 554076 – eventually release g_new-ed supported_atoms
......
......@@ -798,6 +798,8 @@ gdk_display_x11_dispose (GObject *object)
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (object);
gint i;
g_list_foreach (display_x11->input_devices, (GFunc) g_object_run_dispose, NULL);
for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
_gdk_screen_close (display_x11->screens[i]);
......
......@@ -64,7 +64,7 @@ _gdk_init_input_core (GdkDisplay *display)
}
static void gdk_device_class_init (GdkDeviceClass *klass);
static void gdk_device_finalize (GObject *object);
static void gdk_device_dispose (GObject *object);
static gpointer gdk_device_parent_class = NULL;
......@@ -103,29 +103,36 @@ gdk_device_class_init (GdkDeviceClass *klass)
gdk_device_parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gdk_device_finalize;
object_class->dispose = gdk_device_dispose;
}
static void
gdk_device_finalize (GObject *object)
gdk_device_dispose (GObject *object)
{
GdkDevicePrivate *gdkdev = (GdkDevicePrivate *)GDK_DEVICE(object);
GdkDevicePrivate *gdkdev = (GdkDevicePrivate *) object;
if (!GDK_IS_CORE (gdkdev))
if (gdkdev->display && !GDK_IS_CORE (gdkdev))
{
#ifndef XINPUT_NONE
if (gdkdev->xdevice)
XCloseDevice (GDK_DISPLAY_XDISPLAY(gdkdev->display), gdkdev->xdevice);
{
XCloseDevice (GDK_DISPLAY_XDISPLAY (gdkdev->display), gdkdev->xdevice);
gdkdev->xdevice = NULL;
}
g_free (gdkdev->axes);
gdkdev->axes = NULL;
#endif /* !XINPUT_NONE */
g_free (gdkdev->info.name);
g_free (gdkdev->info.keys);
g_free (gdkdev->info.axes);
gdkdev->info.name = NULL;
gdkdev->info.keys = NULL;
gdkdev->info.axes = NULL;
}
G_OBJECT_CLASS (gdk_device_parent_class)->finalize (object);
G_OBJECT_CLASS (gdk_device_parent_class)->dispose (object);
}
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment