X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=0baf6f80a45c10c13ac7e2a8743f01cc42b78bf5;hb=7a04aebc85d20b9c31850b5615f040ec208134c3;hp=5fcd4fc68059675834c179842c5913b1eb540150;hpb=4552224dc556037a45406e75b9c4bdc7bafd2199;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 5fcd4fc..0baf6f8 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -37,6 +37,7 @@
 
 #include <droute/droute.h>
 #include <gmodule.h>
+#include <glib/gi18n.h>
 
 #include "bridge.h"
 #include "event.h"
@@ -174,6 +175,7 @@ set_reply (DBusPendingCall *pending, void *user_data)
     void **replyptr = (void **)user_data;
 
     *replyptr = dbus_pending_call_steal_reply (pending);
+  dbus_pending_call_unref (pending);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -211,6 +213,7 @@ get_registered_event_listeners (SpiBridge *app)
                                          SPI_DBUS_PATH_REGISTRY,
                                          SPI_DBUS_INTERFACE_REGISTRY,
                                          "GetRegisteredEvents");
+  spi_global_app_data->events_initialized = TRUE;
   if (!message)
     return;
 
@@ -226,10 +229,7 @@ get_registered_event_listeners (SpiBridge *app)
     }
   dbus_message_iter_init (reply, &iter);
   dbus_message_iter_recurse (&iter, &iter_array);
-  /* TODO: This is bad. Need to determine that the array is non-empty,
-     so that we don't initially read a value rom it in that case, but using
-     a deprecated function. */
-  if (dbus_message_iter_get_array_len (&iter_array) > 0) do
+  while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
     {
       char *bus_name, *event;
       dbus_message_iter_recurse (&iter_array, &iter_struct);
@@ -237,8 +237,8 @@ get_registered_event_listeners (SpiBridge *app)
       dbus_message_iter_next (&iter_struct);
       dbus_message_iter_get_basic (&iter_struct, &event);
       add_event (bus_name, event);
+      dbus_message_iter_next (&iter_array);
     }
-  while (dbus_message_iter_next (&iter_array));
   dbus_message_unref (reply);
 }
 
@@ -249,7 +249,8 @@ register_reply (DBusPendingCall *pending, void *user_data)
   SpiBridge *app = user_data;
   DBusMessage *message;
 
-    reply = dbus_pending_call_steal_reply (pending);
+  reply = dbus_pending_call_steal_reply (pending);
+  dbus_pending_call_unref (pending);
   if (reply)
     {
       gchar *app_name, *obj_path;
@@ -305,7 +306,8 @@ register_application (SpiBridge * app)
   dbus_message_iter_init_append (message, &iter);
   spi_object_append_reference (&iter, app->root);
   
-    if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1))
+    if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)
+        || !pending)
     {
         return FALSE;
     }
@@ -319,8 +321,12 @@ register_application (SpiBridge * app)
 /* make sure the directory exists */
 mkdir("/tmp/at-spi2/", S_IRWXU);
 app->app_bus_addr = g_malloc(max_addr_length * sizeof(char));
+#ifndef DISABLE_P2P
 sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(),
 rand());
+#else
+  app->app_bus_addr [0] = '\0';
+#endif
 
   return TRUE;
 }
@@ -516,20 +522,27 @@ new_connection_cb (DBusServer *server, DBusConnection *con, void *data)
 static int
 setup_bus (void)
 {
+#ifndef DISABLE_P2P
   DBusServer *server;
   DBusError err;
 
   dbus_error_init(&err);
   server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
-
-  /* is there a better way to handle this */
   if (server == NULL)
+  {
+    g_warning (_("atk-bridge: Couldn't listen on dbus server: %s"), err.message);
+    dbus_error_init (&err);
+    spi_global_app_data->app_bus_addr [0] = '\0';
+    g_main_context_unref (spi_global_app_data->main_context);
+    spi_global_app_data->main_context = NULL;
     return -1;
+  }
 
   dbus_server_setup_with_g_main(server, NULL);
   dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL);
 
   spi_global_app_data->server = server;
+#endif
 
   return 0;
 }
@@ -716,7 +729,11 @@ adaptor_init (gint * argc, gchar ** argv[])
         }
     }
 
+#ifndef DISABLE_P2P
   spi_global_app_data->main_context = g_main_context_new ();
+#else
+  spi_global_app_data->main_context = NULL;
+#endif
 
   dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL);
 
@@ -791,8 +808,6 @@ adaptor_init (gint * argc, gchar ** argv[])
 
   setup_bus();
 
-  g_atexit (exit_func);
-
   return 0;
 }