Fix bug #526145.

svn path=/trunk/; revision=941

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 34bd398314b51a60e9e1714fed46db132ead9e9f..cdddf2d6c46379d5f0b43b8b4e419fb4005d145e 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1211,6 +1211,13 @@ chat_contacts_completion_func (const gchar *s1,
        gchar *tmp, *nick1, *nick2;
        gint   ret;
 
+       if (s1 == s2) {
+               return 0;
+       }
+       if (!s1 || !s2) {
+               return s1 ? -1 : +1;
+       }
+
        tmp = g_utf8_normalize (s1, -1, G_NORMALIZE_DEFAULT);
        nick1 = g_utf8_casefold (tmp, -1);
        g_free (tmp);