devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-22 17:56:21 +00:00
Code Issues Packages Projects 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

10
src/event/client_events.c
View File

@@ -55,7 +55,7 @@ jabber_conn_status_t
cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy)
{
cons_show("Connecting as %s", jid);
return jabber_connect_with_details(jid, passwd, altdomain, port, tls_policy);
return session_connect_with_details(jid, passwd, altdomain, port, tls_policy);
}
jabber_conn_status_t
@@ -65,18 +65,18 @@ cl_ev_connect_account(ProfAccount *account)
cons_show("Connecting with account %s as %s", account->name, jid);
free(jid);
return jabber_connect_with_account(account);
return session_connect_with_account(account);
}
void
cl_ev_disconnect(void)
{
const char *jid = jabber_get_fulljid();
const char *jid = session_get_fulljid();
cons_show("%s logged out successfully.", jid);
ui_disconnected();
ui_close_all_wins();
jabber_disconnect();
session_disconnect();
roster_destroy();
muc_invites_clear();
chat_sessions_clear();
@@ -92,7 +92,7 @@ cl_ev_presence_send(const resource_presence_t presence_type, const char *const m
char *signed_status = NULL;
#ifdef HAVE_LIBGPGME
char *account_name = jabber_get_account_name();
char *account_name = session_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) {
signed_status = p_gpg_sign(msg, account->pgp_keyid);

6
src/event/server_events.c
View File

@@ -105,7 +105,7 @@ sv_ev_roster_received(void)
ui_show_roster();
}
char *account_name = jabber_get_account_name();
char *account_name = session_get_account_name();
#ifdef HAVE_LIBGPGME
// check pgp key valid if specified
@@ -148,7 +148,7 @@ sv_ev_roster_received(void)
cl_ev_presence_send(conn_presence, NULL, 0);
}
const char *fulljid = jabber_get_fulljid();
const char *fulljid = session_get_fulljid();
plugins_on_connect(account_name, fulljid);
}
@@ -238,7 +238,7 @@ void
sv_ev_room_message(const char *const room_jid, const char *const nick, const char *const message)
{
if (prefs_get_boolean(PREF_GRLOG)) {
Jid *jid = jid_create(jabber_get_fulljid());
Jid *jid = jid_create(session_get_fulljid());
groupchat_log_chat(jid->barejid, room_jid, nick, message);
jid_destroy(jid);
}