diff options
| author | Siraj Razick <siraj.razick@collabora.co.uk> | 2012-01-24 20:38:28 -0500 |
|---|---|---|
| committer | Siraj Razick <siraj.razick@collabora.co.uk> | 2012-02-01 14:48:43 -0500 |
| commit | 3412e56f72c36eb48c83742257b8a5f9b6b6f603 (patch) | |
| tree | 8fa13c1e141da8d79e34ea56817bbee7349cee14 | |
| parent | 25aa12dfeb6974425e5af8f74b9161d2e9a324ce (diff) | |
ifdef gabble specific API which is not shared with salut anymore
Address the review comments of fdo#44447. This patch fixes the
salut build, since the plugins API of gabble and salut is different
at this point.
| -rw-r--r-- | plugin-base/ytstenut.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/plugin-base/ytstenut.c b/plugin-base/ytstenut.c index 8a97080..706866e 100644 --- a/plugin-base/ytstenut.c +++ b/plugin-base/ytstenut.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include <stdio.h> #include "ytstenut.h" @@ -98,10 +97,10 @@ ytstenut_plugin_create_sidecar_async ( { GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (plugin), callback, user_data, - /* sic: all plugins share {salut,gabble}_plugin_create_sidecar_finish() so we +#ifdef SALUT + /* sic: all plugins share salut_plugin_create_sidecar_finish() so we * need to use the same source tag. */ -#ifdef SALUT salut_plugin_create_sidecar_async #else ytstenut_plugin_create_sidecar_async @@ -125,11 +124,10 @@ ytstenut_plugin_create_sidecar_async ( g_simple_async_result_complete_in_idle (result); - g_simple_async_result_is_valid ((GAsyncResult*) result, G_OBJECT (plugin), NULL); - g_object_unref (result); } +#ifdef GABBLE static GabbleSidecar * ytstenut_plugin_create_sidecar_finish ( GabblePlugin *plugin, @@ -150,6 +148,7 @@ ytstenut_plugin_create_sidecar_finish ( return g_object_ref (sidecar); } +#endif static GPtrArray * ytstenut_plugin_create_channel_managers ( @@ -180,14 +179,16 @@ 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; } |