Add .po and .pc files from cspi

[platform/core/uifw/at-spi2-atk.git] / spi-common / spi-dbus.c

diff --git a/spi-common/spi-dbus.c b/spi-common/spi-dbus.c
index 4e176e1..19e5528 100644 (file)
--- a/spi-common/spi-dbus.c
+++ b/spi-common/spi-dbus.c
@@ -29,47 +29,6 @@
 
 #include "spi-types.h"
 
-GHashTable *path2ptr;
-static guint objindex;
-
-static void
-deregister_object (gpointer data, GObject *obj)
-{
-  spi_dbus_notify_remove(ATK_OBJECT(obj), NULL);
-  g_hash_table_remove (path2ptr, &obj);
-}
-
-static guint
-register_object (GObject * obj)
-{
-  gint *new_int;
-
-  if (!path2ptr)
-    {
-      path2ptr = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, NULL);
-      if (!path2ptr)
-       return ++objindex;
-    }
-  objindex++;
-  while (g_hash_table_lookup (path2ptr, &objindex))
-    {
-      objindex++;
-      /* g_object_get_data returning 0 means no data, so handle wrap-around */
-      if (objindex == 0)
-       objindex++;
-    }
-  new_int = (gint *)g_malloc(sizeof(gint));
-  if (new_int)
-  {
-    *new_int = objindex;
-    g_hash_table_insert (path2ptr, new_int, obj);
-  }
-  g_object_set_data (G_OBJECT (obj), "dbus-id", (gpointer) objindex);
-  g_object_weak_ref(G_OBJECT(obj), deregister_object, NULL);
-  spi_dbus_notify_change(obj, TRUE, NULL);
-  return objindex;
-}
-
 DBusMessage *
 spi_dbus_general_error (DBusMessage * message)
 {
@@ -172,7 +131,7 @@ dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...)
   return TRUE;
 }
 
-dbus_bool_t spi_dbus_marshall_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e)
+dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e)
 {
   DBusMessageIter iter;
 
@@ -181,10 +140,69 @@ dbus_bool_t spi_dbus_marshall_deviceEvent(DBusMessage *message, const Accessibil
   return spi_dbus_message_iter_append_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID);
 }
 
-dbus_bool_t spi_dbus_demarshall_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e)
+dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e)
 {
   DBusMessageIter iter;
 
   dbus_message_iter_init(message, &iter);
   return spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID);
 }
+
+dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error)
+{
+  DBusMessage *message, *reply;
+  DBusMessageIter iter, iter_variant;
+  int typ;
+
+  dbus_error_init (error);
+  message = dbus_message_new_method_call (dest, path, "org.freedesktop.DBus.Properties", "get");
+  if (!message) return FALSE;
+  if (!dbus_message_append_args (message, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID))
+  {
+    return FALSE;
+  }
+  reply = dbus_connection_send_with_reply_and_block (bus, message, 1000, error);
+  dbus_message_unref (message);
+  if (!reply) return FALSE;
+  dbus_message_iter_init (reply, &iter);
+  dbus_message_iter_recurse (&iter, &iter_variant);
+  typ = dbus_message_iter_get_arg_type (&iter_variant);
+  if (type) *type = typ;
+  if (typ == DBUS_TYPE_INVALID || typ == DBUS_TYPE_STRUCT || typ == DBUS_TYPE_ARRAY)
+  {
+    return FALSE;
+  }
+  dbus_message_iter_get_basic (&iter_variant, ptr);
+  dbus_message_unref (reply);
+  return TRUE;
+}
+
+dbus_bool_t
+spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name)
+{
+  char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name);
+  if (match)
+  {
+    DBusError error;
+    dbus_error_init (&error);
+    dbus_bus_add_match (bus, match, &error);
+    g_free (match);
+    return !dbus_error_is_set (&error);
+  }
+  else return FALSE;
+}
+
+dbus_bool_t
+spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name)
+{
+  char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name);
+  if (match)
+  {
+    DBusError error;
+    dbus_error_init (&error);
+    dbus_bus_remove_match (bus, match, &error);
+    g_free (match);
+    return !dbus_error_is_set (&error);
+  }
+  else return FALSE;
+}