changeset 18302:0d948cac4afa

merge of '152574afac3f14348361a22106e5716b24b844e1' and '19cc8441b4e757544938bb9c8b45a76ac78f1653'
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 27 Jun 2007 00:31:22 +0000
parents f8f726b74b5c (current diff) c0e14bceee66 (diff)
children 5c6f019e48f8
files pidgin/gtkconv.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Tue Jun 26 21:17:07 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Jun 27 00:31:22 2007 +0000
@@ -3892,7 +3892,7 @@
 						   CHAT_USERS_ALIAS_COLUMN, &alias,
 						   -1);
 
-				if (strcmp(name, alias))
+				if (name && alias && strcmp(name, alias))
 					tab_complete_process_item(&most_matched, entered, &partial, nick_partial,
 										  &matches, FALSE, alias);
 				g_free(name);