[ekg2-commit] r4208 - trunk/plugins/ncurses: trunk/plugins/ncurses/contacts.c

[SVN commit]

Author: darkjames
Date: 2008-08-07 11:57:54 +0200 (Thu, 07 Aug 2008)
New Revision: 4208

Modified:
   trunk/plugins/ncurses/contacts.c
Log:
fix sorting contacts when display_all set, and some users doesn't have nickname
(because for instance they're at ignore list)


Modified: trunk/plugins/ncurses/contacts.c
===================================================================
--- trunk/plugins/ncurses/contacts.c	2008-08-07 09:53:38 UTC (rev 4207)
+++ trunk/plugins/ncurses/contacts.c	2008-08-07 09:57:54 UTC (rev 4208)
@@ -98,9 +98,6 @@
 {
 	userlist_t *a = data1, *b = data2;
 
-	if (!a || !a->nickname || !b || !b->nickname)
-		return 0;
-
 	return xstrcasecmp(a->nickname, b->nickname);
 }
 
@@ -228,6 +225,9 @@
 			for (lp = s->userlist; lp; lp = lp->next) {
 				userlist_t *u = lp;
 
+				if (!u->nickname)	/* don't add users without nickname.. */
+					continue;
+
 				LIST_ADD_SORTED2(&sorted_all, userlist_dup(u, u->uid, u->nickname, s), comp);
 			}
 
@@ -237,6 +237,9 @@
 		for (l = c ? c->participants : window_current->userlist; l; l = l->next) {
 			userlist_t *u = l;
 
+			if (!u->nickname)	/* don't add users without nickname.. */
+				continue;
+
 			LIST_ADD_SORTED2(&sorted_all, userlist_dup(u, u->uid, u->nickname, w->session), comp);
 		}
 
@@ -287,6 +290,9 @@
 			if (!(u = userlist_find_n(i->s_uid, i->name)))
 				continue;
 
+			if (!m->name)	/* don't add metacontacts without name.. */
+				continue;
+
 			LIST_ADD_SORTED2(&sorted_all, userlist_dup(u, NULL, m->name, (void *) 2), comp);
 		}
 	}