about summary refs log tree commit diff stats
path: root/src/event
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-01-05 00:06:50 +0000
committerJames Booth <boothj5@gmail.com>2016-01-05 00:06:50 +0000
commit055a5f71ce38c87ea1c97d475fd870ee25148ea9 (patch)
treec8fde96dcdfeea12052cd730d6733545e8e1d35f /src/event
parent8e9bf083895ba7101115594a39dace62a59ab28f (diff)
downloadprofani-tty-055a5f71ce38c87ea1c97d475fd870ee25148ea9.tar.gz
Added roster struct, create and destroy roster on connect/disconnect
Diffstat (limited to 'src/event')
-rw-r--r--src/event/client_events.c2
-rw-r--r--src/event/server_events.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/event/client_events.c b/src/event/client_events.c
index b2efd491..ac4b82ed 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -74,7 +74,7 @@ cl_ev_disconnect(void)
     cons_show("%s logged out successfully.", jid);
 
     jabber_disconnect();
-    roster_clear();
+    roster_destroy();
     muc_invites_clear();
     chat_sessions_clear();
     tlscerts_clear_current();
diff --git a/src/event/server_events.c b/src/event/server_events.c
index db8329b1..ac304fd4 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -64,6 +64,8 @@ sv_ev_login_account_success(char *account_name, int secured)
 {
     ProfAccount *account = accounts_get_account(account_name);
 
+    roster_create();
+
 #ifdef HAVE_LIBOTR
     otr_on_connect(account);
 #endif
@@ -150,7 +152,7 @@ sv_ev_lost_connection(void)
 {
     cons_show_error("Lost connection.");
 
-    roster_clear();
+    roster_destroy();
     muc_invites_clear();
     chat_sessions_clear();
     ui_disconnected();
@@ -168,8 +170,7 @@ sv_ev_failed_login(void)
 }
 
 void
-sv_ev_room_invite(jabber_invite_t invite_type,
-    const char *const invitor, const char *const room,
+sv_ev_room_invite(jabber_invite_t invite_type, const char *const invitor, const char *const room,
     const char *const reason, const char *const password)
 {
     if (!muc_active(room) && !muc_invites_contain(room)) {