summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-02-01 16:07:06 -0500
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-02-01 16:07:06 -0500
commit1d41beb99b03f828fd204e6e18fa7499360937b9 (patch)
tree10046273dae8333e0855041e05dadfe848122460 /plugins
parenta687785628216f8f73c699096e9aae4a07b811c6 (diff)
Revert "Merge remote-tracking branch 'siraj/windows-compile-fix'"
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am45
-rw-r--r--plugins/console.c4
-rw-r--r--plugins/gateways.c4
-rw-r--r--plugins/test.c30
-rw-r--r--plugins/test.h5
5 files changed, 36 insertions, 52 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a6b32eacb..0330cec53 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,31 +1,31 @@
plugindir = $(libdir)/telepathy/gabble-0
installable_plugins = \
- libconsole.la \
- libgateways.la
+ console.la \
+ gateways.la
-libtest_only_plugins = \
- libtest.la
+test_only_plugins = \
+ test.la
-# libtesting-only plugins
+# testing-only plugins
if ENABLE_INSTALLED_TESTS
noinst_LTLIBRARIES = \
$(NULL)
-libtestplugindir = $(gabbletestsdir)/plugins
-libtestplugin_LTLIBRARIES = \
- $(libtest_only_plugins) \
+testplugindir = $(gabbletestsdir)/plugins
+testplugin_LTLIBRARIES = \
+ $(test_only_plugins) \
$(NULL)
-libtest_la_LDFLAGS = $(AM_LDFLAGS)
+test_la_LDFLAGS = $(AM_LDFLAGS)
else
noinst_LTLIBRARIES = \
- $(libtest_only_plugins) \
+ $(test_only_plugins) \
$(NULL)
-# because libtest.la is not installed, libtool will want to compile it as static
+# because test.la is not installed, libtool will want to compile it as static
# despite -shared (a convenience library), unless we also use -rpath
-libtest_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(plugindir)
+test_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(plugindir)
endif
if ENABLE_PLUGINS
@@ -42,30 +42,17 @@ EXTRA_DIST = \
telepathy-gabble-xmpp-console
endif
-AM_LDFLAGS = -avoid-version -shared -no-undefined
+AM_LDFLAGS = -module -avoid-version -shared
-if WINDOWS
-ALL_PLUGIN_LIBS = \
- @WOCKY_LIBS@ \
- @GLIB_LIBS@ \
- @TP_GLIB_LIBS@ \
- $(top_builddir)/extensions/libgabble-extensions.la \
- $(top_builddir)/src/libgabble-plugins.la
-
-libtest_la_LIBADD = $(ALL_PLUGIN_LIBS)
-libgateways_la_LIBADD = $(ALL_PLUGIN_LIBS)
-libconsole_la_LIBADD = $(ALL_PLUGIN_LIBS)
-endif
-
-libtest_la_SOURCES = \
+test_la_SOURCES = \
test.c \
test.h
-libgateways_la_SOURCES = \
+gateways_la_SOURCES = \
gateways.c \
gateways.h
-libconsole_la_SOURCES = \
+console_la_SOURCES = \
console.c \
console.h
diff --git a/plugins/console.c b/plugins/console.c
index 7e980dbf8..8d6795c9d 100644
--- a/plugins/console.c
+++ b/plugins/console.c
@@ -80,7 +80,7 @@ static void
gabble_console_plugin_create_sidecar_async (
GabblePlugin *plugin,
const gchar *sidecar_interface,
- GabblePluginConnection *connection,
+ GabbleConnection *connection,
WockySession *session,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -315,7 +315,7 @@ gabble_console_sidecar_class_init (GabbleConsoleSidecarClass *klass)
g_object_class_install_property (object_class, PROP_CONNECTION,
g_param_spec_object ("connection", "Connection",
"Gabble connection",
- GABBLE_TYPE_PLUGIN_CONNECTION,
+ GABBLE_TYPE_CONNECTION,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_SESSION,
diff --git a/plugins/gateways.c b/plugins/gateways.c
index 139c28de6..1e7b141a2 100644
--- a/plugins/gateways.c
+++ b/plugins/gateways.c
@@ -78,7 +78,7 @@ static void
gabble_gateway_plugin_create_sidecar_async (
GabblePlugin *plugin,
const gchar *sidecar_interface,
- GabblePluginConnection *connection,
+ GabbleConnection *connection,
WockySession *session,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -353,7 +353,7 @@ gabble_gateway_sidecar_class_init (GabbleGatewaySidecarClass *klass)
g_object_class_install_property (object_class, PROP_CONNECTION,
g_param_spec_object ("connection", "Connection",
"Gabble connection",
- GABBLE_TYPE_PLUGIN_CONNECTION,
+ GABBLE_TYPE_CONNECTION,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_SESSION,
diff --git a/plugins/test.c b/plugins/test.c
index 691b84969..43b18ea3b 100644
--- a/plugins/test.c
+++ b/plugins/test.c
@@ -83,7 +83,7 @@ static void
test_plugin_create_sidecar_async (
GabblePlugin *plugin,
const gchar *sidecar_interface,
- GabblePluginConnection *plugin_connection,
+ GabbleConnection *connection,
WockySession *session,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -106,7 +106,7 @@ test_plugin_create_sidecar_async (
{
g_async_initable_new_async (TEST_TYPE_SIDECAR_IQ, G_PRIORITY_DEFAULT,
NULL, sidecar_iq_created_cb, result, "session", session,
- "plugin-connection", plugin_connection, NULL);
+ "connection", connection, NULL);
return;
}
else
@@ -149,16 +149,15 @@ test_plugin_create_sidecar_finish (
static GPtrArray *
test_plugin_create_channel_managers (GabblePlugin *plugin,
- GabblePluginConnection *plugin_connection,
TpBaseConnection *connection)
{
GPtrArray *ret = g_ptr_array_new ();
- DEBUG ("plugin %p on connection %p", plugin, plugin_connection);
+ DEBUG ("plugin %p on connection %p", plugin, connection);
g_ptr_array_add (ret,
g_object_new (TEST_TYPE_CHANNEL_MANAGER,
- "plugin-connection", plugin_connection,
+ "connection", connection,
NULL));
return ret;
@@ -361,7 +360,7 @@ test_sidecar_iq_set_property (
g_ptr_array_add (identities, identity);
/* set own caps so we proper reply to disco#info */
- hash = gabble_plugin_connection_add_sidecar_own_caps (self->connection,
+ hash = gabble_connection_add_sidecar_own_caps (self->connection,
features, identities);
g_free (hash);
@@ -400,9 +399,9 @@ test_sidecar_iq_class_init (TestSidecarIQClass *klass)
WOCKY_TYPE_SESSION,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_CONNECTION,
- g_param_spec_object ("plugin-connection", "Gabble Plugin Connection",
- "Gabble Plugin Connection",
- GABBLE_TYPE_PLUGIN_CONNECTION,
+ g_param_spec_object ("connection", "Gabble Connection",
+ "Gabble connection",
+ GABBLE_TYPE_CONNECTION,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
@@ -540,7 +539,7 @@ test_channel_manager_set_property (
/* Not reffing this: the connection owns all channel managers, so it
* must outlive us. Taking a reference leads to a cycle.
*/
- self->plugin_connection = g_value_get_object (value);
+ self->connection = g_value_get_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -559,7 +558,7 @@ test_channel_manager_get_property (
switch (property_id)
{
case PROP_CONNECTION:
- g_value_set_object (value, self->plugin_connection);
+ g_value_set_object (value, self->connection);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -584,8 +583,7 @@ test_channel_manager_constructed (GObject *object)
if (G_OBJECT_CLASS (test_channel_manager_parent_class)->constructed != NULL)
G_OBJECT_CLASS (test_channel_manager_parent_class)->constructed (object);
- tp_g_signal_connect_object (self->plugin_connection,
- "porter-available",
+ tp_g_signal_connect_object (self->connection, "porter-available",
G_CALLBACK (test_channel_manager_porter_available_cb),
self, 0);
}
@@ -600,9 +598,9 @@ test_channel_manager_class_init (TestChannelManagerClass *klass)
oclass->constructed = test_channel_manager_constructed;
g_object_class_install_property (oclass, PROP_CONNECTION,
- g_param_spec_object ("plugin-connection", "Gabble Plugin Connection",
- "Gabble Plugin Connection",
- GABBLE_TYPE_PLUGIN_CONNECTION,
+ g_param_spec_object ("connection", "Gabble Connection",
+ "Gabble connection",
+ GABBLE_TYPE_CONNECTION,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
diff --git a/plugins/test.h b/plugins/test.h
index cfd441f55..6fe0d1434 100644
--- a/plugins/test.h
+++ b/plugins/test.h
@@ -3,7 +3,6 @@
#include <gio/gio.h>
#include <wocky/wocky-session.h>
#include <gabble/gabble.h>
-#include <gabble/plugin-connection.h>
/* Plugin */
typedef struct _TestPluginClass TestPluginClass;
@@ -105,7 +104,7 @@ struct _TestSidecarIQ {
GObject parent;
GSimpleAsyncResult *result;
WockySession *session;
- GabblePluginConnection *connection;
+ GabbleConnection *connection;
};
GType test_sidecar_iq_get_type (void);
@@ -135,7 +134,7 @@ struct _TestChannelManagerClass {
struct _TestChannelManager {
GObject parent;
- GabblePluginConnection *plugin_connection;
+ GabbleConnection *connection;
};
GType test_channel_manager_get_type (void);