1 files changed, 86 insertions, 95 deletions

diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index e893747e..f96a9100 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -129,119 +129,110 @@ typedef struct data_form_t {
     gboolean modified;
 } DataForm;
 
-void jabber_init_module(void);
-void bookmark_init_module(void);
-void capabilities_init_module(void);
-void iq_init_module(void);
-void message_init_module(void);
-void presence_init_module(void);
-void roster_init_module(void);
-void form_init_module(void);
-
 // connection functions
-void (*jabber_init)(const int disable_tls);
-jabber_conn_status_t (*jabber_connect_with_details)(const char * const jid,
+void jabber_init(const int disable_tls);
+jabber_conn_status_t jabber_connect_with_details(const char * const jid,
     const char * const passwd, const char * const altdomain, const int port);
-jabber_conn_status_t (*jabber_connect_with_account)(const ProfAccount * const account);
-void (*jabber_disconnect)(void);
-void (*jabber_shutdown)(void);
-void (*jabber_process_events)(void);
-const char * (*jabber_get_fulljid)(void);
-const char * (*jabber_get_domain)(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);
+jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account);
+void jabber_disconnect(void);
+void jabber_shutdown(void);
+void jabber_process_events(void);
+const char * jabber_get_fulljid(void);
+const char * jabber_get_domain(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);
 
 // message functions
-void (*message_send_chat)(const char * const barejid, const char * const msg);
-void (*message_send_private)(const char * const fulljid, const char * const msg);
-void (*message_send_groupchat)(const char * const roomjid, const char * const msg);
-void (*message_send_groupchat_subject)(const char * const roomjid, const char * const subject);
+void message_send_chat(const char * const barejid, const char * const msg);
+void message_send_private(const char * const fulljid, const char * const msg);
+void message_send_groupchat(const char * const roomjid, const char * const msg);
+void message_send_groupchat_subject(const char * const roomjid, const char * const subject);
 
-void (*message_send_inactive)(const char * const barejid);
-void (*message_send_composing)(const char * const barejid);
-void (*message_send_paused)(const char * const barejid);
-void (*message_send_gone)(const char * const barejid);
+void message_send_inactive(const char * const barejid);
+void message_send_composing(const char * const barejid);
+void message_send_paused(const char * const barejid);
+void message_send_gone(const char * const barejid);
 
-void (*message_send_invite)(const char * const room, const char * const contact,
+void message_send_invite(const char * const room, const char * const contact,
     const char * const reason);
 
 // presence functions
-void (*presence_subscription)(const char * const jid, const jabber_subscr_t action);
-GSList* (*presence_get_subscription_requests)(void);
-gint (*presence_sub_request_count)(void);
-void (*presence_reset_sub_request_search)(void);
-char * (*presence_sub_request_find)(char * search_str);
-void (*presence_join_room)(char *room, char *nick, char * passwd);
-void (*presence_change_room_nick)(const char * const room, const char * const nick);
-void (*presence_leave_chat_room)(const char * const room_jid);
-void (*presence_update)(resource_presence_t status, const char * const msg,
+void presence_subscription(const char * const jid, const jabber_subscr_t action);
+GSList* presence_get_subscription_requests(void);
+gint presence_sub_request_count(void);
+void presence_reset_sub_request_search(void);
+char * presence_sub_request_find(char * search_str);
+void presence_join_room(char *room, char *nick, char * passwd);
+void presence_change_room_nick(const char * const room, const char * const nick);
+void presence_leave_chat_room(const char * const room_jid);
+void presence_update(resource_presence_t status, const char * const msg,
     int idle);
-gboolean (*presence_sub_request_exists)(const char * const bare_jid);
+gboolean presence_sub_request_exists(const char * const bare_jid);
 
 // iq functions
-void (*iq_send_software_version)(const char * const fulljid);
-void (*iq_room_list_request)(gchar *conferencejid);
-void (*iq_disco_info_request)(gchar *jid);
-void (*iq_disco_items_request)(gchar *jid);
-void (*iq_set_autoping)(int seconds);
-void (*iq_confirm_instant_room)(const char * const room_jid);
-void (*iq_destroy_room)(const char * const room_jid);
-void (*iq_request_room_config_form)(const char * const room_jid);
-void (*iq_submit_room_config)(const char * const room, DataForm *form);
-void (*iq_room_config_cancel)(const char * const room_jid);
-void (*iq_send_ping)(const char * const target);
-void (*iq_send_caps_request)(const char * const to, const char * const id,
+void iq_send_software_version(const char * const fulljid);
+void iq_room_list_request(gchar *conferencejid);
+void iq_disco_info_request(gchar *jid);
+void iq_disco_items_request(gchar *jid);
+void iq_set_autoping(int seconds);
+void iq_confirm_instant_room(const char * const room_jid);
+void iq_destroy_room(const char * const room_jid);
+void iq_request_room_config_form(const char * const room_jid);
+void iq_submit_room_config(const char * const room, DataForm *form);
+void iq_room_config_cancel(const char * const room_jid);
+void iq_send_ping(const char * const target);
+void iq_send_caps_request(const char * const to, const char * const id,
     const char * const node, const char * const ver);
-void (*iq_send_caps_request_for_jid)(const char * const to, const char * const id,
+void iq_send_caps_request_for_jid(const char * const to, const char * const id,
     const char * const node, const char * const ver);
-void (*iq_send_caps_request_legacy)(const char * const to, const char * const id,
+void iq_send_caps_request_legacy(const char * const to, const char * const id,
     const char * const node, const char * const ver);
-void (*iq_room_info_request)(gchar *room);
-void (*iq_room_affiliation_list)(const char * const room, char *affiliation);
-void (*iq_room_affiliation_set)(const char * const room, const char * const jid, char *affiliation,
+void iq_room_info_request(gchar *room);
+void iq_room_affiliation_list(const char * const room, char *affiliation);
+void iq_room_affiliation_set(const char * const room, const char * const jid, char *affiliation,
     const char * const reason);
-void (*iq_room_kick_occupant)(const char * const room, const char * const nick, const char * const reason);
-void (*iq_room_role_set)(const char * const room, const char * const nick, char *role,
+void iq_room_kick_occupant(const char * const room, const char * const nick, const char * const reason);
+void iq_room_role_set(const char * const room, const char * const nick, char *role,
     const char * const reason);
-void (*iq_room_role_list)(const char * const room, char *role);
+void iq_room_role_list(const char * const room, char *role);
 
 // caps functions
-Capabilities* (*caps_lookup)(const char * const jid);
-void (*caps_close)(void);
-void (*caps_destroy)(Capabilities *caps);
-
-gboolean (*bookmark_add)(const char *jid, const char *nick, const char *password, const char *autojoin_str);
-gboolean (*bookmark_update)(const char *jid, const char *nick, const char *password, const char *autojoin_str);
-gboolean (*bookmark_remove)(const char *jid);
-gboolean (*bookmark_join)(const char *jid);
-const GList * (*bookmark_get_list)(void);
-char * (*bookmark_find)(char *search_str);
-void (*bookmark_autocomplete_reset)(void);
-
-void (*roster_send_name_change)(const char * const barejid, const char * const new_name, GSList *groups);
-void (*roster_send_add_to_group)(const char * const group, PContact contact);
-void (*roster_send_remove_from_group)(const char * const group, PContact contact);
-void (*roster_send_add_new)(const char * const barejid, const char * const name);
-void (*roster_send_remove)(const char * const barejid);
-
-void (*form_destroy)(DataForm *form);
-char * (*form_get_form_type_field)(DataForm *form);
-void (*form_set_value)(DataForm *form, const char * const tag, char *value);
-gboolean (*form_add_unique_value)(DataForm *form, const char * const tag, char *value);
-void (*form_add_value)(DataForm *form, const char * const tag, char *value);
-gboolean (*form_remove_value)(DataForm *form, const char * const tag, char *value);
-gboolean (*form_remove_text_multi_value)(DataForm *form, const char * const tag, int index);
-gboolean (*form_tag_exists)(DataForm *form, const char * const tag);
-form_field_type_t (*form_get_field_type)(DataForm *form, const char * const tag);
-gboolean (*form_field_contains_option)(DataForm *form, const char * const tag, char *value);
-int (*form_get_value_count)(DataForm *form, const char * const tag);
-FormField* (*form_get_field_by_tag)(DataForm *form, const char * const tag);
-Autocomplete (*form_get_value_ac)(DataForm *form, const char * const tag);
-void (*form_reset_autocompleters)(DataForm *form);
-
-GSList * (*form_get_non_form_type_fields_sorted)(DataForm *form);
-GSList * (*form_get_field_values_sorted)(FormField *field);
+Capabilities* caps_lookup(const char * const jid);
+void caps_close(void);
+void caps_destroy(Capabilities *caps);
+
+gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str);
+gboolean bookmark_update(const char *jid, const char *nick, const char *password, const char *autojoin_str);
+gboolean bookmark_remove(const char *jid);
+gboolean bookmark_join(const char *jid);
+const GList * bookmark_get_list(void);
+char * bookmark_find(char *search_str);
+void bookmark_autocomplete_reset(void);
+
+void roster_send_name_change(const char * const barejid, const char * const new_name, GSList *groups);
+void roster_send_add_to_group(const char * const group, PContact contact);
+void roster_send_remove_from_group(const char * const group, PContact contact);
+void roster_send_add_new(const char * const barejid, const char * const name);
+void roster_send_remove(const char * const barejid);
+
+void form_destroy(DataForm *form);
+char * form_get_form_type_field(DataForm *form);
+void form_set_value(DataForm *form, const char * const tag, char *value);
+gboolean form_add_unique_value(DataForm *form, const char * const tag, char *value);
+void form_add_value(DataForm *form, const char * const tag, char *value);
+gboolean form_remove_value(DataForm *form, const char * const tag, char *value);
+gboolean form_remove_text_multi_value(DataForm *form, const char * const tag, int index);
+gboolean form_tag_exists(DataForm *form, const char * const tag);
+form_field_type_t form_get_field_type(DataForm *form, const char * const tag);
+gboolean form_field_contains_option(DataForm *form, const char * const tag, char *value);
+int form_get_value_count(DataForm *form, const char * const tag);
+FormField* form_get_field_by_tag(DataForm *form, const char * const tag);
+Autocomplete form_get_value_ac(DataForm *form, const char * const tag);
+void form_reset_autocompleters(DataForm *form);
+
+GSList * form_get_non_form_type_fields_sorted(DataForm *form);
+GSList * form_get_field_values_sorted(FormField *field);
 
 #endif