Mercurial > pidgin.yaz
changeset 32172:4610019d006d
propagate from branch 'im.pidgin.pidgin' (head cc3c0e426393176ef87b207eeed1a17efc8dec7d)
to branch 'im.pidgin.pidgin.next.minor' (head 55e24044dabdcaa882f1745291777d602846e2c1)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 21 Jun 2011 04:40:14 +0000 |
| parents | 298685661f89 (current diff) 8c7d9c75bd2e (diff) |
| children | dc69d22279e5 |
| files | ChangeLog pidgin/gtkconv.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 21 04:35:04 2011 +0000 +++ b/ChangeLog Tue Jun 21 04:40:14 2011 +0000 @@ -8,6 +8,7 @@ version 2.8.1 (MM/DD/YYYY): Pidgin: * Fix Conversation->Add on AIM and MSN. + * Entries in the chat user list are sorted properly again. Finch: * Fixed logging in to ICQ.
--- a/pidgin/gtkconv.c Tue Jun 21 04:35:04 2011 +0000 +++ b/pidgin/gtkconv.c Tue Jun 21 04:40:14 2011 +0000 @@ -4003,12 +4003,12 @@ gboolean is_me = FALSE; gboolean is_buddy; gchar *tmp, *alias_key, *name, *alias; - int flags; + PurpleConvChatBuddyFlags flags; GdkColor *color = NULL; alias = cb->alias; name = cb->name; - flags = GPOINTER_TO_INT(cb->flags); + flags = cb->flags; chat = PURPLE_CONV_CHAT(conv); gtkconv = PIDGIN_CONVERSATION(conv); @@ -4368,6 +4368,12 @@ CHAT_USERS_WEIGHT_COLUMN, &buddy2, -1); + /* Only sort by membership levels */ + f1 &= PURPLE_CBFLAGS_VOICE | PURPLE_CBFLAGS_HALFOP | PURPLE_CBFLAGS_OP | + PURPLE_CBFLAGS_FOUNDER; + f2 &= PURPLE_CBFLAGS_VOICE | PURPLE_CBFLAGS_HALFOP | PURPLE_CBFLAGS_OP | + PURPLE_CBFLAGS_FOUNDER; + if (user1 == NULL || user2 == NULL) { if (!(user1 == NULL && user2 == NULL)) ret = (user1 == NULL) ? -1: 1;