Add an usre_requested param to _account_get_error()

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 4ab367b4292fc61964f388203e580817f524ebc5..579870f806782769de86b4a491a0d29630894535 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -396,13 +396,24 @@ empathy_dbus_error_name_get_default_message  (const gchar *error)
 }
 
 const gchar *
-empathy_account_get_error_message (TpAccount *account)
+empathy_account_get_error_message (TpAccount *account,
+    gboolean *user_requested)
 {
        const gchar *dbus_error;
        const gchar *message;
+        const GHashTable *details = NULL;
        TpConnectionStatusReason reason;
 
-       dbus_error = tp_account_get_detailed_error (account, NULL);
+       dbus_error = tp_account_get_detailed_error (account, &details);
+
+        if (user_requested != NULL)
+          {
+            if (tp_asv_get_boolean (details, "user-requested", NULL))
+              *user_requested = TRUE;
+            else
+              *user_requested = FALSE;
+          }
+
        message = empathy_dbus_error_name_get_default_message (dbus_error);
        if (message != NULL)
                return message;

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 47b9b84ad27825eeb1e36708493bfb805f63c4df..f588479b4d1d6b999e06dc7882997ac46ab99454 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -76,7 +76,8 @@ gboolean     empathy_check_available_state          (void);
 gint        empathy_uint_compare                    (gconstpointer a,
                                                     gconstpointer b);
 
-const gchar * empathy_account_get_error_message (TpAccount *account);
+const gchar * empathy_account_get_error_message (TpAccount *account,
+                                                 gboolean *user_requested);
 
 gchar *empathy_protocol_icon_name (const gchar *protocol);
 const gchar *empathy_protocol_name_to_display_name (const gchar *proto_name);