1 files changed, 18 insertions, 24 deletions

diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index d8478642..65d2cbad 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -57,8 +57,6 @@
 #define XMPP_FEATURE_BLOCKING "urn:xmpp:blocking"
 
 typedef enum {
-    JABBER_UNDEFINED,
-    JABBER_STARTED,
     JABBER_CONNECTING,
     JABBER_CONNECTED,
     JABBER_DISCONNECTING,
@@ -105,31 +103,27 @@ typedef struct disco_identity_t {
     char *category;
 } DiscoIdentity;
 
-typedef struct disco_info_t {
-    char *item;
-    GHashTable *features;
-} DiscoInfo;
-
-void jabber_init(void);
-jabber_conn_status_t jabber_connect_with_details(const char *const jid, const char *const passwd,
+void session_init(void);
+jabber_conn_status_t session_connect_with_details(const char *const jid, const char *const passwd,
     const char *const altdomain, const int port, const char *const tls_policy);
-jabber_conn_status_t jabber_connect_with_account(const ProfAccount *const account);
-void jabber_disconnect(void);
-void jabber_shutdown(void);
-void jabber_process_events(int millis);
-const char* jabber_get_fulljid(void);
-jabber_conn_status_t jabber_get_connection_status(void);
-char* jabber_get_presence_message(void);
-char* jabber_get_account_name(void);
-GList* jabber_get_available_resources(void);
-char* jabber_create_uuid(void);
-void jabber_free_uuid(char *uuid);
+jabber_conn_status_t session_connect_with_account(const ProfAccount *const account);
+void session_disconnect(void);
+void session_shutdown(void);
+void session_process_events(int millis);
+char* session_get_account_name(void);
+
+jabber_conn_status_t connection_get_status(void);
+char *connection_get_presence_msg(void);
+const char* connection_get_fulljid(void);
+char* connection_create_uuid(void);
+void connection_free_uuid(char *uuid);
 #ifdef HAVE_LIBMESODE
-TLSCertificate* jabber_get_tls_peer_cert(void);
+TLSCertificate* connection_get_tls_peer_cert(void);
 #endif
-gboolean jabber_conn_is_secured(void);
-gboolean jabber_send_stanza(const char *const stanza);
-gboolean jabber_service_supports(const char *const feature);
+gboolean connection_is_secured(void);
+gboolean connection_send_stanza(const char *const stanza);
+GList* connection_get_available_resources(void);
+gboolean connection_supports(const char *const feature);
 
 char* message_send_chat(const char *const barejid, const char *const msg, const char *const oob_url);
 char* message_send_chat_otr(const char *const barejid, const char *const msg);