diff options
| author | James Booth <boothj5@gmail.com> | 2013-12-29 15:41:22 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-12-29 15:41:22 +0000 |
| commit | 8840457e1995e593f6582817088ea0ca9bbef9a6 (patch) | |
| tree | 9707d6862402db5e8500280284b011f24220aaee /src | |
| parent | 2defeaefe3f105711e8421d65cc80729fe362d42 (diff) | |
| parent | 7272f42c97f5ecfd453f7c01888adf1a22cd7534 (diff) | |
| download | profani-tty-8840457e1995e593f6582817088ea0ca9bbef9a6.tar.gz | |
Merge remote-tracking branch 'louiecaulfield/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/core.c | 8 | ||||
| -rw-r--r-- | src/xmpp/presence.c | 4 | ||||
| -rw-r--r-- | src/xmpp/roster.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index c5636d3a..c06f025e 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -954,8 +954,8 @@ _ui_outgoing_msg(const char * const from, const char * const to, if (contact != NULL) { if (strcmp(p_contact_presence(contact), "offline") == 0) { - const char const *show = p_contact_presence(contact); - const char const *status = p_contact_status(contact); + const char *show = p_contact_presence(contact); + const char *status = p_contact_status(contact); win_show_status_string(window, to, show, status, NULL, "--", "offline"); } } @@ -1026,8 +1026,8 @@ _ui_room_roster(const char * const room, GList *roster, const char * const prese while (roster != NULL) { PContact member = roster->data; - const char const *nick = p_contact_barejid(member); - const char const *show = p_contact_presence(member); + const char *nick = p_contact_barejid(member); + const char *show = p_contact_presence(member); win_presence_colour_on(window, show); wprintw(window->win, "%s", nick); diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index 5698b520..3ca2f63e 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -261,7 +261,7 @@ _presence_join_room(Jid *jid) log_debug("Sending room join presence to: %s", jid->fulljid); xmpp_ctx_t *ctx = connection_get_ctx(); xmpp_conn_t *conn = connection_get_conn(); - contact_presence_t presence_type = + resource_presence_t presence_type = accounts_get_last_presence(jabber_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); char *status = jabber_get_presence_message(); @@ -289,7 +289,7 @@ _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(); xmpp_conn_t *conn = connection_get_conn(); - contact_presence_t presence_type = + resource_presence_t presence_type = accounts_get_last_presence(jabber_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); char *status = jabber_get_presence_message(); diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 7d4b0efe..e84de155 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -297,7 +297,7 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, item = xmpp_stanza_get_next(item); } - contact_presence_t conn_presence = + resource_presence_t conn_presence = accounts_get_login_presence(jabber_get_account_name()); presence_update(conn_presence, NULL, 0); } |