BGO#641869: Remove --enable-relocate and associated autostart file and schema

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

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index ce1ea51..d03f0c3 100644 (file)
--- 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);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -227,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);
@@ -238,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);
 }
 
@@ -250,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;
@@ -306,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;
     }
@@ -316,13 +317,16 @@ register_application (SpiBridge * app)
   if (message)
     dbus_message_unref (message);
 
-/* could this be better, we accept some amount of race in getting the temp name*/
-/* make sure the directory exists */
-mkdir("/tmp/at-spi2/", S_IRWXU);
-app->app_bus_addr = g_malloc(max_addr_length * sizeof(char));
+  /* could this be better, we accept some amount of race in getting the temp name*/
+  /* make sure the directory exists */
+  mkdir ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX);
+  chmod ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX);
+  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());
+  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;
@@ -525,10 +529,15 @@ setup_bus (void)
 
   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);
@@ -721,7 +730,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);