devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 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

4
src/plugins/api.c
View File

@@ -381,7 +381,7 @@ api_win_show_themed(const char *tag, const char *const group, const char *const
int
api_send_stanza(const char *const stanza)
{
return jabber_send_stanza(stanza);
return session_send_stanza(stanza);
}
gboolean
@@ -441,7 +441,7 @@ api_disco_add_feature(char *feature)
// resend presence to update server's disco info data for this client
if (connection_get_status() == JABBER_CONNECTED) {
resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name());
resource_presence_t last_presence = accounts_get_last_presence(session_get_account_name());
cl_ev_presence_send(last_presence, connection_get_presence_msg(), 0);
}
}

4
src/plugins/plugins.c
View File

@@ -158,8 +158,8 @@ plugins_load(const char *const name)
if (plugin) {
plugins = g_slist_append(plugins, plugin);
if (connection_get_status() == JABBER_CONNECTED) {
const char *account_name = jabber_get_account_name();
const char *fulljid = jabber_get_fulljid();
const char *account_name = session_get_account_name();
const char *fulljid = session_get_fulljid();
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, account_name, fulljid);
} else {
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL);