telepathy-salut: Add extensions to symbol-hacks
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Fri Feb 14 14:20:55 CET 2014
Module: telepathy-salut
Branch: master
Commit: 2133096fab8dddb4305ea2673d2de15c78bd638d
URL: http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=2133096fab8dddb4305ea2673d2de15c78bd638d
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Fri Feb 7 14:15:29 2014 +0000
Add extensions to symbol-hacks
Because the test interface is the last thing in the extensions static
library, we have to add it to symbol-hacks.c so that it's visible to
the plugin. This wouldn't work on platforms where plugins can't have
undefined symbols, like Windows - we'd need something more like
Mission Control's mission-control-plugins or Gabble's libgabble-plugins
there - but it'll do for now.
---
src/symbol-hacks.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/symbol-hacks.c b/src/symbol-hacks.c
index 4f0b089..28744ca 100644
--- a/src/symbol-hacks.c
+++ b/src/symbol-hacks.c
@@ -1,11 +1,11 @@
/* This is pretty horrible. If we don't use a symbol in a wocky object
* from its static library then libtool will not include said object
* from the binary, so we can't use any symbols from that object in a
- * plugin.
+ * plugin. The extensions/ static library has the same problem.
*
* This is a hack that X does. They can generate their file though as
* they have an _X_EXPORT macro. This'll all disappear when Wocky
- * becomes a shared library...
+ * becomes a shared library... except for the extensions/ bit.
*
* http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/loader/sdksyms.sh
*/
@@ -16,6 +16,8 @@
/* First include all the public headers. */
#include <wocky/wocky.h>
+#include <extensions/extensions.h>
+
/* Reference one symbol from each of the above headers to include each
* object in the final binary. */
static void *hacks[] = {
@@ -62,6 +64,7 @@ static void *hacks[] = {
wocky_xmpp_error_quark,
wocky_xmpp_reader_get_type,
wocky_xmpp_writer_get_type,
+ salut_svc_salut_plugin_test_get_type,
NULL,
};
More information about the telepathy-commits
mailing list