devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Rename jabber_ functions

Browse Source
This commit is contained in:
James Booth
2016-05-06 00:53:03 +01:00
parent 3bb1f12410
commit 88f423afea
33 changed files with 251 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/chatwin.c
View File

@@ -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;

6
src/ui/console.c
View File

@@ -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;

4
src/ui/core.c
View File

@@ -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) {