diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/command/command.c | 2 | ||||
-rw-r--r-- | src/contact.c | 12 | ||||
-rw-r--r-- | src/contact.h | 4 | ||||
-rw-r--r-- | src/ui/windows.c | 12 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/command/command.c b/src/command/command.c index eb8f0fe6..71f91e46 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1243,7 +1243,7 @@ _cmd_sub(gchar **args, struct cmd_help_t help) while (contacts != NULL) { PContact contact = (PContact) contacts->data; if (p_contact_pending_out(contact)) { - cons_show(p_contact_jid(contact)); + cons_show(p_contact_barejid(contact)); } contacts = g_slist_next(contacts); } diff --git a/src/contact.c b/src/contact.c index f6f98e9e..ee662386 100644 --- a/src/contact.c +++ b/src/contact.c @@ -30,7 +30,7 @@ #include "common.h" struct p_contact_t { - char *jid; + char *barejid; char *name; char *presence; char *status; @@ -41,13 +41,13 @@ struct p_contact_t { }; PContact -p_contact_new(const char * const jid, const char * const name, +p_contact_new(const char * const barejid, const char * const name, const char * const presence, const char * const status, const char * const subscription, gboolean pending_out, const char * const caps_str) { PContact contact = malloc(sizeof(struct p_contact_t)); - contact->jid = strdup(jid); + contact->barejid = strdup(barejid); if (name != NULL) { contact->name = strdup(name); @@ -84,7 +84,7 @@ p_contact_new(const char * const jid, const char * const name, void p_contact_free(PContact contact) { - FREE_SET_NULL(contact->jid); + FREE_SET_NULL(contact->barejid); FREE_SET_NULL(contact->name); FREE_SET_NULL(contact->presence); FREE_SET_NULL(contact->status); @@ -99,9 +99,9 @@ p_contact_free(PContact contact) } const char * -p_contact_jid(const PContact contact) +p_contact_barejid(const PContact contact) { - return contact->jid; + return contact->barejid; } const char * diff --git a/src/contact.h b/src/contact.h index 0e9ec42e..2b5456d7 100644 --- a/src/contact.h +++ b/src/contact.h @@ -25,12 +25,12 @@ typedef struct p_contact_t *PContact; -PContact p_contact_new(const char * const jid, const char * const name, +PContact p_contact_new(const char * const barejid, const char * const name, const char * const presence, const char * const status, const char * const subscription, gboolean pending_out, const char * const caps_str); void p_contact_free(PContact contact); -const char* p_contact_jid(PContact contact); +const char* p_contact_barejid(PContact contact); const char* p_contact_name(PContact contact); const char* p_contact_presence(PContact contact); const char* p_contact_status(PContact contact); diff --git a/src/ui/windows.c b/src/ui/windows.c index 48a72088..448fab63 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -853,11 +853,11 @@ win_show_room_roster(const char * const room, GList *roster, const char * const while (roster != NULL) { PContact member = roster->data; - const char const *name = p_contact_jid(member); + const char const *nick = p_contact_barejid(member); const char const *show = p_contact_presence(member); _presence_colour_on(win, show); - wprintw(win, "%s", name); + wprintw(win, "%s", nick); _presence_colour_off(win, show); if (roster->next != NULL) { @@ -2239,7 +2239,7 @@ _cons_show_incoming_message(const char * const short_from, const int win_index) static void _win_show_contact(ProfWin *window, PContact contact) { - const char *jid = p_contact_jid(contact); + const char *barejid = p_contact_barejid(contact); const char *name = p_contact_name(contact); const char *presence = p_contact_presence(contact); const char *status = p_contact_status(contact); @@ -2247,7 +2247,7 @@ _win_show_contact(ProfWin *window, PContact contact) _win_show_time(window->win, '-'); _presence_colour_on(window->win, presence); - wprintw(window->win, "%s", jid); + wprintw(window->win, "%s", barejid); if (name != NULL) { wprintw(window->win, " (%s)", name); @@ -2417,7 +2417,7 @@ _win_show_history(WINDOW *win, int win_index, const char * const contact) static void _win_show_info(WINDOW *win, PContact pcontact) { - const char *jid = p_contact_jid(pcontact); + const char *barejid = p_contact_barejid(pcontact); const char *name = p_contact_name(pcontact); const char *presence = p_contact_presence(pcontact); const char *status = p_contact_status(pcontact); @@ -2429,7 +2429,7 @@ _win_show_info(WINDOW *win, PContact pcontact) wprintw(win, "\n"); _win_show_time(win, '-'); _presence_colour_on(win, presence); - wprintw(win, "%s", jid); + wprintw(win, "%s", barejid); if (name != NULL) { wprintw(win, " (%s)", name); } |