pidgin.2.9.0: 57325553: *** Plucked rev cc3c0e426393176ef87b207e...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 57325553c219097eacd8d28bf2d6f2df6a4912aa
Parent:   48397becdce48d15cc601daec3e5a0c04d801243
Author:   darkrain42 at pidgin.im
Date:     06/21/11 00:46:11
Branch:   im.pidgin.pidgin.2.9.0
URL: http://d.pidgin.im/viewmtn/revision/info/57325553c219097eacd8d28bf2d6f2df6a4912aa

Changelog: 

*** Plucked rev cc3c0e426393176ef87b207eeed1a17efc8dec7d (darkrain42 at pidgin.im):
*** Plucked rev ab0701cb7b693759b1163133f4bb0681cca85436 (darkrain42 at pidgin.im):
Sort only by op statuses (not typing or away).

Also clean up the flag usage (remove some unused variables).

Changes against parent 48397becdce48d15cc601daec3e5a0c04d801243

  patched  ChangeLog
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- ChangeLog	6587b98d1804311b43006523593d260dc27e2be8
+++ ChangeLog	0491c1c3e48e9253602f5867714f8b4ca45f3971
@@ -3,6 +3,8 @@ version 2.9.0 (06/23/2011):
 version 2.9.0 (06/23/2011):
 	Pidgin:
 	* Fix Conversation->Add on AIM and MSN.
+	* Entries in the chat user list are sorted properly again.  This was
+	  inadvertenly broken in 2.8.0.
 
 	Finch:
 	* Fixed logging in to ICQ.
============================================================
--- pidgin/gtkconv.c	9719278158199c9cfecd5812787d40b35aa338fa
+++ pidgin/gtkconv.c	9883fe02982cc4c5794a082e88efce5db317eca2
@@ -3991,12 +3991,12 @@ add_chat_buddy_common(PurpleConversation
 	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 @@ sort_chat_users(GtkTreeModel *model, Gtk
 	                   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 @@ pidgin_conv_chat_rename_user(PurpleConve
 	PurpleConvChat *chat;
 	PidginConversation *gtkconv;
 	PidginChatPane *gtkchat;
-	PurpleConvChatBuddyFlags flags;
 	PurpleConvChatBuddy *cbuddy;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
@@ -6171,7 +6176,7 @@ pidgin_conv_chat_rename_user(PurpleConve
 	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);