Add session.c

6 files changed, 10 insertions, 10 deletions

diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index f7e5eebb..415d4b57 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -360,7 +360,7 @@ chatwin_get_string(ProfChatWin *chatwin)
 
     GString *res = g_string_new("Chat ");
 
-    jabber_conn_status_t conn_status = jabber_get_connection_status();
+    jabber_conn_status_t conn_status = connection_get_status();
     if (conn_status == JABBER_CONNECTED) {
         PContact contact = roster_get_contact(chatwin->barejid);
         if (contact == NULL) {
diff --git a/src/ui/console.c b/src/ui/console.c
index 9d21f2d7..d697aff2 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -845,7 +845,7 @@ cons_show_account_list(gchar **accounts)
         cons_show("Accounts:");
         int i = 0;
         for (i = 0; i < size; i++) {
-            if ((jabber_get_connection_status() == JABBER_CONNECTED) &&
+            if ((connection_get_status() == JABBER_CONNECTED) &&
                     (g_strcmp0(jabber_get_account_name(), accounts[i]) == 0)) {
                 resource_presence_t presence = accounts_get_last_presence(accounts[i]);
                 theme_item_t presence_colour = theme_main_presence_attrs(string_from_resource_presence(presence));
@@ -961,7 +961,7 @@ cons_show_account(ProfAccount *account)
         account->priority_chat, account->priority_online, account->priority_away,
         account->priority_xa, account->priority_dnd);
 
-    if ((jabber_get_connection_status() == JABBER_CONNECTED) &&
+    if ((connection_get_status() == JABBER_CONNECTED) &&
             (g_strcmp0(jabber_get_account_name(), account->name) == 0)) {
         GList *resources = jabber_get_available_resources();
         GList *ordered_resources = NULL;
diff --git a/src/ui/core.c b/src/ui/core.c
index 4d9b4445..3e3c2b18 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -512,7 +512,7 @@ int
 ui_close_all_wins(void)
 {
     int count = 0;
-    jabber_conn_status_t conn_status = jabber_get_connection_status();
+    jabber_conn_status_t conn_status = connection_get_status();
 
     GList *win_nums = wins_get_nums();
     GList *curr = win_nums;
@@ -539,7 +539,7 @@ int
 ui_close_read_wins(void)
 {
     int count = 0;
-    jabber_conn_status_t conn_status = jabber_get_connection_status();
+    jabber_conn_status_t conn_status = connection_get_status();
 
     GList *win_nums = wins_get_nums();
     GList *curr = win_nums;
@@ -692,7 +692,7 @@ ui_close_win(int index)
 void
 ui_prune_wins(void)
 {
-    jabber_conn_status_t conn_status = jabber_get_connection_status();
+    jabber_conn_status_t conn_status = connection_get_status();
     gboolean pruned = FALSE;
 
     GSList *wins = wins_get_prune_wins();
@@ -1104,7 +1104,7 @@ static void
 _ui_draw_term_title(void)
 {
     char new_win_title[100];
-    jabber_conn_status_t status = jabber_get_connection_status();
+    jabber_conn_status_t status = connection_get_status();
 
     if (status == JABBER_CONNECTED) {
         const char * const jid = jabber_get_fulljid();
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index fcacb4cd..9c1cfc80 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -85,7 +85,7 @@ rosterwin_roster(void)
         return;
     }
 
-    jabber_conn_status_t conn_status = jabber_get_connection_status();
+    jabber_conn_status_t conn_status = connection_get_status();
     if (conn_status != JABBER_CONNECTED) {
         return;
     }
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 2b50dbd7..ea1794d3 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -403,7 +403,7 @@ _show_contact_presence(ProfChatWin *chatwin)
         theme_item_t presence_colour = THEME_TITLE_OFFLINE;
         const char *presence = "offline";
 
-        jabber_conn_status_t conn_status = jabber_get_connection_status();
+        jabber_conn_status_t conn_status = connection_get_status();
         if (conn_status == JABBER_CONNECTED) {
             PContact contact = roster_get_contact(chatwin->barejid);
             if (contact) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 3a96ca08..b9a8c7fd 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -263,7 +263,7 @@ win_get_title(ProfWin *window)
     if (window->type == WIN_CHAT) {
         ProfChatWin *chatwin = (ProfChatWin*) window;
         assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
-        jabber_conn_status_t conn_status = jabber_get_connection_status();
+        jabber_conn_status_t conn_status = connection_get_status();
         if (conn_status == JABBER_CONNECTED) {
             PContact contact = roster_get_contact(chatwin->barejid);
             if (contact) {