[next] telepathy-glib: logger: log-store-pidgin: g_variant_lookup() can' t look more than one key

Simon McVittie smcv at kemper.freedesktop.org
Wed Sep 17 05:22:53 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 22ce928565f6b6897fb73ed80e597fed890dc189
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=22ce928565f6b6897fb73ed80e597fed890dc189

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri May 30 15:32:30 2014 +0200

logger: log-store-pidgin: g_variant_lookup() can't look more than one key

This regression has been introduced in next when switching to GVariant API.

---

 telepathy-logger/log-store-pidgin.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index 2aff34f..22e82a2 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -500,16 +500,15 @@ log_store_pidgin_dup_account (TplLogStorePidgin *self,
     {
       TpAccount *acc = (TpAccount *) l->data;
       GVariant *params;
-      const gchar *account_param, *server_param;
+      const gchar *account_param = NULL, *server_param = NULL;
 
       if (tp_strdiff (tp_account_get_protocol_name (acc), protocol))
         continue;
 
       params = tp_account_dup_parameters (acc);
 
-      g_variant_lookup (params,
-          "account", "&s", &account_param,
-          "server", "&s", &server_param);
+      g_variant_lookup (params, "account", "&s", &account_param);
+      g_variant_lookup (params, "server", "&s", &server_param);
 
       if (!tp_strdiff (username, account_param))
         {



More information about the telepathy-commits mailing list