headers: remove unnecessary macros from GSignondSignonuiData

diff --git a/include/gsignond/gsignond-signonui-data.h b/include/gsignond/gsignond-signonui-data.h
index 9b4839f..ed56f44 100644 (file)
--- a/include/gsignond/gsignond-signonui-data.h
+++ b/include/gsignond/gsignond-signonui-data.h
@@ -70,16 +70,6 @@ typedef enum {
     SIGNONUI_ERROR_FORGOT_PASSWORD
 } GSignondSignonuiError;
 
-#define gsignond_signonui_data_new() gsignond_dictionary_new()
-
-#define gsignond_signonui_data_new_from_variant(variantmap) gsignond_dictionary_new_from_variant(variantmap)
-
-#define gsignond_signonui_data_to_variant(data) gsignond_dictionary_to_variant (data)
-
-#define gsignond_signonui_data_ref(data) /*gsignond_dictionary_ref*/g_hash_table_ref (data)
-
-#define gsignond_signonui_data_unref(data) /*gsignond_dictionary_unref*/g_hash_table_unref (data);
-
 const gchar*
 gsignond_signonui_data_get_captcha_response (GSignondSignonuiData *data);
 void

diff --git a/src/common/gsignond-dictionary.c b/src/common/gsignond-dictionary.c
index 8db6edb..3280c32 100644 (file)
--- a/src/common/gsignond-dictionary.c
+++ b/src/common/gsignond-dictionary.c
@@ -133,8 +133,9 @@ gsignond_dictionary_new (void)
  * gsignond_dictionary_ref:
  * @dict: instance of #GSignondDictionary
  *
- * Increment the reference count of the dictionary structure.
- * Returns: the passed in #GSignondDictionary
+ * Increments the reference count of the dictionary structure.
+ * 
+ * Returns: the pointer to the passed in #GSignondDictionary
  */
 GSignondDictionary*
 gsignond_dictionary_ref (GSignondDictionary *dict)

diff --git a/src/daemon/gsignond-identity.c b/src/daemon/gsignond-identity.c
index 3ca83fc..cb36fa1 100644 (file)
--- a/src/daemon/gsignond-identity.c
+++ b/src/daemon/gsignond-identity.c
@@ -372,10 +372,10 @@ _on_user_action_completed (GSignondSignonuiData *reply, GError *error, gpointer
               error->message,
               gsignond_identity_info_get_id (priv->info));
         if (cb_data->session) {
-            GSignondSignonuiData *reply = gsignond_signonui_data_new();
+            GSignondSignonuiData *reply = gsignond_dictionary_new();
             gsignond_signonui_data_set_query_error (reply, SIGNONUI_ERROR_GENERAL);
             gsignond_auth_session_user_action_finished (cb_data->session, reply);
-            gsignond_signonui_data_unref(reply);
+            gsignond_dictionary_unref(reply);
         }
         g_error_free (error);
         g_slice_free (GSignondIdentityCbData, cb_data);
@@ -663,7 +663,7 @@ gsignond_identity_request_credentials_update (GSignondIdentity *identity,
         return FALSE;
     }
 
-    ui_data = gsignond_signonui_data_new ();
+    ui_data = gsignond_dictionary_new ();
 
     gsignond_signonui_data_set_query_password (ui_data, TRUE);
     gsignond_signonui_data_set_username (ui_data, gsignond_identity_info_get_username (identity->priv->info));
@@ -673,7 +673,7 @@ gsignond_identity_request_credentials_update (GSignondIdentity *identity,
     gsignond_daemon_show_dialog (GSIGNOND_DAEMON (identity->priv->owner), G_OBJECT(identity),
         ui_data, _on_credentials_updated, NULL, identity);
 
-    gsignond_signonui_data_unref (ui_data);
+    gsignond_dictionary_unref (ui_data);
 
     return TRUE;
 }
@@ -761,7 +761,7 @@ gsignond_identity_verify_user (GSignondIdentity *identity,
         return FALSE;
     }
 
-    ui_data = gsignond_signonui_data_new_from_variant (params);
+    ui_data = gsignond_dictionary_new_from_variant (params);
     gsignond_signonui_data_set_query_password (ui_data, TRUE);
     gsignond_signonui_data_set_username (ui_data, gsignond_identity_info_get_username (identity->priv->info));
     gsignond_signonui_data_set_caption (ui_data, gsignond_identity_info_get_caption (identity->priv->info));
@@ -769,7 +769,7 @@ gsignond_identity_verify_user (GSignondIdentity *identity,
     gsignond_daemon_show_dialog (GSIGNOND_DAEMON (identity->priv->owner), G_OBJECT (identity),
         ui_data, _on_user_verified, NULL, identity);
 
-    gsignond_signonui_data_unref (ui_data);
+    gsignond_dictionary_unref (ui_data);
 
     return TRUE;
 }

diff --git a/src/daemon/gsignond-signonui-proxy.c b/src/daemon/gsignond-signonui-proxy.c
index 21a28de..6002049 100644 (file)
--- a/src/daemon/gsignond-signonui-proxy.c
+++ b/src/daemon/gsignond-signonui-proxy.c
@@ -71,7 +71,7 @@ _ui_query_request_new (GObject *caller,
     _UIQueryRequest *req = g_new0(_UIQueryRequest, 1);
 
     req->caller = caller;
-    req->ui_data = gsignond_signonui_data_ref (ui_data);
+    req->ui_data = gsignond_dictionary_ref (ui_data);
     req->cb = cb;
     req->refresh_cb = refresh_cb;
     req->userdata = userdata;
@@ -105,7 +105,7 @@ static void
 _ui_query_request_free (_UIQueryRequest *req)
 {
     if (!req) return;
-    if (req->ui_data) gsignond_signonui_data_unref (req->ui_data);
+    if (req->ui_data) gsignond_dictionary_unref (req->ui_data);
     g_free (req);
 }
 
@@ -189,7 +189,7 @@ _query_dialog_cb_internal (GSignondSignonuiProxy *proxy, GSignondSignonuiData *u
     }
 
     if (req) _ui_query_request_free (req);
-    if (ui_data) gsignond_signonui_data_unref (ui_data);
+    if (ui_data) gsignond_dictionary_unref (ui_data);
 
     _process_next_request (proxy);
 }
@@ -198,7 +198,7 @@ static void
 _query_dialog_cb (GVariant *reply, GError *error, gpointer user_data)
 {
     GSignondSignonuiProxy *proxy = GSIGNOND_SIGNONUI_PROXY (user_data);
-    GSignondSignonuiData *ui_data = reply ? gsignond_signonui_data_new_from_variant (reply) : NULL;
+    GSignondSignonuiData *ui_data = reply ? gsignond_dictionary_new_from_variant (reply) : NULL;
 
      _query_dialog_cb_internal (proxy, ui_data, error);
 }
@@ -242,7 +242,7 @@ _process_next_request (GSignondSignonuiProxy *proxy)
             g_signal_connect_swapped (proxy->priv->signonui, "refresh",
                     G_CALLBACK(_on_refresh_request), proxy);
         else {
-            GSignondSignonuiData *reply = gsignond_signonui_data_new ();
+            GSignondSignonuiData *reply = gsignond_dictionary_new ();
             gsignond_signonui_data_set_query_error(reply, SIGNONUI_ERROR_NO_SIGNONUI);
             _query_dialog_cb_internal (proxy, reply, NULL);
             return;
@@ -252,10 +252,10 @@ _process_next_request (GSignondSignonuiProxy *proxy)
 
     /* update request id */
     gsignond_signonui_data_set_request_id (req->ui_data, G_OBJECT_TYPE_NAME(req->caller));
-    params =  gsignond_signonui_data_to_variant(req->ui_data) ;
+    params =  gsignond_dictionary_to_variant(req->ui_data) ;
     if (!gsignond_dbus_signonui_adapter_query_dialog (proxy->priv->signonui, 
             params, _query_dialog_cb, proxy)) {
-        GSignondSignonuiData *reply = gsignond_signonui_data_new ();
+        GSignondSignonuiData *reply = gsignond_dictionary_new ();
         gsignond_signonui_data_set_query_error(reply, SIGNONUI_ERROR_GENERAL);
         _query_dialog_cb_internal (proxy, reply, NULL);
         g_variant_unref (params);
@@ -307,7 +307,7 @@ gsignond_signonui_proxy_refresh_dialog (GSignondSignonuiProxy *proxy,
     if (proxy->priv->active_request
         && proxy->priv->active_request->caller == caller) {
         _UIRefreshRequest *req = _ui_refresh_request_new (cb, userdata);
-        GVariant *var_uidata = gsignond_signonui_data_to_variant (ui_data);
+        GVariant *var_uidata = gsignond_dictionary_to_variant (ui_data);
 
         gsignond_signonui_data_set_request_id (ui_data, G_OBJECT_TYPE_NAME(caller));
         if (gsignond_dbus_signonui_adapter_refresh_dialog (proxy->priv->signonui,
@@ -377,11 +377,11 @@ gsignond_signonui_proxy_cancel_request (GSignondSignonuiProxy *proxy,
     g_queue_delete_link (proxy->priv->request_queue, element);
 
     if (req && req->cb) {
-        GSignondSignonuiData *reply = gsignond_signonui_data_new ();
+        GSignondSignonuiData *reply = gsignond_dictionary_new ();
         gsignond_signonui_data_set_query_error(reply, SIGNONUI_ERROR_CANCELED);
 
         req->cb (reply, NULL, req->userdata);
-        gsignond_signonui_data_unref (reply);
+        gsignond_dictionary_unref (reply);
     }
     _ui_query_request_free (req);
 

diff --git a/src/daemon/plugins/gsignond-plugin-remote.c b/src/daemon/plugins/gsignond-plugin-remote.c
index c8c86f7..7d6291a 100644 (file)
--- a/src/daemon/plugins/gsignond-plugin-remote.c
+++ b/src/daemon/plugins/gsignond-plugin-remote.c
@@ -523,7 +523,7 @@ gsignond_plugin_remote_user_action_finished (
             GSIGNOND_IS_PLUGIN_REMOTE (plugin));
     GSignondPluginRemote *self = GSIGNOND_PLUGIN_REMOTE (plugin);
 
-    GVariant *data = gsignond_signonui_data_to_variant (signonui_data);
+    GVariant *data = gsignond_dictionary_to_variant (signonui_data);
     gsignond_dbus_remote_plugin_call_user_action_finished (
             self->priv->dbus_plugin_proxy, data, NULL,
             _user_action_finished_async_cb, self);
@@ -555,7 +555,7 @@ gsignond_plugin_remote_refresh (
             GSIGNOND_IS_PLUGIN_REMOTE (plugin));
     GSignondPluginRemote *self = GSIGNOND_PLUGIN_REMOTE (plugin);
 
-    GVariant *data = gsignond_signonui_data_to_variant (signonui_data);
+    GVariant *data = gsignond_dictionary_to_variant (signonui_data);
     gsignond_dbus_remote_plugin_call_refresh (
             self->priv->dbus_plugin_proxy, data, NULL, _refresh_async_cb, self);
 }
@@ -633,9 +633,9 @@ _user_action_required_cb (
     g_return_if_fail (self && GSIGNOND_IS_PLUGIN_REMOTE (self));
 
     GSignondSignonuiData *data = (GSignondSignonuiData *)
-            gsignond_signonui_data_new_from_variant (ui_data);
+            gsignond_dictionary_new_from_variant (ui_data);
     gsignond_plugin_user_action_required (GSIGNOND_PLUGIN(self), data);
-    gsignond_signonui_data_unref (data);
+    gsignond_dictionary_unref (data);
 }
 
 static void
@@ -647,9 +647,9 @@ _refreshed_cb(
     g_return_if_fail (self && GSIGNOND_IS_PLUGIN_REMOTE (self));
 
     GSignondSignonuiData *data = (GSignondSignonuiData *)
-            gsignond_signonui_data_new_from_variant (ui_data);
+            gsignond_dictionary_new_from_variant (ui_data);
     gsignond_plugin_refreshed (GSIGNOND_PLUGIN(self), data);
-    gsignond_signonui_data_unref (data);
+    gsignond_dictionary_unref (data);
 }
 
 static void

diff --git a/src/daemon/plugins/plugind/gsignond-plugin-daemon.c b/src/daemon/plugins/plugind/gsignond-plugin-daemon.c
index e4a978a..11e6fc7 100644 (file)
--- a/src/daemon/plugins/plugind/gsignond-plugin-daemon.c
+++ b/src/daemon/plugins/plugind/gsignond-plugin-daemon.c
@@ -210,9 +210,9 @@ _handle_user_action_finished_from_dbus (
             self->priv->dbus_remote_plugin, invocation);
 
     GSignondSignonuiData *data = (GSignondSignonuiData *)
-            gsignond_signonui_data_new_from_variant ((GVariant *)ui_data);
+            gsignond_dictionary_new_from_variant ((GVariant *)ui_data);
     gsignond_plugin_user_action_finished (self->priv->plugin, data);
-    gsignond_signonui_data_unref (data);
+    gsignond_dictionary_unref (data);
     return TRUE;
 }
 
@@ -230,9 +230,9 @@ _handle_refresh_from_dbus (
             self->priv->dbus_remote_plugin, invocation);
 
     GSignondSignonuiData *data = (GSignondSignonuiData *)
-            gsignond_signonui_data_new_from_variant ((GVariant *)ui_data);
+            gsignond_dictionary_new_from_variant ((GVariant *)ui_data);
     gsignond_plugin_refresh (self->priv->plugin, data);
-    gsignond_signonui_data_unref (data);
+    gsignond_dictionary_unref (data);
     return TRUE;
 }
 
@@ -325,7 +325,7 @@ _handle_user_action_required_from_plugin (
     DBG ("");
     g_return_if_fail (self && GSIGNOND_IS_PLUGIN_DAEMON (self));
 
-    GVariant *data = gsignond_signonui_data_to_variant (ui_data);
+    GVariant *data = gsignond_dictionary_to_variant (ui_data);
     gsignond_dbus_remote_plugin_emit_user_action_required (
             self->priv->dbus_remote_plugin, data);
 }
@@ -339,7 +339,7 @@ _handle_refreshed_from_plugin(
     DBG ("");
     g_return_if_fail (self && GSIGNOND_IS_PLUGIN_DAEMON (self));
 
-    GVariant *data = gsignond_signonui_data_to_variant (ui_data);
+    GVariant *data = gsignond_dictionary_to_variant (ui_data);
     gsignond_dbus_remote_plugin_emit_refreshed (self->priv->dbus_remote_plugin,
             data);
 }

diff --git a/src/plugins/digest/gsignond-digest-plugin.c b/src/plugins/digest/gsignond-digest-plugin.c
index 0ff6486..bbbb8f4 100644 (file)
--- a/src/plugins/digest/gsignond-digest-plugin.c
+++ b/src/plugins/digest/gsignond-digest-plugin.c
@@ -242,7 +242,7 @@ gsignond_digest_plugin_request_initial (
     gsignond_dictionary_ref (session_data);
     priv->session_data = session_data;
 
-    GSignondSignonuiData *user_action_data = gsignond_signonui_data_new ();
+    GSignondSignonuiData *user_action_data = gsignond_dictionary_new ();
     DATA_SET_VALUE (user_action_data, "Realm", realm);
     DATA_SET_VALUE (user_action_data, "DigestUri", digest_uri);
     gsignond_signonui_data_set_query_username (user_action_data, TRUE);

diff --git a/src/plugins/password/gsignond-password-plugin.c b/src/plugins/password/gsignond-password-plugin.c
index ac4cacb..e354fff 100644 (file)
--- a/src/plugins/password/gsignond-password-plugin.c
+++ b/src/plugins/password/gsignond-password-plugin.c
@@ -67,7 +67,7 @@ static void gsignond_password_plugin_request_initial (
         return;
     }
     
-    GSignondSignonuiData *user_action_data = gsignond_signonui_data_new();
+    GSignondSignonuiData *user_action_data = gsignond_dictionary_new();
     if (!username || !username[0])
         gsignond_signonui_data_set_query_username(user_action_data, TRUE);
     else {

diff --git a/src/plugins/ssotest/gsignond-ssotest-plugin.c b/src/plugins/ssotest/gsignond-ssotest-plugin.c
index 3d1ab29..313a7db 100644 (file)
--- a/src/plugins/ssotest/gsignond-ssotest-plugin.c
+++ b/src/plugins/ssotest/gsignond-ssotest-plugin.c
@@ -122,14 +122,14 @@ static void gsignond_ssotest_plugin_request_initial (
     if (g_strcmp0 (mechanism, "mech2") == 0) {
         const gchar* username =
             gsignond_session_data_get_username (session_data);
-        GSignondSignonuiData *user_action_data = gsignond_signonui_data_new();
+        GSignondSignonuiData *user_action_data = gsignond_dictionary_new();
         if (username == NULL)
             gsignond_signonui_data_set_query_username (user_action_data, TRUE);
         else
             gsignond_signonui_data_set_username (user_action_data, username);
         gsignond_signonui_data_set_query_password (user_action_data, TRUE);
         gsignond_plugin_user_action_required (plugin, user_action_data);
-        gsignond_signonui_data_unref (user_action_data);
+        gsignond_dictionary_unref (user_action_data);
         gsignond_dictionary_unref (response);
         INFO ("mechanism 'mech2' responded'");
         return;

diff --git a/test/plugins/digestplugintest.c b/test/plugins/digestplugintest.c
index c54a4bf..4dfe3c6 100644 (file)
--- a/test/plugins/digestplugintest.c
+++ b/test/plugins/digestplugintest.c
@@ -186,7 +186,7 @@ START_TEST (test_digestplugin_user_action_finished)
             G_CALLBACK(user_action_required_callback), &ui_action);
     g_signal_connect(plugin, "error", G_CALLBACK(error_callback), &error);
 
-    ui_data = gsignond_signonui_data_new();
+    ui_data = gsignond_dictionary_new();
     gsignond_signonui_data_set_query_error(ui_data, SIGNONUI_ERROR_NONE);
 
     //empty data