Remove contact lookup when showing OTR privacy

This commit is contained in:
James Booth
2014-11-22 21:26:53 +00:00
parent e8a65e3b68
commit 6772935493

View File

@@ -262,18 +262,8 @@ _show_privacy(void)
{ {
int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET); int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET);
if (current_recipient != NULL) { ProfWin *current = wins_get_current();
char *recipient_jid = NULL; if (current && current->type == WIN_CHAT) {
char *found_contact = roster_contact_autocomplete(current_recipient);
if (found_contact != NULL) {
recipient_jid = roster_barejid_from_name(current_recipient);
free(found_contact);
} else {
recipient_jid = current_recipient;
}
ProfWin *current = wins_get_by_recipient(recipient_jid);
if (current != NULL) {
if (current->type == WIN_CHAT) {
if (!current->is_otr) { if (!current->is_otr) {
if (prefs_get_boolean(PREF_OTR_WARN)) { if (prefs_get_boolean(PREF_OTR_WARN)) {
int unencrypted_attrs = theme_attrs(THEME_TITLE_UNENCRYPTED); int unencrypted_attrs = theme_attrs(THEME_TITLE_UNENCRYPTED);
@@ -328,8 +318,6 @@ _show_privacy(void)
} }
} }
} }
}
}
static void static void
_show_contact_presence(void) _show_contact_presence(void)