diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-01-17 17:10:43 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2012-01-17 17:10:43 +0800 |
| commit | 25a44d2984058a38f54ab6bd68027e524342e34b (patch) | |
| tree | a698ac149fa82e1c93f0d1d25c45bc68d1ff9fc7 /libempathy/empathy-utils.c | |
| parent | f17363e49737c2ad6bf304d7ed1dd2ccf8ca2b4c (diff) | |
| parent | 5c615ca9c2ffcff23925c154e36dfeccf416ec30 (diff) | |
| download | gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.tar gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.tar.gz gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.tar.bz2 gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.tar.lz gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.tar.xz gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.tar.zst gsoc2013-empathy-25a44d2984058a38f54ab6bd68027e524342e34b.zip | |
Merge branch 'master' into call1
Diffstat (limited to 'libempathy/empathy-utils.c')
| -rw-r--r-- | libempathy/empathy-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 55e23380c..4b5738b7a 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -393,7 +393,7 @@ empathy_account_get_error_message (TpAccount *account, { const gchar *dbus_error; const gchar *message; - const GHashTable *details = NULL; + const GHashTable *details = NULL; TpConnectionStatusReason reason; dbus_error = tp_account_get_detailed_error (account, &details); @@ -410,11 +410,11 @@ empathy_account_get_error_message (TpAccount *account, if (message != NULL) return message; + tp_account_get_connection_status (account, &reason); + DEBUG ("Don't understand error '%s'; fallback to the status reason (%u)", dbus_error, reason); - tp_account_get_connection_status (account, &reason); - return empathy_status_reason_get_default_message (reason); } |