Implement TpYtsStatus client proxy.

3 files changed, 487 insertions, 1 deletions

diff --git a/telepathy-ytstenut-glib/Makefile.am b/telepathy-ytstenut-glib/Makefile.am
index 521d9ca..0169d1c 100644
--- a/telepathy-ytstenut-glib/Makefile.am
+++ b/telepathy-ytstenut-glib/Makefile.am
@@ -14,6 +14,8 @@ libtelepathy_ytstenut_glib_la_SOURCES = \
     account-manager.h \
     errors.c \
     errors.h \
+    status.c \
+    status.h \
     telepathy-ytstenut-glib.c \
     telepathy-ytstenut-glib.h
 
@@ -28,6 +30,8 @@ nodist_libtelepathy_ytstenut_glib_la_SOURCES = \
     _gen/interfaces-body.h \
     _gen/cli-account-manager.h \
     _gen/cli-account-manager-body.h \
+    _gen/cli-status.h \
+    _gen/cli-status-body.h \
     _gen/svc.h \
     _gen/svc.c
 
@@ -41,6 +45,7 @@ BUILT_SOURCES = \
 tpytstenutglibinclude_HEADERS = \
     account-manager.h \
     errors.h \
+    status.h \
     telepathy-ytstenut-glib.h
 
 nodist_geninclude_HEADERS = \
@@ -48,6 +53,7 @@ nodist_geninclude_HEADERS = \
     _gen/gtypes.h \
     _gen/interfaces.h \
     _gen/cli-account-manager.h \
+    _gen/cli-status.h \
     _gen/svc.h
 
 EXTRA_DIST = \
@@ -67,7 +73,7 @@ _gen/all.xml: all.xml $(wildcard $(top_srcdir)/spec/*.xml)
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py \
 		$< > $@.tmp && mv $@.tmp $@
 
-_gen/cli-account-manager-body.h _gen/cli-account-manager.h: _gen/all.xml \
+_gen/cli-account-manager-body.h _gen/cli-account-manager.h: $(top_srcdir)/spec/Account_Manager.xml \
 	$(tools_dir)/glib-client-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
 		--group=account_manager \
@@ -77,6 +83,16 @@ _gen/cli-account-manager-body.h _gen/cli-account-manager.h: _gen/all.xml \
 		--tp-proxy-api=0.10.0 \
 		$< Tp_Yts _gen/cli-account-manager
 
+_gen/cli-status-body.h _gen/cli-status.h: $(top_srcdir)/spec/Status.xml \
+	$(tools_dir)/glib-client-gen.py
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
+		--group=status \
+		--subclass=TpYtsStatus \
+		--subclass-assert=TP_IS_YTS_STATUS \
+		--iface-quark-prefix=TP_YTS_IFACE_QUARK \
+		--tp-proxy-api=0.10.0 \
+		$< Tp_Yts _gen/cli-status
+
 _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
 	Makefile.am
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
diff --git a/telepathy-ytstenut-glib/status.c b/telepathy-ytstenut-glib/status.c
new file mode 100644
index 0000000..99f97c3
--- /dev/null
+++ b/telepathy-ytstenut-glib/status.c
@@ -0,0 +1,376 @@
+/*
+ * status.c - proxy for Ytstenut service status
+ *
+ * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2009 Nokia Corporation
+ * Copyright (C) 2011 Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+
+#include "status.h"
+
+#include <telepathy-glib/defs.h>
+#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/proxy-subclass.h>
+#include <telepathy-glib/util.h>
+
+#include "_gen/interfaces.h"
+#include "_gen/cli-status-body.h"
+
+#define DEBUG(msg, ...) \
+    g_debug ("%s: " msg, G_STRFUNC, ##__VA_ARGS__)
+
+#define IFACE_CONNECTION_FUTURE \
+    "org.freedesktop.Telepathy.Connection.FUTURE"
+
+/**
+ * SECTION:status
+ * @title: TpYtsStatus
+ * @short_description: proxy object for Ytstenut service status
+ *
+ * The #TpYtsStatus object is used to communicate with the Ytstenut
+ * Status service.
+ */
+
+/**
+ * TpYtsStatus:
+ *
+ * The Ytstenut Status holds information about Ytstenut services and
+ * their advertised status. We can also advertise status of services on
+ * this device.
+ */
+
+/**
+ * TpYtsStatusClass:
+ *
+ * The class of a #TpYtsStatus.
+ */
+
+G_DEFINE_TYPE (TpYtsStatus, tp_yts_status, TP_TYPE_PROXY);
+
+static void
+tp_yts_status_init (TpYtsStatus *self)
+{
+
+}
+
+static void
+tp_yts_status_class_init (TpYtsStatusClass *klass)
+{
+  TpProxyClass *proxy_class = (TpProxyClass *) klass;
+  GType tp_type = TP_TYPE_YTS_STATUS;
+
+  proxy_class->interface = TP_YTS_IFACE_QUARK_STATUS;
+
+  tp_proxy_init_known_interfaces ();
+  tp_proxy_or_subclass_hook_on_interface_add (tp_type,
+      tp_yts_status_add_signals);
+  tp_proxy_subclass_add_error_mapping (tp_type,
+      TP_ERROR_PREFIX, TP_ERRORS, TP_TYPE_ERROR);
+}
+
+typedef void (*callback_for_connection_ensure_sidecar) (
+    TpConnection *connection, const GError *error, const gchar *sidecar_path,
+    GHashTable *sidecar_properties, gpointer user_data, GObject *weak_object);
+
+static void
+on_connection_ensure_sidecar_returned (DBusGProxy *proxy,
+    DBusGProxyCall *call_id,
+    gpointer user_data)
+{
+  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data);
+  GError *error = NULL;
+  gchar *sidecar_path;
+  GHashTable *sidecar_properties;
+  TpYtsStatus *status;
+  TpProxy *connection;
+
+  connection = TP_PROXY (g_async_result_get_source_object (
+      G_ASYNC_RESULT (res)));
+
+  if (dbus_g_proxy_end_call (proxy, call_id, &error,
+      DBUS_TYPE_G_OBJECT_PATH,
+      &sidecar_path,
+      dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
+      &sidecar_properties,
+      G_TYPE_INVALID))
+    {
+      status = TP_YTS_STATUS (g_object_new (TP_TYPE_YTS_STATUS,
+              "dbus-daemon", tp_proxy_get_dbus_daemon (connection),
+              "dbus-connection", tp_proxy_get_dbus_connection (connection),
+              "bus-name", tp_proxy_get_bus_name (connection),
+              "object-path", sidecar_path,
+              NULL));
+      g_simple_async_result_set_op_res_gpointer (res, status, g_object_unref);
+      g_free (sidecar_path);
+      g_hash_table_unref (sidecar_properties);
+    }
+  else
+    {
+      g_simple_async_result_set_from_error (res, error);
+      g_clear_error (&error);
+    }
+
+  g_simple_async_result_complete (res);
+}
+
+void
+tp_yts_status_ensure_for_connection_async (TpConnection *connection,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  DBusGProxy *future_iface;
+  GSimpleAsyncResult *res;
+  GError *error = NULL;
+  GQuark iface_id;
+
+  g_return_if_fail (TP_IS_CONNECTION (connection));
+
+  res = g_simple_async_result_new (G_OBJECT (connection), callback, user_data,
+      tp_yts_status_ensure_for_connection_async);
+
+  /* Declare that this connection supports EnsureSidecars */
+  iface_id = g_quark_from_static_string (IFACE_CONNECTION_FUTURE);
+  tp_proxy_add_interface_by_id (TP_PROXY (connection), iface_id);
+
+  future_iface = tp_proxy_borrow_interface_by_id (TP_PROXY (connection),
+      iface_id, &error);
+  if (!future_iface)
+    {
+      g_simple_async_result_set_from_error (res, error);
+      g_simple_async_result_complete_in_idle (res);
+      g_clear_error (&error);
+      g_object_unref (res);
+      return;
+    }
+
+  dbus_g_proxy_begin_call_with_timeout (future_iface,
+      "EnsureSidecar", on_connection_ensure_sidecar_returned,
+      res, g_object_unref, -1,
+      G_TYPE_STRING, TP_YTS_IFACE_STATUS,
+      G_TYPE_INVALID);
+}
+
+TpYtsStatus *
+tp_yts_status_ensure_for_connection_finish (TpConnection *connection,
+    GAsyncResult *result,
+    GError **error)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_val_if_fail (TP_IS_CONNECTION (connection), NULL);
+  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
+
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+          G_OBJECT (connection), tp_yts_status_advertise_status_async), NULL);
+  res = G_SIMPLE_ASYNC_RESULT (result);
+
+  if (g_simple_async_result_propagate_error (res, error))
+    return NULL;
+
+  return g_object_ref (g_simple_async_result_get_op_res_gpointer (res));
+}
+
+static void
+on_status_advertise_status_returned (TpYtsStatus *self,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data);
+
+  if (error != NULL)
+    {
+      DEBUG ("Status.AdvertiseStatus failed: %s", error->message);
+      g_simple_async_result_set_from_error (res, error);
+    }
+
+  g_simple_async_result_complete (res);
+}
+
+void tp_yts_status_advertise_status_async (TpYtsStatus *self,
+    const gchar *capability,
+    const gchar *service_name,
+    const gchar *status_xml,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_if_fail (TP_IS_YTS_STATUS (self));
+
+  res = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
+      tp_yts_status_advertise_status_async);
+
+  tp_yts_status_call_advertise_status (self, -1,
+      capability, service_name, status_xml, on_status_advertise_status_returned,
+      res, g_object_unref, G_OBJECT (self));
+}
+
+gboolean
+tp_yts_status_advertise_status_finish (TpYtsStatus *self,
+    GAsyncResult *result,
+    GError **error)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_val_if_fail (TP_IS_YTS_STATUS (self), FALSE);
+  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE);
+
+  res = G_SIMPLE_ASYNC_RESULT (result);
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+          G_OBJECT (self), tp_yts_status_advertise_status_async), FALSE);
+
+  if (g_simple_async_result_propagate_error (res, error))
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+on_status_get_discovered_statuses_returned (TpProxy *proxy,
+    const GValue *value,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data);
+  GHashTable *statuses;
+
+  if (error == NULL)
+    {
+      statuses = g_value_dup_boxed (value);
+      g_simple_async_result_set_op_res_gpointer (res, statuses,
+          (GDestroyNotify)g_hash_table_unref);
+    }
+  else
+    {
+      DEBUG ("Failed to get DiscoveredStatuses: %s", error->message);
+      g_simple_async_result_set_from_error (res, error);
+    }
+
+  g_simple_async_result_complete (res);
+}
+
+void
+tp_yts_status_get_discovered_statuses_async (TpYtsStatus *self,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_if_fail (TP_IS_YTS_STATUS (self));
+
+  res = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
+      tp_yts_status_get_discovered_statuses_async);
+
+  tp_cli_dbus_properties_call_get (TP_PROXY (self), -1,
+      TP_YTS_IFACE_STATUS, "DiscoveredStatus",
+      on_status_get_discovered_statuses_returned, res, g_object_unref,
+      G_OBJECT (self));
+
+}
+
+GHashTable *
+tp_yts_status_get_discovered_statuses_finish (TpYtsStatus *self,
+    GAsyncResult *result,
+    GError **error)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_val_if_fail (TP_IS_YTS_STATUS (self), NULL);
+  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
+
+  res = G_SIMPLE_ASYNC_RESULT (result);
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+          G_OBJECT (self), tp_yts_status_get_discovered_statuses_async), NULL);
+
+  if (g_simple_async_result_propagate_error (res, error))
+    return NULL;
+
+  return g_hash_table_ref (g_simple_async_result_get_op_res_gpointer (res));
+}
+
+static void
+on_status_get_discovered_services_returned (TpProxy *proxy,
+    const GValue *value,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data);
+  GHashTable *services;
+
+  if (error == NULL)
+    {
+      services = g_value_dup_boxed (value);
+      g_simple_async_result_set_op_res_gpointer (res, services,
+          (GDestroyNotify)g_hash_table_unref);
+    }
+  else
+    {
+      DEBUG ("Failed to get DiscoveredServices: %s", error->message);
+      g_simple_async_result_set_from_error (res, error);
+    }
+
+  g_simple_async_result_complete (res);
+}
+
+void
+tp_yts_status_get_discovered_services_async (TpYtsStatus *self,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_if_fail (TP_IS_YTS_STATUS (self));
+
+  res = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
+      tp_yts_status_get_discovered_services_async);
+
+  tp_cli_dbus_properties_call_get (TP_PROXY (self), -1,
+      TP_YTS_IFACE_STATUS, "DiscoveredServices",
+      on_status_get_discovered_services_returned, res, g_object_unref,
+      G_OBJECT (self));
+
+}
+
+GHashTable *
+tp_yts_status_get_discovered_services_finish (TpYtsStatus *self,
+    GAsyncResult *result,
+    GError **error)
+{
+  GSimpleAsyncResult *res;
+
+  g_return_val_if_fail (TP_IS_YTS_STATUS (self), NULL);
+  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
+
+  res = G_SIMPLE_ASYNC_RESULT (result);
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+          G_OBJECT (self), tp_yts_status_get_discovered_services_async), NULL);
+
+  if (g_simple_async_result_propagate_error (res, error))
+    return NULL;
+
+  return g_hash_table_ref (g_simple_async_result_get_op_res_gpointer (res));
+}
diff --git a/telepathy-ytstenut-glib/status.h b/telepathy-ytstenut-glib/status.h
new file mode 100644
index 0000000..8911b4e
--- /dev/null
+++ b/telepathy-ytstenut-glib/status.h
@@ -0,0 +1,94 @@
+/*
+ * status.h - proxy for Ytstenut service status
+ *
+ * Copyright (C) 2011 Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef TP_YTS_STATUS_H
+#define TP_YTS_STATUS_H
+
+#include <telepathy-glib/connection.h>
+#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/defs.h>
+#include <telepathy-glib/proxy.h>
+
+G_BEGIN_DECLS
+
+typedef struct _TpYtsStatus TpYtsStatus;
+typedef struct _TpYtsStatusClass TpYtsStatusClass;
+typedef struct _TpYtsStatusPrivate TpYtsStatusPrivate;
+
+struct _TpYtsStatus {
+    /*<private>*/
+    TpProxy parent;
+    TpYtsStatusPrivate *priv;
+};
+
+struct _TpYtsStatusClass {
+    /*<private>*/
+    TpProxyClass parent_class;
+    GCallback _padding[7];
+};
+
+GType tp_yts_status_get_type (void);
+
+#define TP_TYPE_YTS_STATUS (tp_yts_status_get_type ())
+#define TP_YTS_STATUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+    TP_TYPE_YTS_STATUS, TpYtsStatus))
+#define TP_YTS_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
+    TP_TYPE_YTS_STATUS, TpYtsStatusClass))
+#define TP_IS_YTS_STATUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+    TP_TYPE_YTS_STATUS))
+#define TP_IS_YTS_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+    TP_TYPE_YTS_STATUS))
+#define TP_YTS_STATUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+    TP_TYPE_YTS_STATUS, TpYtsStatusClass))
+
+void tp_yts_status_ensure_for_connection_async (TpConnection *connection,
+    GCancellable *cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+TpYtsStatus *tp_yts_status_ensure_for_connection_finish (
+    TpConnection *connection, GAsyncResult *result, GError **error);
+
+void tp_yts_status_advertise_status_async (TpYtsStatus *self,
+    const gchar *capability, const gchar *service_name, const gchar *status_xml,
+    GCancellable *cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+gboolean tp_yts_status_advertise_status_finish (TpYtsStatus *self,
+    GAsyncResult *result, GError **error);
+
+void tp_yts_status_get_discovered_statuses_async (TpYtsStatus *self,
+    GCancellable *cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+GHashTable *tp_yts_status_get_discovered_statuses_finish (TpYtsStatus *self,
+    GAsyncResult *result, GError **error);
+
+void tp_yts_status_get_discovered_services_async (TpYtsStatus *self,
+    GCancellable *cancellable, GAsyncReadyCallback callback,
+    gpointer user_data);
+
+GHashTable *tp_yts_status_get_discovered_services_finish (TpYtsStatus *self,
+    GAsyncResult *result, GError **error);
+
+G_END_DECLS
+
+#include <telepathy-ytstenut-glib/_gen/cli-status.h>
+
+#endif