devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-05-04 00:43:36 +01:00
parent 0f3bece9e2 c3d2a7e937
commit bab4da039a
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ui/core.c
View File

@@ -389,23 +389,6 @@ void
ui_incoming_msg(const char * const barejid, const char * const resource, const char * const message, GTimeVal *tv_stamp)
{
gboolean win_created = FALSE;
GString *user = g_string_new("");
PContact contact = roster_get_contact(barejid);
if (contact != NULL) {
if (p_contact_name(contact) != NULL) {
g_string_append(user, p_contact_name(contact));
} else {
g_string_append(user, barejid);
}
} else {
g_string_append(user, barejid);
}
if (resource && prefs_get_boolean(PREF_RESOURCE_MESSAGE)) {
g_string_append(user, "/");
g_string_append(user, resource);
}
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin == NULL) {
@@ -415,19 +398,20 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
}
ProfWin *window = (ProfWin*) chatwin;
int num = wins_get_num(window);
char *display_name = roster_get_msg_display_name(barejid, resource);
// currently viewing chat window with sender
if (wins_is_current(window)) {
win_print_incoming_message(window, tv_stamp, user->str, message);
win_print_incoming_message(window, tv_stamp, display_name, message);
title_bar_set_typing(FALSE);
status_bar_active(num);
// not currently viewing chat window with sender
} else {
status_bar_new(num);
cons_show_incoming_message(user->str, num);
cons_show_incoming_message(display_name, num);
if (prefs_get_boolean(PREF_FLASH)) {
flash();
@@ -446,7 +430,7 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
}
}
win_print_incoming_message(window, tv_stamp, user->str, message);
win_print_incoming_message(window, tv_stamp, display_name, message);
}
int ui_index = num;
@@ -462,14 +446,14 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
gboolean is_current = wins_is_current(window);
if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT)) ) {
if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_TEXT)) {
notify_message(user->str, ui_index, message);
notify_message(display_name, ui_index, message);
} else {
notify_message(user->str, ui_index, NULL);
notify_message(display_name, ui_index, NULL);
}
}
}
g_string_free(user, TRUE);
free(display_name);
}
void