[gnome-control-center] user-accounts: Cleanup GVariant usage

[Stefan Walter <stefw src gnome org>]

commit 4e67ecc45651729e2bcff40fac420098cdf41449
Author: Stef Walter <stefw gnome org>
Date:   Wed Aug 8 09:30:35 2012 +0200

    user-accounts: Cleanup GVariant usage
    
     * Don't call g_variant_ref_sink() unnecessarily.
     * Don't call g_variant_new_variant() unnecessarily.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=680892

 panels/user-accounts/um-account-dialog.c |    4 +---
 panels/user-accounts/um-realm-manager.c  |    9 ++-------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
index e405444..fc1e377 100644
--- a/panels/user-accounts/um-account-dialog.c
+++ b/panels/user-accounts/um-account-dialog.c
@@ -427,13 +427,11 @@ enterprise_permit_user_login (UmAccountDialog *self)
         options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
 
         um_realm_kerberos_call_change_login_policy (self->selected_realm, "",
-                                                    add, remove,
-                                                    g_variant_ref_sink (options),
+                                                    add, remove, options,
                                                     self->cancellable,
                                                     on_permit_user_login,
                                                     g_object_ref (self));
 
-        g_variant_unref (options);
         g_free (login);
 }
 
diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
index bf3388b..3b83c71 100644
--- a/panels/user-accounts/um-realm-manager.c
+++ b/panels/user-accounts/um-realm-manager.c
@@ -501,12 +501,10 @@ um_realm_manager_discover (UmRealmManager *self,
         g_simple_async_result_set_op_res_gpointer (res, discover, discover_closure_free);
 
 	options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
-	g_variant_ref_sink (options);
 
         um_realm_provider_call_discover (UM_REALM_PROVIDER (self), input, options, cancellable,
                                          on_provider_discover, g_object_ref (res));
 
-        g_variant_unref (options);
         g_object_unref (res);
 }
 
@@ -620,15 +618,12 @@ realm_join_as_owner (UmRealmKerberos *realm,
                 g_assert_not_reached ();
         }
 
-        creds = g_variant_new ("(ss v)", type, owner, g_variant_new_variant (contents));
+        creds = g_variant_new ("(ssv)", type, owner, contents);
         options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
 
-        um_realm_kerberos_call_enroll (realm, g_variant_ref_sink (creds),
-                                       g_variant_ref_sink (options),
+        um_realm_kerberos_call_enroll (realm, creds, options,
                                        cancellable, on_realm_join_complete, g_object_ref (async));
 
-        g_variant_unref (options);
-        g_variant_unref (creds);
         g_object_unref (async);
 
         return TRUE;