salut-plugin: Update the salut plugin code to match the API changes.

telepathy-salut now uses a seperate library for plugins, similar to
mission control and gabble, This patch updates salut plugin to use
this new library, and the releated API changes which the new plugin API
introduces. (mainly the following)

- Use SalutPluginConnection instead of SalutConnection
- Assign ytstenut_plugin_create_sidecar_finish to create sidecar_finish
- Use salut_plugin_connection_get_name and salut_plugin_connection_get_session

fdo bug : https://bugs.freedesktop.org/show_bug.cgi?id=45804

6 files changed, 41 insertions, 47 deletions

diff --git a/plugin-base/channel-manager.c b/plugin-base/channel-manager.c
index 5dcc003..a2ad696 100644
--- a/plugin-base/channel-manager.c
+++ b/plugin-base/channel-manager.c
@@ -36,8 +36,8 @@
 
 #ifdef SALUT
 #include <salut/caps-channel-manager.h>
-typedef SalutConnection FooConnection;
-#define foo_connection_get_session salut_connection_get_session
+typedef SalutPluginConnection FooConnection;
+#define foo_connection_get_session salut_plugin_connection_get_session
 #else
 #include <gabble/caps-channel-manager.h>
 typedef GabblePluginConnection FooConnection;
@@ -288,7 +288,7 @@ ytst_channel_manager_constructed (GObject *object)
   priv->channels = g_queue_new ();
 
 #ifdef SALUT
-  session = salut_connection_get_session (priv->connection);
+  session = salut_plugin_connection_get_session (priv->connection);
 
   ytst_channel_manager_porter_available_cb (priv->connection,
       wocky_session_get_porter (session), self);
@@ -476,7 +476,7 @@ ytst_channel_manager_create_channel (TpChannelManager *manager,
   DEBUG ("Requested channel for handle: %u (%s)", handle, name);
 
 #ifdef SALUT
-  session = salut_connection_get_session (priv->connection);
+  session = salut_plugin_connection_get_session (priv->connection);
   factory = wocky_session_get_contact_factory (session);
   contact = wocky_contact_factory_lookup_ll_contact (factory, name);
   if (contact == NULL)
@@ -516,7 +516,7 @@ ytst_channel_manager_create_channel (TpChannelManager *manager,
 
   request = ytst_message_channel_build_request (request_properties,
 #ifdef SALUT
-      salut_connection_get_name (priv->connection), contact,
+      salut_plugin_connection_get_name (priv->connection), contact,
 #else
       full_jid, jid,
 #endif
diff --git a/plugin-base/ytstenut.c b/plugin-base/ytstenut.c
index 706866e..72f8cab 100644
--- a/plugin-base/ytstenut.c
+++ b/plugin-base/ytstenut.c
@@ -30,7 +30,7 @@
 #include <salut/plugin.h>
 #include <salut/protocol.h>
 typedef SalutPlugin FooPlugin;
-typedef SalutConnection FooConnection;
+typedef SalutPluginConnection FooConnection;
 typedef SalutSidecar FooSidecar;
 #else
 #include <gabble/plugin.h>
@@ -96,16 +96,8 @@ ytstenut_plugin_create_sidecar_async (
     gpointer user_data)
 {
   GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (plugin),
-      callback, user_data,
-#ifdef SALUT
-      /* sic: all plugins share salut_plugin_create_sidecar_finish() so we
-       * need to use the same source tag.
-       */
-      salut_plugin_create_sidecar_async
-#else
-      ytstenut_plugin_create_sidecar_async
-#endif
-      );
+      callback, user_data, ytstenut_plugin_create_sidecar_async);
+
   FooSidecar *sidecar = NULL;
 
   if (!tp_strdiff (sidecar_interface, TP_YTS_IFACE_STATUS))
@@ -127,14 +119,13 @@ ytstenut_plugin_create_sidecar_async (
   g_object_unref (result);
 }
 
-#ifdef GABBLE
-static GabbleSidecar *
+static FooSidecar *
 ytstenut_plugin_create_sidecar_finish (
-     GabblePlugin *plugin,
+     FooPlugin *plugin,
      GAsyncResult *result,
      GError **error)
 {
-  GabbleSidecar *sidecar;
+  FooSidecar *sidecar;
 
   if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
         error))
@@ -143,12 +134,17 @@ ytstenut_plugin_create_sidecar_finish (
   g_return_val_if_fail (g_simple_async_result_is_valid (result,
         G_OBJECT (plugin), ytstenut_plugin_create_sidecar_async), NULL);
 
-  sidecar = GABBLE_SIDECAR (g_simple_async_result_get_op_res_gpointer (
+  sidecar =
+#ifdef GABBLE
+    GABBLE_SIDECAR (g_simple_async_result_get_op_res_gpointer (
+        G_SIMPLE_ASYNC_RESULT (result)));
+#else
+    SALUT_SIDECAR (g_simple_async_result_get_op_res_gpointer (
         G_SIMPLE_ASYNC_RESULT (result)));
+#endif
 
   return g_object_ref (sidecar);
 }
-#endif
 
 static GPtrArray *
 ytstenut_plugin_create_channel_managers (
@@ -179,16 +175,14 @@ plugin_iface_init (gpointer g_iface,
 #ifdef SALUT
   iface->api_version = SALUT_PLUGIN_CURRENT_VERSION;
   iface->initialize = ytstenut_plugin_initialize;
-  iface->create_sidecar = ytstenut_plugin_create_sidecar_async;
-#else
-  iface->create_sidecar_async = ytstenut_plugin_create_sidecar_async;
-  iface->create_sidecar_finish = ytstenut_plugin_create_sidecar_finish;
 #endif
 
   iface->name = "Ytstenut plugin";
   iface->version = PACKAGE_VERSION;
 
   iface->sidecar_interfaces = sidecar_interfaces;
+  iface->create_sidecar_async = ytstenut_plugin_create_sidecar_async;
+  iface->create_sidecar_finish = ytstenut_plugin_create_sidecar_finish;
   iface->create_channel_managers = ytstenut_plugin_create_channel_managers;
 }
 
diff --git a/salut/message-channel.c b/salut/message-channel.c
index 76f99e1..bd75a9d 100644
--- a/salut/message-channel.c
+++ b/salut/message-channel.c
@@ -48,7 +48,7 @@
 #include <wocky/wocky-xmpp-writer.h>
 #include <wocky/wocky-xmpp-error-enumtypes.h>
 
-#include <salut/connection.h>
+#include <salut/plugin-connection.h>
 
 #define DEBUG(msg, ...) \
   g_debug ("%s: " msg, G_STRFUNC, ##__VA_ARGS__)
@@ -332,8 +332,8 @@ ytst_message_channel_close (TpBaseChannel *chan)
     {
       TpBaseConnection *conn = tp_base_channel_get_connection (
           TP_BASE_CHANNEL (self));
-      WockySession *session = salut_connection_get_session (
-          SALUT_CONNECTION (conn));
+      WockySession *session = salut_plugin_connection_get_session (
+          SALUT_PLUGIN_CONNECTION (conn));
 
       wocky_porter_send_iq_error (
           wocky_session_get_porter (session),
@@ -593,7 +593,7 @@ ytst_message_channel_request (TpYtsSvcChannel *channel,
       return;
     }
 
-  session = salut_connection_get_session (SALUT_CONNECTION (
+  session = salut_plugin_connection_get_session (SALUT_PLUGIN_CONNECTION (
           tp_base_channel_get_connection (TP_BASE_CHANNEL (self))));
 
   wocky_porter_send_iq_async (wocky_session_get_porter (session),
@@ -621,9 +621,9 @@ ytst_message_channel_reply (TpYtsSvcChannel *channel,
 {
   YtstMessageChannel *self = YTST_MESSAGE_CHANNEL (channel);
   YtstMessageChannelPrivate *priv = self->priv;
-  SalutConnection *conn = SALUT_CONNECTION (tp_base_channel_get_connection (
-          TP_BASE_CHANNEL (self)));
-  WockySession *session = salut_connection_get_session (conn);
+  SalutPluginConnection *conn = SALUT_PLUGIN_CONNECTION (
+      tp_base_channel_get_connection ( TP_BASE_CHANNEL (self)));
+  WockySession *session = salut_plugin_connection_get_session (conn);
   WockyNodeTree *body_tree = NULL;
   WockyNode *msg_node;
   WockyStanza *reply;
@@ -693,9 +693,9 @@ ytst_message_channel_fail (TpYtsSvcChannel *channel,
   YtstMessageChannelPrivate *priv = self->priv;
   const gchar *type;
   GError *error = NULL;
-  SalutConnection *conn = SALUT_CONNECTION (tp_base_channel_get_connection (
-          TP_BASE_CHANNEL (self)));
-  WockySession *session = salut_connection_get_session (conn);
+  SalutPluginConnection *conn = SALUT_PLUGIN_CONNECTION (
+      tp_base_channel_get_connection (TP_BASE_CHANNEL (self)));
+  WockySession *session = salut_plugin_connection_get_session (conn);
   WockyStanza *reply;
 
   /* Can't call this method from this side */
@@ -771,7 +771,7 @@ channel_ytstenut_iface_init (gpointer g_iface,
  */
 
 YtstMessageChannel *
-ytst_message_channel_new (SalutConnection *connection,
+ytst_message_channel_new (SalutPluginConnection *connection,
     WockyLLContact *contact,
     WockyStanza *request,
     TpHandle handle,
@@ -780,7 +780,7 @@ ytst_message_channel_new (SalutConnection *connection,
 {
   YtstMessageChannel *channel;
 
-  g_return_val_if_fail (SALUT_IS_CONNECTION (connection), NULL);
+  g_return_val_if_fail (SALUT_IS_PLUGIN_CONNECTION (connection), NULL);
   g_return_val_if_fail (WOCKY_IS_LL_CONTACT (contact), NULL);
   g_return_val_if_fail (WOCKY_IS_STANZA (request), NULL);
 
diff --git a/salut/message-channel.h b/salut/message-channel.h
index a13c00d..6bf2cac 100644
--- a/salut/message-channel.h
+++ b/salut/message-channel.h
@@ -27,7 +27,7 @@
 
 #include <wocky/wocky-ll-contact.h>
 
-#include <salut/connection.h>
+#include <salut/plugin-connection.h>
 
 G_BEGIN_DECLS
 
@@ -62,7 +62,7 @@ GType ytst_message_channel_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), YTST_TYPE_MESSAGE_CHANNEL, \
                               YtstMessageChannelClass))
 
-YtstMessageChannel* ytst_message_channel_new (SalutConnection *connection,
+YtstMessageChannel* ytst_message_channel_new (SalutPluginConnection *connection,
     WockyLLContact *contact,
     WockyStanza *request,
     TpHandle handle,
diff --git a/salut/status.c b/salut/status.c
index 9a77206..5565905 100644
--- a/salut/status.c
+++ b/salut/status.c
@@ -69,7 +69,7 @@ enum
 struct _YtstStatusPrivate
 {
   WockySession *session;
-  SalutConnection *connection;
+  SalutPluginConnection *connection;
 
   guint handler_id;
   gulong capabilities_changed_id;
@@ -596,8 +596,8 @@ ytst_status_class_init (YtstStatusClass *klass)
   param_spec = g_param_spec_object (
       "connection",
       "Salut connection",
-      "SalutConnection object",
-      SALUT_TYPE_CONNECTION,
+      "SalutPluginConnection object",
+      SALUT_TYPE_PLUGIN_CONNECTION,
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION,
       param_spec);
@@ -702,7 +702,7 @@ ytst_status_advertise_status (TpYtsSvcStatus *svc,
       capability);
 
   stanza = wocky_pubsub_make_event_stanza (capability,
-      salut_connection_get_name (priv->connection), &item);
+      salut_plugin_connection_get_name (priv->connection), &item);
 
   wocky_node_add_node_tree (item, status_tree);
   g_object_unref (status_tree);
@@ -744,7 +744,7 @@ sidecar_iface_init (SalutSidecarInterface *iface)
 
 YtstStatus *
 ytst_status_new (WockySession *session,
-    SalutConnection *connection)
+    SalutPluginConnection *connection)
 {
   return g_object_new (YTST_TYPE_STATUS,
       "session", session,
diff --git a/salut/status.h b/salut/status.h
index f4e4ec0..ddd3d8e 100644
--- a/salut/status.h
+++ b/salut/status.h
@@ -27,7 +27,7 @@
 
 #include <wocky/wocky-session.h>
 
-#include <salut/connection.h>
+#include <salut/plugin-connection.h>
 
 G_BEGIN_DECLS
 
@@ -63,7 +63,7 @@ GType ytst_status_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), YTST_TYPE_STATUS, YtstStatusClass))
 
 YtstStatus * ytst_status_new (WockySession *session,
-    SalutConnection *connection);
+    SalutPluginConnection *connection);
 
 G_END_DECLS