diff options
Diffstat (limited to 'src/xmpp')
| -rw-r--r-- | src/xmpp/presence.c | 13 | ||||
| -rw-r--r-- | src/xmpp/roster.c | 2 | ||||
| -rw-r--r-- | src/xmpp/xmpp.h | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index 45513ac8..e46730e3 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -193,8 +193,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."); @@ -202,18 +201,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); diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 2f2bc77f..9ee4ec86 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -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; } diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 1dc0c131..398c9f46 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -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); |