From d969e9589601b45bfaab65ad545d624668517557 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 24 Jan 2014 16:34:21 -0500 Subject: Protocol: implement the "account-path-suffix" connection parameter --- src/protocol.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/protocol.c b/src/protocol.c index d89b8a11b..ce2f59b4a 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -181,6 +181,9 @@ static TpCMParamSpec jabber_params[] = { { "extra-certificate-identities", "as", 0, 0, NULL, 0 /* unused */, NULL, NULL }, + { "account-path-suffix", "s", G_TYPE_STRING, + 0, NULL, 0 /* unused */, NULL, NULL }, + { NULL, NULL, 0, 0, NULL, 0 } }; @@ -277,6 +280,8 @@ new_connection (TpBaseProtocol *protocol, conn = g_object_new (GABBLE_TYPE_CONNECTION, "protocol", PROTOCOL_NAME, "password", tp_asv_get_string (params, "password"), + "account-path-suffix", tp_asv_get_string (params, + "account-path-suffix"), NULL); /* split up account into username, stream-server and resource */ -- cgit v1.2.3 From 6f516f3718e4154c95735f6e5e5f34a1ad20b6e0 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 26 Feb 2014 11:09:47 -0500 Subject: Bump telepathy-glib version to 0.23.2 It is needed for the TpBaseConnection:account-path-suffix property. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 317be2008..2d4f11897 100644 --- a/configure.ac +++ b/configure.ac @@ -280,7 +280,7 @@ AC_DEFINE(TP_SEAL_ENABLE, [], [Prevent to use sealed variables]) AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, [], [Disable single header include]) AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_24], [Ignore post 0.24 deprecations]) AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_24], [Prevent post 0.24 APIs]) -PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.23]) +PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.23.2]) AC_SUBST(TP_GLIB_CFLAGS) AC_SUBST(TP_GLIB_LIBS) -- cgit v1.2.3 From 226f1eae705a3c05715b4213fbff5b05b995af5e Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Sat, 22 Jun 2013 19:16:55 +0100 Subject: plugin-loader: clear GError after g_dir_open fails Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66085 Reviewed-by: Simon McVittie --- src/plugin-loader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugin-loader.c b/src/plugin-loader.c index d308437ee..2e14c0781 100644 --- a/src/plugin-loader.c +++ b/src/plugin-loader.c @@ -108,7 +108,6 @@ plugin_loader_try_to_load ( static void gabble_plugin_loader_probe (GabblePluginLoader *self) { - GError *error = NULL; const gchar *directory_names = g_getenv ("GABBLE_PLUGIN_DIR"); gchar **dir_array; gchar **ptr; @@ -132,13 +131,15 @@ gabble_plugin_loader_probe (GabblePluginLoader *self) for (ptr = dir_array ; *ptr != NULL ; ptr++) { + GError *error = NULL; + DEBUG ("probing %s", *ptr); d = g_dir_open (*ptr, 0, &error); if (d == NULL) { DEBUG ("%s", error->message); - g_error_free (error); + g_clear_error (&error); continue; } -- cgit v1.2.3 From 865a6d69604782326eb5aa3dcc67c744f2b1680c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 19 Mar 2014 14:05:35 +0000 Subject: Update Wocky * data-form: reformat blocks so recent gtk-doc can cope * jingle-content: reset idle ID in its callback --- lib/ext/wocky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ext/wocky b/lib/ext/wocky index 677b984c4..0db9f32fd 160000 --- a/lib/ext/wocky +++ b/lib/ext/wocky @@ -1 +1 @@ -Subproject commit 677b984c434b31483e1348069e1463d963b077e1 +Subproject commit 0db9f32fd023fc728abf1780c26b957102c3292e -- cgit v1.2.3 From e49ac7d47e38f9c0162218cac83d336d53dbfbbf Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 19 Mar 2014 14:28:45 +0000 Subject: Update Wocky - jingle-content: reset idle ID in its callback - data-form: reformat blocks so recent gtk-doc can cope --- lib/ext/wocky | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ext/wocky b/lib/ext/wocky index 779eac498..c59327331 160000 --- a/lib/ext/wocky +++ b/lib/ext/wocky @@ -1 +1 @@ -Subproject commit 779eac498ae44c0e4cb581ae73edfe2d84081673 +Subproject commit c5932733128be4bfb1d5b0ce9be5b136746266dc -- cgit v1.2.3