telepathy-gabble: plugin-loader: let get_sidecar_interfaces() return NULL
Simon McVittie
smcv at kemper.freedesktop.org
Mon Oct 14 08:21:20 PDT 2013
Module: telepathy-gabble
Branch: master
Commit: ebc3a9794c4a87092cab0a1e5f2d8c83ddafa5de
URL: http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=ebc3a9794c4a87092cab0a1e5f2d8c83ddafa5de
Author: Will Thompson <will.thompson at collabora.co.uk>
Date: Sat Jun 22 19:02:40 2013 +0100
plugin-loader: let get_sidecar_interfaces() return NULL
---
src/plugin-loader.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/plugin-loader.c b/src/plugin-loader.c
index 2e14c07..3927159 100644
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -89,13 +89,18 @@ plugin_loader_try_to_load (
}
else
{
- gchar *sidecars = g_strjoinv (", ",
- (gchar **) gabble_plugin_get_sidecar_interfaces (plugin));
+ const gchar * const *interfaces = gabble_plugin_get_sidecar_interfaces (plugin);
const gchar *version = gabble_plugin_get_version (plugin);
+ gchar *sidecars;
if (version == NULL)
version = "(unspecified)";
+ if (interfaces != NULL)
+ sidecars = g_strjoinv (", ", (gchar **) interfaces);
+ else
+ sidecars = g_strdup ("none (maybe it implements some channels instead?)");
+
DEBUG ("loaded '%s' version %s (%s), implementing these sidecars: %s",
gabble_plugin_get_name (plugin), version, path, sidecars);
More information about the telepathy-commits
mailing list