aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-utils.h
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-08-24 21:24:38 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2010-08-24 21:24:38 +0800
commit3bd33b4812d0b909a8a44b12791fcac75fcf365d (patch)
tree6c92c15512f3440f93f064a9cb2740ff781158f2 /libempathy/empathy-utils.h
parent180d83485a0d10d8c45760852d8d588e20a7d3e2 (diff)
parentdc73f3d3e51958edaf3b0508c4205c387e735547 (diff)
downloadgsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar
gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.gz
gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.bz2
gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.lz
gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.xz
gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.zst
gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.zip
Merge branch 'tls-connection'
Diffstat (limited to 'libempathy/empathy-utils.h')
-rw-r--r--libempathy/empathy-utils.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 47b9b84ad..f588479b4 100644
--- 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);