devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-25 12:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth
2015-05-07 23:16:22 +01:00
parent beeadd6ae3 56cbce2ff3
commit a2281dbccf
7 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/xmpp/presence.c
View File

@@ -196,8 +196,7 @@ presence_reset_sub_request_search(void)
}
void
presence_update(const resource_presence_t presence_type, const char * const msg,
const int idle)
presence_send(const resource_presence_t presence_type, const char * const msg, const int idle)
{
if (jabber_get_connection_status() != JABBER_CONNECTED) {
log_warning("Error setting presence, not connected.");
@@ -205,18 +204,14 @@ presence_update(const resource_presence_t presence_type, const char * const msg,
}
if (msg) {
log_debug("Updating presence: %s, \"%s\"",
string_from_resource_presence(presence_type), msg);
log_debug("Updating presence: %s, \"%s\"", string_from_resource_presence(presence_type), msg);
} else {
log_debug("Updating presence: %s",
string_from_resource_presence(presence_type));
log_debug("Updating presence: %s", string_from_resource_presence(presence_type));
}
xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_conn_t * const conn = connection_get_conn();
const int pri =
accounts_get_priority_for_presence_type(jabber_get_account_name(),
presence_type);
const int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), presence_type);
const char *show = stanza_get_presence_string_from_type(presence_type);
connection_set_presence_message(msg);

2
src/xmpp/roster.c
View File

@@ -331,7 +331,7 @@ _roster_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, v
sv_ev_roster_received();
resource_presence_t conn_presence = accounts_get_login_presence(jabber_get_account_name());
presence_update(conn_presence, NULL, 0);
presence_send(conn_presence, NULL, 0);
return 1;
}

2
src/xmpp/xmpp.h
View File

@@ -168,7 +168,7 @@ char * presence_sub_request_find(const char * const search_str);
void presence_join_room(char *room, char *nick, char * passwd);
void presence_change_room_nick(const char * const room, const char * const nick);
void presence_leave_chat_room(const char * const room_jid);
void presence_update(resource_presence_t status, const char * const msg,
void presence_send(resource_presence_t status, const char * const msg,
int idle);
gboolean presence_sub_request_exists(const char * const bare_jid);