diff options
| author | James Booth <boothj5@gmail.com> | 2016-05-06 00:53:03 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-05-06 00:53:03 +0100 |
| commit | 88f423afea539bb7c1faa970d989d3e858d874f6 (patch) | |
| tree | 30ef612e59dc8daaacb83dd6989ec0a8d633a6c2 /src/ui | |
| parent | 3bb1f1241050d227932d5153abf49fdce9939efb (diff) | |
| download | profani-tty-88f423afea539bb7c1faa970d989d3e858d874f6.tar.gz | |
Rename jabber_ functions
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/chatwin.c | 2 | ||||
| -rw-r--r-- | src/ui/console.c | 6 | ||||
| -rw-r--r-- | src/ui/core.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index 415d4b57..cf7fb663 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -388,7 +388,7 @@ static void _chatwin_history(ProfChatWin *chatwin, const char *const contact) { if (!chatwin->history_shown) { - Jid *jid = jid_create(jabber_get_fulljid()); + Jid *jid = jid_create(session_get_fulljid()); GSList *history = chat_log_get_previous(jid->barejid, contact); jid_destroy(jid); GSList *curr = history; diff --git a/src/ui/console.c b/src/ui/console.c index d697aff2..d7db79c7 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -846,7 +846,7 @@ cons_show_account_list(gchar **accounts) int i = 0; for (i = 0; i < size; i++) { if ((connection_get_status() == JABBER_CONNECTED) && - (g_strcmp0(jabber_get_account_name(), accounts[i]) == 0)) { + (g_strcmp0(session_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)); win_vprint(console, '-', 0, NULL, 0, presence_colour, "", "%s", accounts[i]); @@ -962,8 +962,8 @@ cons_show_account(ProfAccount *account) account->priority_xa, account->priority_dnd); if ((connection_get_status() == JABBER_CONNECTED) && - (g_strcmp0(jabber_get_account_name(), account->name) == 0)) { - GList *resources = jabber_get_available_resources(); + (g_strcmp0(session_get_account_name(), account->name) == 0)) { + GList *resources = session_get_available_resources(); GList *ordered_resources = NULL; GList *curr = resources; diff --git a/src/ui/core.c b/src/ui/core.c index 3e3c2b18..df8d252f 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -394,7 +394,7 @@ ui_update_presence(const resource_presence_t resource_presence, { contact_presence_t contact_presence = contact_presence_from_resource_presence(resource_presence); title_bar_set_presence(contact_presence); - gint priority = accounts_get_priority_for_presence_type(jabber_get_account_name(), resource_presence); + gint priority = accounts_get_priority_for_presence_type(session_get_account_name(), resource_presence); if (message) { cons_show("Status set to %s (priority %d), \"%s\".", show, priority, message); } else { @@ -1107,7 +1107,7 @@ _ui_draw_term_title(void) jabber_conn_status_t status = connection_get_status(); if (status == JABBER_CONNECTED) { - const char * const jid = jabber_get_fulljid(); + const char * const jid = session_get_fulljid(); gint unread = wins_get_total_unread(); if (unread != 0) { |