X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Ftree.c;h=a4a155d7ecd0b69c213ff9f52d1f47b411a6b58f;hb=e4f35419985ff38254adcc32d50d65a36a40a684;hp=ec5428cbc5a2bdebebfa0e562fda292dad0f0a1f;hpb=613dc5600b5e84cd2108f9813fd1eb7cef4263e6;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/atk-adaptor/tree.c b/atk-adaptor/tree.c
index ec5428c..a4a155d 100644
--- a/atk-adaptor/tree.c
+++ b/atk-adaptor/tree.c
@@ -43,6 +43,8 @@ append_update (DBusMessageIter * iter_array, AtkObject * obj,
   gint childcount;
   GSList *l;
 
+  g_assert(data != NULL);
+
   dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL,
 				    &iter_struct);
   path = spi_dbus_get_path (obj);
@@ -126,6 +128,8 @@ spi_dbus_append_tree (DBusMessage * message, AtkObject * obj,
   DBusMessageIter iter, iter_array;
   dbus_bool_t result;
 
+  g_assert(data != NULL);
+
   dbus_message_iter_init_append (message, &iter);
   dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ooaoassus)",
 				    &iter_array);
@@ -200,6 +204,8 @@ message_handler (DBusConnection *bus, DBusMessage *message, void *user_data)
   const char *member = dbus_message_get_member (message);
 
   DBusMessage *reply = NULL;
+
+  g_return_val_if_fail(iface != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
   
   if (!strcmp(iface, "org.freedesktop.atspi.Tree"))
     {
@@ -240,10 +246,11 @@ static DBusObjectPathVTable tree_vtable =
 
 void
 spi_register_tree_object(DBusConnection *bus,
+			 DRouteData *data,
 			 const char *path)
 {
   dbus_bool_t mem = FALSE;
-  mem = dbus_connection_register_object_path(bus, path, &tree_vtable, NULL);
+  mem = dbus_connection_register_object_path(bus, path, &tree_vtable, data);
   g_assert(mem == TRUE);
 }
 
@@ -284,7 +291,7 @@ static void handle_cache_item(char *path, guint action, CacheIterData *d)
     break;
   }
   g_hash_table_remove(cache_list, path);
-  }
+}
 
 gboolean spi_dbus_update_cache(DRouteData *data)
 {
@@ -292,9 +299,11 @@ gboolean spi_dbus_update_cache(DRouteData *data)
   DBusMessageIter iter;
   CacheIterData d;
 
+  g_assert(data != NULL);
+
   if (update_pending == 0) return FALSE;
 //printf("Sending cache\n");
-  message = dbus_message_new_signal("/org/freedesktop/atspi/tree", "org.freedesktop.atspi.Tree", "UpdateTree");
+  message = dbus_message_new_signal (SPI_DBUS_INTERFACE_TREE, "org.freedesktop.atspi.Tree", "updateTree");
   if (!message) goto done;
   dbus_message_iter_init_append (message, &iter);
   dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ooaoassus)",