aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Show only nick or jid in /wins output

Browse Source
This commit is contained in:
James Booth 2013-08-31 15:07:05 +01:00
parent 4ae817cd82
commit 694e332384
3 changed files with 17 additions and 9 deletions

10
src/contact.c

@ -156,6 +156,16 @@ p_contact_name(const PContact contact)
return contact->name; return contact->name;
} }
const char *
p_contact_name_or_jid(const PContact contact)
{
if (contact->name != NULL) {
return contact->name;
} else {
return contact->barejid;
}
}
static Resource * static Resource *
_highest_presence(Resource *first, Resource *second) _highest_presence(Resource *first, Resource *second)
{ {

1
src/contact.h

@ -35,6 +35,7 @@ gboolean p_contact_remove_resource(PContact contact, const char * const resource
void p_contact_free(PContact contact); void p_contact_free(PContact contact);
const char* p_contact_barejid(PContact contact); const char* p_contact_barejid(PContact contact);
const char* p_contact_name(PContact contact); const char* p_contact_name(PContact contact);
const char * p_contact_name_or_jid(const PContact contact);
const char* p_contact_presence(PContact contact); const char* p_contact_presence(PContact contact);
const char* p_contact_status(PContact contact); const char* p_contact_status(PContact contact);
const char* p_contact_subscription(const PContact contact); const char* p_contact_subscription(const PContact contact);

15
src/ui/windows.c

@ -391,16 +391,13 @@ wins_create_summary(void)
break; break;
case WIN_CHAT: case WIN_CHAT:
chat_string = g_string_new(""); chat_string = g_string_new("");
g_string_printf(chat_string, "%d: Chat %s", ui_index, window->from);
PContact contact = roster_get_contact(window->from);
if (contact != NULL) { PContact contact = roster_get_contact(window->from);
if (p_contact_name(contact) != NULL) { if (contact == NULL) {
GString *chat_name = g_string_new(""); g_string_printf(chat_string, "%d: Chat %s", ui_index, window->from);
g_string_printf(chat_name, " (%s)", p_contact_name(contact)); } else {
g_string_append(chat_string, chat_name->str); const char *display_name = p_contact_name_or_jid(contact);
g_string_free(chat_name, TRUE); g_string_printf(chat_string, "%d: Chat %s", ui_index, display_name);
}
GString *chat_presence = g_string_new(""); GString *chat_presence = g_string_new("");
g_string_printf(chat_presence, " - %s", p_contact_presence(contact)); g_string_printf(chat_presence, " - %s", p_contact_presence(contact));
g_string_append(chat_string, chat_presence->str); g_string_append(chat_string, chat_presence->str);