gtk+ r21542 - in trunk: . gdk/x11

[ebassi svn gnome org]

Author: ebassi
Date: Mon Sep 29 10:54:50 2008
New Revision: 21542
URL: http://svn.gnome.org/viewvc/gtk+?rev=21542&view=rev

Log:
2008-09-29  Emmanuele Bassi  <ebassi linux intel com>

	* gdk/x11/gdkinput.c:
	(gdk_device_class_init), (gdk_device_finalize): Correctly chain
	up the finalize implementation.

Modified:
   trunk/ChangeLog
   trunk/gdk/x11/gdkinput.c

Modified: trunk/gdk/x11/gdkinput.c
==============================================================================
--- trunk/gdk/x11/gdkinput.c	(original)
+++ trunk/gdk/x11/gdkinput.c	Mon Sep 29 10:54:50 2008
@@ -66,6 +66,8 @@
 static void gdk_device_class_init (GdkDeviceClass *klass);
 static void gdk_device_finalize (GObject *object);
 
+static gpointer gdk_device_parent_class = NULL;
+
 GType
 gdk_device_get_type (void)
 {
@@ -99,6 +101,8 @@
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  gdk_device_parent_class = g_type_class_peek_parent (klass);
+
   object_class->finalize = gdk_device_finalize;
 }
 
@@ -108,17 +112,20 @@
   GdkDevicePrivate *gdkdev = (GdkDevicePrivate *)GDK_DEVICE(object);
 
   if (!GDK_IS_CORE (gdkdev))
-  {
+    {
 #ifndef XINPUT_NONE
-    if (gdkdev->xdevice)
-      XCloseDevice (GDK_DISPLAY_XDISPLAY(gdkdev->display), gdkdev->xdevice);
-    g_free (gdkdev->axes);
+      if (gdkdev->xdevice)
+        XCloseDevice (GDK_DISPLAY_XDISPLAY(gdkdev->display), gdkdev->xdevice);
+
+      g_free (gdkdev->axes);
 #endif /* !XINPUT_NONE */
 
-    g_free (gdkdev->info.name);
-    g_free (gdkdev->info.keys);
-    g_free (gdkdev->info.axes);
-  }
+      g_free (gdkdev->info.name);
+      g_free (gdkdev->info.keys);
+      g_free (gdkdev->info.axes);
+    }
+
+  G_OBJECT_CLASS (gdk_device_parent_class)->finalize (object);
 }
 
 /**