Merge branch 'sasl'

[empathy.git] / libempathy / empathy-utils.h

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index c6aebb4f28458589c5ae63efa92c735df6a91a7b..3c89962c14c73f36b8085c752033b95dd7f7af60 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -29,8 +29,13 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#include <folks/folks.h>
+#include <folks/folks-telepathy.h>
+#include <telepathy-glib/account-manager.h>
 
 #include "empathy-contact.h"
 
@@ -74,11 +79,34 @@ gboolean     empathy_check_available_state          (void);
 gint        empathy_uint_compare                    (gconstpointer a,
                                                     gconstpointer b);
 
+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);
+const gchar *empathy_service_name_to_display_name (const gchar *proto_name);
 
 #define EMPATHY_ARRAY_TYPE_OBJECT (empathy_type_dbus_ao ())
 GType empathy_type_dbus_ao (void);
 
+TpAccount * empathy_get_account_for_connection (TpConnection *connection);
+
+gboolean empathy_account_manager_get_accounts_connected (gboolean *connecting);
+
+void empathy_connect_new_account (TpAccount *account,
+    TpAccountManager *account_manager);
+
+TpConnectionPresenceType empathy_folks_presence_type_to_tp (FolksPresenceType type);
+gboolean empathy_folks_individual_contains_contact (FolksIndividual *individual);
+EmpathyContact * empathy_contact_dup_from_folks_individual (FolksIndividual *individual);
+TpChannelGroupChangeReason tp_channel_group_change_reason_from_folks_groups_change_reason (FolksGroupableChangeReason reason);
+TpfPersonaStore * empathy_get_persona_store_for_connection (TpConnection *connection);
+gboolean empathy_connection_can_add_personas (TpConnection *connection);
+gboolean empathy_connection_can_alias_personas (TpConnection *connection);
+gboolean empathy_connection_can_group_personas (TpConnection *connection);
+
+gchar * empathy_get_x509_certificate_hostname (gnutls_x509_crt_t cert);
+
 G_END_DECLS
 
 #endif /*  __EMPATHY_UTILS_H__ */