Merge lp:~mardy/gnome-control-center-signon/lp1066917 into lp:gnome-control-center-signon

[Alberto Mardegan]

Pack the cookies into a GVariant

Instead of directly passing the cookies GHashTable as a GValue (which the
recent versions of libsignon-glib cannot handle anymore), repack it into a
GVariant and put that into a GValue.
As a nice side-effect, we can now remove the dbus-glib dependency which is no
longer needed.

[David King (amigadave)]

Looks fine.

review: Approve

[David King (amigadave)]

Actually, if this is because of a change is libsignon-glib behaviour, please update the configure check for libsignon-glib to the requisite version.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:112
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/54/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/54/console

review: Approve (continuous-integration)

[lp:~mardy/gnome-control-center-signon/lp1066917]

113. By Alberto Mardegan on 2012-10-17

Depend on the latest libsignon-glib.

[Alberto Mardegan (mardy)]

I updated the needed version in configure.ac.

But now it will be a bit more difficult to test the fix, since libsignon-glib 1.7 has not been released yet.

[David King (amigadave)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-10-11 14:14:38 +0000
+++ configure.ac	2012-10-17 07:37:19 +0000
@@ -42,13 +42,10 @@
 
 # Libraries
 LIBACCOUNTS_GLIB_REQUIRED="libaccounts-glib"
-LIBSIGNON_GLIB_REQUIRED="libsignon-glib"
+LIBSIGNON_GLIB_REQUIRED="libsignon-glib >= 1.7"
 GLIB_REQUIRED="glib-2.0 gio-2.0 gio-unix-2.0 >= 2.29.5"
 GTK_REQUIRED="gtk+-3.0 >= 3.0.0"
 GNOME_CONTROL_CENTER_REQUIRED="libgnome-control-center"
-# Unfortunately we need this in order to store the cookies (D-Bus signature
-# a{ss}) into a GValue
-DBUS_GLIB_REQUIRED="dbus-glib-1"
 
 PKG_CHECK_MODULES([CREDENTIALS_PANEL],
   [$LIBACCOUNTS_GLIB_REQUIRED
@@ -65,8 +62,7 @@
 
 # libaccount-plugin dependencies.
 PKG_CHECK_MODULES([LIBACCOUNT_PLUGIN],
-  [$DBUS_GLIB_REQUIRED
-   $LIBACCOUNTS_GLIB_REQUIRED
+  [$LIBACCOUNTS_GLIB_REQUIRED
    $LIBSIGNON_GLIB_REQUIRED
    $GLIB_REQUIRED
    $GTK_REQUIRED])

=== modified file 'libaccount-plugin/oauth-plugin.c'
--- libaccount-plugin/oauth-plugin.c	2012-09-26 14:28:37 +0000
+++ libaccount-plugin/oauth-plugin.c	2012-10-17 07:37:19 +0000
@@ -32,7 +32,6 @@
 
 #include "oauth-plugin.h"
 
-#include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkx.h>
 #include <libaccounts-glib/ag-manager.h>
@@ -319,6 +318,23 @@
     }
 }
 
+static GVariant *
+cookies_to_variant (GHashTable *cookies)
+{
+    GVariantBuilder builder;
+    GHashTableIter iter;
+    const gchar *key, *value;
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}"));
+    g_hash_table_iter_init (&iter, cookies);
+    while (g_hash_table_iter_next (&iter, (gpointer)&key, (gpointer)&value))
+    {
+        g_variant_builder_add (&builder, "{ss}", key, value);
+    }
+
+    return g_variant_builder_end (&builder);
+}
+
 static void
 start_authentication_process (ApOAuthPlugin *self)
 {
@@ -346,8 +362,8 @@
     if (cookies != NULL &&
         !ap_plugin_get_ignore_cookies ((ApPlugin *)self))
     {
-        g_value_init (&v_cookies, DBUS_TYPE_G_STRING_STRING_HASHTABLE);
-        g_value_set_static_boxed (&v_cookies, cookies);
+        g_value_init (&v_cookies, G_TYPE_VARIANT);
+        g_value_set_variant (&v_cookies, cookies_to_variant (cookies));
         g_hash_table_insert (session_data, "Cookies", &v_cookies);
     }
 
@@ -373,6 +389,7 @@
                                  priv->mechanism,
                                  auth_session_process_cb, self);
     g_hash_table_unref (session_data);
+    g_value_unset (&v_cookies);
 }
 
 static void