more uint -> guint fixes

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

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 7544d41..d756795 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -25,8 +25,6 @@
 #define _GNU_SOURCE
 #include "config.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -36,8 +34,8 @@
 #include <atk/atk.h>
 
 #include <droute/droute.h>
-#include <gmodule.h>
 #include <atspi/atspi.h>
+#include <atk-bridge.h>
 
 #include "bridge.h"
 #include "event.h"
@@ -58,6 +56,8 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data);
 
 SpiBridge *spi_global_app_data = NULL;
 
+static gboolean inited = FALSE;
+
 /*---------------------------------------------------------------------------*/
 
 static void
@@ -65,7 +65,6 @@ add_event (const char *bus_name, const char *event)
 {
   event_data *evdata;
   gchar **data;
-  GList *new_list;
 
   spi_atk_add_client (bus_name);
   evdata = (event_data *) g_malloc (sizeof (*evdata));
@@ -79,9 +78,7 @@ add_event (const char *bus_name, const char *event)
     }
   evdata->bus_name = g_strdup (bus_name);
   evdata->data = data;
-  new_list = g_list_append (spi_global_app_data->events, evdata);
-  if (new_list)
-    spi_global_app_data->events = new_list;
+  spi_global_app_data->events = g_list_append (spi_global_app_data->events, evdata);
 }
 
 static GSList *clients = NULL;
@@ -232,7 +229,6 @@ register_reply (DBusPendingCall *pending, void *user_data)
 {
   DBusMessage *reply;
   SpiBridge *app = user_data;
-  DBusMessage *message;
 
   reply = dbus_pending_call_steal_reply (pending);
   dbus_pending_call_unref (pending);
@@ -270,7 +266,7 @@ register_reply (DBusPendingCall *pending, void *user_data)
 static gboolean
 register_application (SpiBridge * app)
 {
-  DBusMessage *message, *reply;
+  DBusMessage *message;
   DBusMessageIter iter;
   DBusError error;
   DBusPendingCall *pending;
@@ -468,8 +464,8 @@ install_plug_hooks ()
   socket_class->embed = socket_embed_hook;
 }
 
-static uint
-get_ancestral_uid (uint pid)
+static guint
+get_ancestral_uid (guint pid)
 {
   FILE *fp;
   char buf [80];
@@ -513,8 +509,6 @@ user_check (DBusConnection *bus, unsigned long uid, void *data)
 static void
 new_connection_cb (DBusServer *server, DBusConnection *con, void *data)
 {
-  GList *new_list;
-
   dbus_connection_set_unix_user_function (con, user_check, NULL, NULL);
   dbus_connection_ref(con);
   atspi_dbus_connection_setup_with_g_main(con, NULL);
@@ -592,7 +586,6 @@ handle_event_listener_registered (DBusConnection *bus, DBusMessage *message,
 static void
 remove_events (const char *bus_name, const char *event)
 {
-  event_data *evdata;
   gchar **remove_data;
   GList *list;
 
@@ -628,7 +621,6 @@ static void
 handle_event_listener_deregistered (DBusConnection *bus, DBusMessage *message,
                                     void *user_data)
 {
-  const char *orig_name;
   gchar *name;
   char *sender;
 
@@ -709,6 +701,27 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 /*
+ * Checks the status of the environment variables
+ *
+ * At this moment it only checks NO_AT_BRIDGE
+ *
+ * Returns TRUE if there isn't anything on the environment preventing
+ * you to load the bridge, FALSE otherwise
+ */
+static gboolean
+check_envvar (void)
+{
+  const gchar *envvar;
+
+  envvar = g_getenv ("NO_AT_BRIDGE");
+
+  if (envvar && atoi (envvar) == 1)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+/*
  * spi_app_init
  *
  * The following needs to be initialized.
@@ -720,22 +733,24 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
  *
  */
 int
-adaptor_init (gint * argc, gchar ** argv[])
+atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
 {
   GOptionContext *opt;
   GError *err = NULL;
   DBusError error;
   AtkObject *root;
-  gchar *introspection_directory;
-  static gboolean inited = FALSE;
+  gboolean load_bridge;
+  DRoutePath *treepath, *accpath;
+
+  load_bridge = check_envvar ();
+  if (inited && !load_bridge)
+    g_warning ("ATK Bridge is disabled but a11y has already been enabled.");
 
-  if (inited)
+  if (inited || !load_bridge)
     return 0;
 
   inited = TRUE;
 
-  DRoutePath *treepath, *accpath;
-
   root = atk_get_root ();
   g_warn_if_fail (root);
   if (!root)
@@ -862,11 +877,13 @@ adaptor_init (gint * argc, gchar ** argv[])
 }
 
 void
-adaptor_cleanup (void)
+atk_bridge_adaptor_cleanup (void)
 {
   GList *l;
   GSList *ls;
 
+  g_return_if_fail (inited);
+
   if (!spi_global_app_data)
       return;
 
@@ -910,50 +927,8 @@ adaptor_cleanup (void)
 
   g_free (spi_global_app_data);
   spi_global_app_data = NULL;
-}
-
-/*---------------------------------------------------------------------------*/
 
-int
-gtk_module_init (gint * argc, gchar ** argv[])
-{
-  const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
-
-  if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
-    {
-      return adaptor_init (argc, argv);
-    }
-  return 0;
-}
-
-gchar*
-g_module_check_init (GModule *module)
-{
-  g_module_make_resident (module);
-
-  return NULL;
-}
-
-void
-gnome_accessibility_module_init (void)
-{
-  const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
-
-  if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
-    {
-      adaptor_init (NULL, NULL);
-
-      if (g_getenv ("AT_SPI_DEBUG"))
-        {
-          g_print ("Atk Accessibility bridge initialized\n");
-        }
-    }
-}
-
-void
-gnome_accessibility_module_shutdown (void)
-{
-  adaptor_cleanup ();
+  inited = FALSE;
 }
 
 /*---------------------------------------------------------------------------*/