[prevent][43479] Fix for missing va_end in _atspi_dbus_call_partial

[platform/upstream/at-spi2-core.git] / atspi / atspi-object.c

diff --git a/atspi/atspi-object.c b/atspi/atspi-object.c
index f69d350..3545845 100644 (file)
--- a/atspi/atspi-object.c
+++ b/atspi/atspi-object.c
@@ -31,14 +31,27 @@ atspi_object_init (AtspiObject *obj)
 }
 
 static void
-atspi_object_finalize (GObject *obj)
+atspi_object_dispose (GObject *object)
 {
-  AtspiObject *aobj = ATSPI_OBJECT (obj);
+  AtspiObject *aobj = ATSPI_OBJECT (object);
 
   if (aobj->app)
+  {
     g_object_unref (aobj->app);
+    aobj->app = NULL;
+  }
+
+  G_OBJECT_CLASS (atspi_object_parent_class)->dispose (object);
+}
+
+static void
+atspi_object_finalize (GObject *object)
+{
+  AtspiObject *aobj = ATSPI_OBJECT (object);
 
   g_free (aobj->path);
+
+  G_OBJECT_CLASS (atspi_object_parent_class)->finalize (object);
 }
 
 static void
@@ -46,5 +59,6 @@ atspi_object_class_init (AtspiObjectClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  object_class->dispose = atspi_object_dispose;
   object_class->finalize = atspi_object_finalize;
 }