Temporary commit. Non working changes to the registration

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / tree.c

diff --git a/atk-adaptor/tree.c b/atk-adaptor/tree.c
index 7efca21..8652f77 100644 (file)
--- a/atk-adaptor/tree.c
+++ b/atk-adaptor/tree.c
@@ -28,7 +28,7 @@
 #include "accessible.h"
 #include "bridge.h"
 
-extern SpiAppData *this_app;
+extern SpiAppData *app_data;
 static gboolean update_pending = FALSE;
 
 /*---------------------------------------------------------------------------*/
@@ -58,7 +58,7 @@ append_accessible(gpointer ref, gpointer obj_data, gpointer iter)
 
   obj = ATK_OBJECT(obj_data);
   iter_array = (DBusMessageIter *) iter;
-  data = &(this_app->droute);
+  data = &(app_data->droute);
 
   dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct);
     {
@@ -67,7 +67,6 @@ append_accessible(gpointer ref, gpointer obj_data, gpointer iter)
 
       path = atk_dbus_get_path_from_ref(GPOINTER_TO_INT(ref));
       dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
-      g_free(path);
 
       parent = atk_object_get_parent(obj);
       if (parent == NULL)
@@ -128,6 +127,8 @@ append_accessible(gpointer ref, gpointer obj_data, gpointer iter)
       if (!desc)
         desc = "";
       dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc);
+
+      g_free(path);
     }      
   dbus_message_iter_close_container (iter_array, &iter_struct);
 }
@@ -162,7 +163,7 @@ send_cache_update(gpointer d)
   DBusMessageIter iter_array;
   DRouteData *data;
 
-  data = &(this_app->droute);
+  data = &(app_data->droute);
 
   message = dbus_message_new_signal ("/org/freedesktop/atspi/tree", SPI_DBUS_INTERFACE_TREE, "updateTree");