1 files changed, 27 insertions, 27 deletions

diff --git a/src/server_events.c b/src/server_events.c
index f89385c6..4755f3fa 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -54,8 +54,8 @@
 void
 handle_room_join_error(const char * const room, const char * const err)
 {
-    if (muc_room_is_active(room)) {
-        muc_leave_room(room);
+    if (muc_active(room)) {
+        muc_leave(room);
     }
     ui_handle_room_join_error(room, err);
 }
@@ -109,11 +109,11 @@ handle_login_account_success(char *account_name)
     ui_handle_login_account_success(account);
 
     // attempt to rejoin rooms with passwords
-    GList *curr = muc_get_active_room_list();
+    GList *curr = muc_rooms();
     while (curr != NULL) {
-        char *password = muc_get_room_password(curr->data);
+        char *password = muc_password(curr->data);
         if (password != NULL) {
-            char *nick = muc_get_room_nick(curr->data);
+            char *nick = muc_nick(curr->data);
             presence_join_room(curr->data, nick, password);
         }
         curr = g_list_next(curr);
@@ -129,7 +129,7 @@ handle_lost_connection(void)
 {
     cons_show_error("Lost connection.");
     roster_clear();
-    muc_clear_invites();
+    muc_invites_clear();
     chat_sessions_clear();
     ui_disconnected();
 }
@@ -181,9 +181,9 @@ handle_room_invite(jabber_invite_t invite_type,
     const char * const invitor, const char * const room,
     const char * const reason)
 {
-    if (!muc_room_is_active(room) && !muc_invites_include(room)) {
+    if (!muc_active(room) && !muc_invites_contain(room)) {
         cons_show_room_invite(invitor, room, reason);
-        muc_add_invite(room);
+        muc_invites_add(room);
     }
 }
 
@@ -191,10 +191,10 @@ void
 handle_room_broadcast(const char *const room_jid,
     const char * const message)
 {
-    if (muc_get_roster_received(room_jid)) {
+    if (muc_roster_complete(room_jid)) {
         ui_room_broadcast(room_jid, message);
     } else {
-        muc_add_pending_broadcast(room_jid, message);
+        muc_pending_broadcasts_add(room_jid, message);
     }
 }
 
@@ -202,7 +202,7 @@ void
 handle_room_subject(const char * const room_jid, const char * const subject)
 {
     muc_set_subject(room_jid, subject);
-    if (muc_get_roster_received(room_jid)) {
+    if (muc_roster_complete(room_jid)) {
         ui_room_subject(room_jid, subject);
     }
 }
@@ -449,13 +449,14 @@ handle_contact_online(char *barejid, Resource *resource,
 void
 handle_leave_room(const char * const room)
 {
-    muc_leave_room(room);
+    muc_leave(room);
 }
 
 void
 handle_room_nick_change(const char * const room,
     const char * const nick)
 {
+    muc_nick_change_complete(room, nick);
     ui_room_nick_change(room, nick);
 }
 
@@ -469,7 +470,7 @@ handle_room_requires_config(const char * const room)
 void
 handle_room_destroy(const char * const room)
 {
-    muc_leave_room(room);
+    muc_leave(room);
     ui_room_destroyed(room);
 }
 
@@ -500,22 +501,22 @@ handle_room_config_submit_result_error(const char * const room, const char * con
 void
 handle_room_roster_complete(const char * const room)
 {
-    if (muc_room_is_autojoin(room)) {
+    if (muc_autojoin(room)) {
         ui_room_join(room, FALSE);
     } else {
         ui_room_join(room, TRUE);
     }
-    muc_remove_invite(room);
-    muc_set_roster_received(room);
-    GList *roster = muc_get_roster(room);
+    muc_invites_remove(room);
+    muc_roster_set_complete(room);
+    GList *roster = muc_roster(room);
     ui_room_roster(room, roster, NULL);
 
-    char *subject = muc_get_subject(room);
+    char *subject = muc_subject(room);
     if (subject != NULL) {
         ui_room_subject(room, subject);
     }
 
-    GList *pending_broadcasts = muc_get_pending_broadcasts(room);
+    GList *pending_broadcasts = muc_pending_broadcasts(room);
     if (pending_broadcasts != NULL) {
         GList *curr = pending_broadcasts;
         while (curr != NULL) {
@@ -526,11 +527,10 @@ handle_room_roster_complete(const char * const room)
 }
 
 void
-handle_room_member_presence(const char * const room,
-    const char * const nick, const char * const show,
-    const char * const status)
+handle_room_member_presence(const char * const room, const char * const nick, const char * const role, 
+    const char *  const affiliation, const char * const show, const char * const status)
 {
-    gboolean updated = muc_add_to_roster(room, nick, show, status);
+    gboolean updated = muc_roster_add(room, nick, role, affiliation, show, status);
 
     if (updated) {
         char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
@@ -542,10 +542,10 @@ handle_room_member_presence(const char * const room,
 }
 
 void
-handle_room_member_online(const char * const room, const char * const nick,
-    const char * const show, const char * const status)
+handle_room_member_online(const char * const room, const char * const nick, const char * const role,
+    const char * const affiliation, const char * const show, const char * const status)
 {
-    muc_add_to_roster(room, nick, show, status);
+    muc_roster_add(room, nick, role, affiliation, show, status);
 
     char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
     if (g_strcmp0(muc_status_pref, "none") != 0) {
@@ -558,7 +558,7 @@ void
 handle_room_member_offline(const char * const room, const char * const nick,
     const char * const show, const char * const status)
 {
-    muc_remove_from_roster(room, nick);
+    muc_roster_remove(room, nick);
 
     char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
     if (g_strcmp0(muc_status_pref, "none") != 0) {