diff options
Diffstat (limited to 'src/xmpp/presence.c')
| -rw-r--r-- | src/xmpp/presence.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index a0deb9f0..377b1b9a 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -251,7 +251,7 @@ presence_send(const resource_presence_t presence_type, const char *const msg, co } xmpp_ctx_t * const ctx = connection_get_ctx(); - const int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), presence_type); + const int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); const char *show = stanza_get_presence_string_from_type(presence_type); connection_set_presence_msg(msg); @@ -290,7 +290,7 @@ presence_send(const resource_presence_t presence_type, const char *const msg, co if (last == NULL) { last = STANZA_TEXT_ONLINE; } - char *account = jabber_get_account_name(); + char *account = session_get_account_name(); accounts_set_last_presence(account, last); accounts_set_last_status(account, msg); free(id); @@ -331,10 +331,10 @@ presence_join_room(const char *const room, const char *const nick, const char *c log_debug("Sending room join presence to: %s", jid->fulljid); xmpp_ctx_t *ctx = connection_get_ctx(); resource_presence_t presence_type = - accounts_get_last_presence(jabber_get_account_name()); + accounts_get_last_presence(session_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); char *status = connection_get_presence_msg(); - int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), + int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); xmpp_stanza_t *presence = stanza_create_room_join_presence(ctx, jid->fulljid, passwd); @@ -358,10 +358,10 @@ presence_change_room_nick(const char *const room, const char *const nick) log_debug("Sending room nickname change to: %s, nick: %s", room, nick); xmpp_ctx_t *ctx = connection_get_ctx(); resource_presence_t presence_type = - accounts_get_last_presence(jabber_get_account_name()); + accounts_get_last_presence(session_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); char *status = connection_get_presence_msg(); - int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), + int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); char *full_room_jid = create_fulljid(room, nick); @@ -538,7 +538,7 @@ _unavailable_handler(xmpp_stanza_t *const stanza) } } else { if (from_jid->resourcepart) { - connection_remove_available_resource(from_jid->resourcepart); + session_remove_available_resource(from_jid->resourcepart); } } @@ -644,7 +644,7 @@ _available_handler(xmpp_stanza_t *const stanza) Resource *resource = stanza_resource_from_presence(xmpp_presence); if (g_strcmp0(xmpp_presence->jid->barejid, my_jid->barejid) == 0) { - connection_add_available_resource(resource); + session_add_available_resource(resource); } else { char *pgpsig = NULL; xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_SIGNED); @@ -721,7 +721,7 @@ _muc_user_handler(xmpp_stanza_t *const stanza) } // handle self presence - if (stanza_is_muc_self_presence(stanza, jabber_get_fulljid())) { + if (stanza_is_muc_self_presence(stanza, session_get_fulljid())) { log_debug("Room self presence received from %s", from_jid->fulljid); // self unavailable |