agent: Adding a parameter to give the error name to browser callback

diff --git a/src/agent.c b/src/agent.c
index 96d40ca..33a11ec 100644 (file)
--- a/src/agent.c
+++ b/src/agent.c
@@ -529,15 +529,18 @@ static void request_browser_reply(DBusPendingCall *call, void *user_data)
        struct request_browser_reply_data *browser_reply_data = user_data;
        DBusMessage *reply = dbus_pending_call_steal_reply(call);
        connman_bool_t result = FALSE;
+       const char *error = NULL;
 
-       if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR)
+       if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+               error = dbus_message_get_error_name(reply);
                goto done;
+       }
 
        result = TRUE;
 
 done:
-       browser_reply_data->callback(browser_reply_data->service,
-                                       result, browser_reply_data->user_data);
+       browser_reply_data->callback(browser_reply_data->service, result,
+                                       error, browser_reply_data->user_data);
        connman_service_unref(browser_reply_data->service);
        dbus_message_unref(reply);
        g_free(browser_reply_data);

diff --git a/src/connman.h b/src/connman.h
index 2e8cfee..0808632 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -94,7 +94,7 @@ typedef void (* authentication_cb_t) (struct connman_service *service,
                                const char *error, void *user_data);
 typedef void (* browser_authentication_cb_t) (struct connman_service *service,
                                connman_bool_t authentication_done,
-                               void *user_data);
+                               const char *error, void *user_data);
 typedef void (* report_error_cb_t) (struct connman_service *service,
                                gboolean retry, void *user_data);
 int __connman_agent_request_passphrase_input(struct connman_service *service,

diff --git a/src/wispr.c b/src/wispr.c
index 96bdeb1..7a99034 100644 (file)
--- a/src/wispr.c
+++ b/src/wispr.c
@@ -615,7 +615,7 @@ static gboolean wispr_manage_message(GWebResult *result,
 
 static void wispr_portal_browser_reply_cb(struct connman_service *service,
                                        connman_bool_t authentication_done,
-                                       void *user_data)
+                                       const char *error, void *user_data)
 {
        struct connman_wispr_portal_context *wp_context = user_data;