Remove const from GLib containers, since GLib container APIs only deal

with non-const containers

diff --git a/examples/gsso-example.c b/examples/gsso-example.c
index a4670dc615d9969f6e6aef0cc0a4e73a9159eead..072ebf6e242d4397043f05882f9afb87534e2d45 100644 (file)
--- a/examples/gsso-example.c
+++ b/examples/gsso-example.c
@@ -334,14 +334,17 @@ static void get_password(GMainLoop* main_loop, gint identity_id)
 static void append_acl_cb(SignonIdentity *self, SignonIdentityInfo *info, const GError *error, gpointer user_data)
 {
     AclModifyUserData *am_user_data = (AclModifyUserData *)user_data;
+    SignonIdentityInfo *new_info;
 
     if (error) {
         g_warning("%s: %s", G_STRFUNC, error->message);
         goto clean_user_data;
     }
 
-    signon_identity_info_access_control_list_append(info, am_user_data->security_context);
-    signon_identity_store_credentials_with_info(self, info, signon_store_identity_cb, am_user_data->main_loop);
+    new_info = signon_identity_info_copy(info);
+    signon_identity_info_access_control_list_append(new_info, am_user_data->security_context);
+    signon_identity_store_credentials_with_info(self, new_info, signon_store_identity_cb, am_user_data->main_loop);
+    signon_identity_info_free(new_info);
 
 clean_user_data:
     g_free(am_user_data);

diff --git a/libgsignon-glib/signon-auth-session.c b/libgsignon-glib/signon-auth-session.c
index b19edf1974fdb1b25c6493d0089b6b08285a1044..19ad6422b3c0f443ad5c9f18eee162f9d0fc25ab 100644 (file)
--- a/libgsignon-glib/signon-auth-session.c
+++ b/libgsignon-glib/signon-auth-session.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2012 Canonical Ltd.
- * Copyright (C) 2012-2013 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  * Contact: Jussi Laako <jussi.laako@linux.intel.com>
@@ -570,7 +570,7 @@ signon_auth_session_query_available_mechanisms (SignonAuthSession *self,
  */
 void
 signon_auth_session_process (SignonAuthSession *self,
-                             const GHashTable *session_data,
+                             GHashTable *session_data,
                              const gchar* mechanism,
                              SignonAuthSessionProcessCb cb,
                              gpointer user_data)

diff --git a/libgsignon-glib/signon-auth-session.h b/libgsignon-glib/signon-auth-session.h
index 3483bcdab44a1b0d1b36a68f22bd19cac42e4f79..3cbff6111b323a82be2c8ce9c197e616b3195dea 100644 (file)
--- a/libgsignon-glib/signon-auth-session.h
+++ b/libgsignon-glib/signon-auth-session.h
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2012 Canonical Ltd.
- * Copyright (C) 2012-2013 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  * Contact: Jussi Laako <jussi.laako@linux.intel.com>
@@ -177,7 +177,7 @@ typedef void (*SignonAuthSessionProcessCb) (SignonAuthSession *self,
                                             gpointer user_data);
 SIGNON_DEPRECATED_FOR(signon_auth_session_process_async)
 void signon_auth_session_process(SignonAuthSession *self,
-                                const GHashTable *session_data,
+                                GHashTable *session_data,
                                 const gchar *mechanism,
                                 SignonAuthSessionProcessCb cb,
                                 gpointer user_data);

diff --git a/libgsignon-glib/signon-identity-info.c b/libgsignon-glib/signon-identity-info.c
index cdc376b8526dd06b1df324f4ebe847eed0155d2a..0ebaf6ab31b295fcb42c1f8a3dcd0927d23f8663 100644 (file)
--- a/libgsignon-glib/signon-identity-info.c
+++ b/libgsignon-glib/signon-identity-info.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011-2012 Canonical Ltd.
- * Copyright (C) 2012-2013 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  * Contact: Jussi Laako <jussi.laako@linux.intel.com>
@@ -83,7 +83,7 @@ static void identity_methods_copy (gpointer key, gpointer value, gpointer user_d
  * Set authentication methods that are allowed to be used with this identity. 
  */
 void signon_identity_info_set_methods (SignonIdentityInfo *info,
-                                       const GHashTable *methods)
+                                       GHashTable *methods)
 {
     g_return_if_fail (info != NULL);
     g_return_if_fail (methods != NULL);
@@ -96,7 +96,7 @@ void signon_identity_info_set_methods (SignonIdentityInfo *info,
         info->methods = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                g_free, (GDestroyNotify)g_strfreev);
 
-    g_hash_table_foreach ((GHashTable *)methods, identity_methods_copy, info);
+    g_hash_table_foreach (methods, identity_methods_copy, info);
 }
 
 SignonIdentityInfo *
@@ -429,7 +429,7 @@ const gchar *signon_identity_info_get_caption (const SignonIdentityInfo *info)
  * Returns: (transfer none): (element-type utf8 GStrv): the table of allowed
  * methods and mechanisms.
  */
-const GHashTable *signon_identity_info_get_methods (const SignonIdentityInfo *info)
+GHashTable *signon_identity_info_get_methods (const SignonIdentityInfo *info)
 {
     g_return_val_if_fail (info != NULL, NULL);
     return info->methods;
@@ -647,7 +647,7 @@ void signon_identity_info_set_owner_from_values (
  * Set an access control list associated with an identity. 
  */
 void signon_identity_info_set_access_control_list (SignonIdentityInfo *info,
-                           const SignonSecurityContextList *access_control_list)
+                                 SignonSecurityContextList *access_control_list)
 {
     g_return_if_fail (info != NULL);
 

diff --git a/libgsignon-glib/signon-identity-info.h b/libgsignon-glib/signon-identity-info.h
index ce6b8d777b19c48a2799148f1ba54c482fdd76ca..6511899297295c2d1ad298e908bd15a7522434eb 100644 (file)
--- a/libgsignon-glib/signon-identity-info.h
+++ b/libgsignon-glib/signon-identity-info.h
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Canonical Ltd.
- * Copyright (C) 2012-2013 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  * Contact: Jussi Laako <jussi.laako@linux.intel.com>
@@ -69,8 +69,7 @@ const gchar *signon_identity_info_get_username (const SignonIdentityInfo *info);
 gboolean signon_identity_info_get_storing_secret (
                                                 const SignonIdentityInfo *info);
 const gchar *signon_identity_info_get_caption (const SignonIdentityInfo *info);
-const GHashTable *signon_identity_info_get_methods (
-                                                const SignonIdentityInfo *info);
+GHashTable *signon_identity_info_get_methods (const SignonIdentityInfo *info);
 const gchar* const *signon_identity_info_get_realms (
                                                 const SignonIdentityInfo *info);
 const SignonSecurityContext *signon_identity_info_get_owner (
@@ -80,14 +79,15 @@ SignonSecurityContextList *signon_identity_info_get_access_control_list (
 SignonIdentityType signon_identity_info_get_identity_type (
                                                 const SignonIdentityInfo *info);
 
-void signon_identity_info_set_username (SignonIdentityInfo *info, const gchar *username);
+void signon_identity_info_set_username (SignonIdentityInfo *info,
+                                        const gchar *username);
 void signon_identity_info_set_secret (SignonIdentityInfo *info,
                                       const gchar *secret,
                                       gboolean store_secret);
 void signon_identity_info_set_caption (SignonIdentityInfo *info,
                                        const gchar *caption);
 void signon_identity_info_set_methods (SignonIdentityInfo *info,
-                                       const GHashTable *methods);
+                                       GHashTable *methods);
 void signon_identity_info_set_method (SignonIdentityInfo *info,
                                       const gchar *method,
                                       const gchar* const *mechanisms);
@@ -101,7 +101,7 @@ void signon_identity_info_set_owner_from_values (SignonIdentityInfo *info,
                                             const gchar *system_context,
                                             const gchar *application_context);
 void signon_identity_info_set_access_control_list (SignonIdentityInfo *info,
-                        const SignonSecurityContextList *access_control_list);
+                                SignonSecurityContextList *access_control_list);
 void signon_identity_info_access_control_list_append (SignonIdentityInfo *info,
                                     SignonSecurityContext *security_context);
 void signon_identity_info_set_identity_type (SignonIdentityInfo *info,

diff --git a/libgsignon-glib/signon-identity.c b/libgsignon-glib/signon-identity.c
index c2e22240922f1b062a2cbe0feb82d15b2c710c53..730f7718c058ff9aefa964c7bbae59441c1a1208 100644 (file)
--- a/libgsignon-glib/signon-identity.c
+++ b/libgsignon-glib/signon-identity.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2012 Canonical Ltd.
- * Copyright (C) 2012-2013 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  * Contact: Jussi Laako <jussi.laako@linux.intel.com>
@@ -943,11 +943,11 @@ void signon_identity_store_credentials_with_args(SignonIdentity *self,
                                                  const gchar *username,
                                                  const gchar *secret,
                                                  const gboolean store_secret,
-                                                 const GHashTable *methods,
+                                                 GHashTable *methods,
                                                  const gchar *caption,
                                                  const gchar* const *realms,
                                                  const SignonSecurityContext *owner,
-                                                 const SignonSecurityContextList *access_control_list,
+                                                 SignonSecurityContextList *access_control_list,
                                                  SignonIdentityType type,
                                                  SignonIdentityStoreCredentialsCb cb,
                                                  gpointer user_data)

diff --git a/libgsignon-glib/signon-identity.h b/libgsignon-glib/signon-identity.h
index 14a29bf3c363bfd35958f64493f7065871758dcf..2ac8da0503e98e7b00fbf37ee433e8b4b486b17f 100644 (file)
--- a/libgsignon-glib/signon-identity.h
+++ b/libgsignon-glib/signon-identity.h
@@ -4,7 +4,7 @@
  * This file is part of libgsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012-2013 Intel Corporation.
+ * Copyright (C) 2012-2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@nokia.com>
  * Contact: Jussi Laako <jussi.laako@linux.intel.com>
@@ -141,11 +141,11 @@ void signon_identity_store_credentials_with_args(SignonIdentity *self,
                         const gchar *username,
                         const gchar *secret,
                         const gboolean store_secret,
-                        const GHashTable *methods,
+                        GHashTable *methods,
                         const gchar *caption,
                         const gchar* const *realms,
                         const SignonSecurityContext *owner,
-                        const SignonSecurityContextList *access_control_list,
+                        SignonSecurityContextList *access_control_list,
                         SignonIdentityType type,
                         SignonIdentityStoreCredentialsCb cb,
                         gpointer user_data);
@@ -172,7 +172,7 @@ void signon_identity_verify_secret(SignonIdentity *self,
 /**
  * SignonIdentityInfoCb:
  * @self: the #SignonIdentity.
- * @info: the #SignonIdentityInfo for @self.
+ * @info: (transfer none): the #SignonIdentityInfo for @self.
  * @error: a #GError if an error occurred, or %NULL otherwise.
  * @user_data: the user data that was passed when installing this callback.
  *

diff --git a/libgsignon-glib/signon-utils.c b/libgsignon-glib/signon-utils.c
index fff3a4d26ddb56ec1b140810056fb90349407d4f..208243bc3d1c16168236f84cae9324f2fe0b7ffb 100644 (file)
--- a/libgsignon-glib/signon-utils.c
+++ b/libgsignon-glib/signon-utils.c
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  *
@@ -88,7 +89,7 @@ GHashTable *signon_hash_table_from_variant (GVariant *variant)
     return hash_table;
 }
 
-GVariant *signon_hash_table_to_variant (const GHashTable *hash_table)
+GVariant *signon_hash_table_to_variant (GHashTable *hash_table)
 {
     GVariantBuilder builder;
     GHashTableIter iter;
@@ -99,7 +100,7 @@ GVariant *signon_hash_table_to_variant (const GHashTable *hash_table)
 
     g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
 
-    g_hash_table_iter_init (&iter, (GHashTable *)hash_table);
+    g_hash_table_iter_init (&iter, hash_table);
     while (g_hash_table_iter_next (&iter, (gpointer)&key, (gpointer)&value))
     {
         GVariant *val;

diff --git a/libgsignon-glib/signon-utils.h b/libgsignon-glib/signon-utils.h
index 9a81e8ba7e4f07baea92c5b9c71825fa7c519b69..3ac03b0db9864d9f5558e7c2134e3414d54dfb95 100644 (file)
--- a/libgsignon-glib/signon-utils.h
+++ b/libgsignon-glib/signon-utils.h
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2014 Intel Corporation.
  *
  * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
  *
@@ -40,6 +41,6 @@ void signon_gvalue_free (gpointer val);
 G_GNUC_INTERNAL
 GHashTable *signon_hash_table_from_variant (GVariant *variant);
 G_GNUC_INTERNAL
-GVariant *signon_hash_table_to_variant (const GHashTable *hash_table);
+GVariant *signon_hash_table_to_variant (GHashTable *hash_table);
 
 #endif //_SIGNON_UTILS_H_