Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 32134:8c7d9c75bd2e
*** Plucked rev ab0701cb7b693759b1163133f4bb0681cca85436 (darkrain42@pidgin.im):
Sort only by op statuses (not typing or away).
Also clean up the flag usage (remove some unused variables).
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 21 Jun 2011 04:38:32 +0000 |
| parents | 35395b98f6b5 |
| children | e2c6e4fc3c84 5ffd5582f5fe 4610019d006d |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Jun 20 06:07:38 2011 +0000 +++ b/pidgin/gtkconv.c Tue Jun 21 04:38:32 2011 +0000 @@ -3991,12 +3991,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); @@ -4346,6 +4346,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; @@ -6152,7 +6158,6 @@ PurpleConvChat *chat; PidginConversation *gtkconv; PidginChatPane *gtkchat; - PurpleConvChatBuddyFlags flags; PurpleConvChatBuddy *cbuddy; GtkTreeIter iter; GtkTreeModel *model; @@ -6171,7 +6176,7 @@ while (f != 0) { char *val; - gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &val, CHAT_USERS_FLAGS_COLUMN, &flags, -1); + gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &val, -1); if (!purple_utf8_strcasecmp(old_name, val)) { gtk_list_store_remove(GTK_LIST_STORE(model), &iter);