diff options
| author | Olli Salli <olli.salli@collabora.co.uk> | 2012-03-16 20:49:55 +0200 |
|---|---|---|
| committer | Olli Salli <olli.salli@collabora.co.uk> | 2012-03-16 20:49:58 +0200 |
| commit | 65ed92c5a686d0134df6a9c4fe079da678f47b61 (patch) | |
| tree | d0cefeab8117c1c2db77da553dc77548bc45bdbe | |
| parent | aa9bdf2e3da158323676980c85dd27dac4a19193 (diff) | |
| parent | 81aab61ae8acc9f2817234ee69355962ffecd613 (diff) | |
Merge branch 'standalone-salut-plugin'
Reviewed-by: Olli Salli <olli.salli@collabora.co.uk>
| -rw-r--r-- | plugin-base/ytstenut.c | 7 | ||||
| -rw-r--r-- | salut/Makefile.am | 3 | ||||
| -rw-r--r-- | salut/status.c | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/plugin-base/ytstenut.c b/plugin-base/ytstenut.c index fc7e473..1b75e11 100644 --- a/plugin-base/ytstenut.c +++ b/plugin-base/ytstenut.c @@ -28,7 +28,7 @@ #ifdef SALUT #include <salut/plugin.h> -#include <salut/protocol.h> +#include <salut/plugin-connection.h> typedef SalutPlugin FooPlugin; typedef SalutPluginConnection FooConnection; typedef SalutSidecar FooSidecar; @@ -74,13 +74,14 @@ ytst_plugin_class_init (YtstPluginClass *klass) #ifdef SALUT static void ytstenut_plugin_initialize (SalutPlugin *plugin, - TpBaseConnectionManager *connection_manager) + TpBaseConnectionManager *connection_manager, + const SalutPluginInitializeCallbacks *callbacks) { TpBaseProtocol *protocol; DEBUG ("%p on connection manager %p", plugin, connection_manager); - protocol = salut_protocol_new (G_TYPE_NONE, + protocol = callbacks->create_protocol (G_TYPE_NONE, "_ytstenut._tcp", "local-ytstenut", "Ytstenut protocol", "im-ytstenut"); tp_base_connection_manager_add_protocol (connection_manager, protocol); } diff --git a/salut/Makefile.am b/salut/Makefile.am index 0267b4d..9c805d1 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -10,10 +10,11 @@ plugindir = $(salutplugindir) plugin_LTLIBRARIES = ytstenut-salut.la -AM_LDFLAGS = -module -avoid-version -shared +AM_LDFLAGS = -module -avoid-version -shared -no-undefined ytstenut_salut_la_LIBADD = \ $(TELEPATHY_YTSTENUT_LIBS) \ + $(SALUT_LIBS) \ $(WOCKY_LIBS) $(copied_files): diff --git a/salut/status.c b/salut/status.c index 6125302..5379685 100644 --- a/salut/status.c +++ b/salut/status.c @@ -26,7 +26,6 @@ #include <string.h> #include <salut/plugin.h> -#include <salut/util.h> #include <telepathy-glib/svc-generic.h> #include <telepathy-glib/gtypes.h> @@ -701,7 +700,7 @@ ytst_status_advertise_status (TpYtsSvcStatus *svc, wocky_node_add_node_tree (item, status_tree); g_object_unref (status_tree); - salut_send_ll_pep_event (priv->session, stanza); + wocky_send_ll_pep_event (priv->session, stanza); g_object_unref (stanza); out: |