empathy r574 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Jan 17 16:19:08 2008
New Revision: 574
URL: http://svn.gnome.org/viewvc/empathy?rev=574&view=rev

Log:
Fix state order to have offline contacts last. Fixes bug #509906.


Modified:
   trunk/libempathy-gtk/empathy-contact-list-store.c

Modified: trunk/libempathy-gtk/empathy-contact-list-store.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-list-store.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-list-store.c	Thu Jan 17 16:19:08 2008
@@ -1213,6 +1213,28 @@
 	}
 }
 
+static guint
+contact_list_store_ordered_presence (McPresence state)
+{
+	switch (state) {
+	case MC_PRESENCE_UNSET:
+	case MC_PRESENCE_OFFLINE:
+		return 5;
+	case MC_PRESENCE_AVAILABLE:
+		return 0;
+	case MC_PRESENCE_AWAY:
+		return 2;
+	case MC_PRESENCE_EXTENDED_AWAY:
+		return 3;
+	case MC_PRESENCE_HIDDEN:
+		return 4;
+	case MC_PRESENCE_DO_NOT_DISTURB:
+		return 1;
+	default:
+		g_return_val_if_reached (6);
+	}
+}
+
 static gint
 contact_list_store_state_sort_func (GtkTreeModel *model,
 				    GtkTreeIter  *iter_a,
@@ -1224,7 +1246,6 @@
 	gboolean        is_separator_a, is_separator_b;
 	EmpathyContact  *contact_a, *contact_b;
 	EmpathyPresence *presence_a, *presence_b;
-	McPresence      state_a, state_b;
 
 	gtk_tree_model_get (model, iter_a,
 			    EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
@@ -1271,9 +1292,14 @@
 		/* Both offline, sort by name */
 		ret_val = g_utf8_collate (name_a, name_b);
 	} else {
+		guint state_a, state_b;
+
 		state_a = empathy_presence_get_state (presence_a);
 		state_b = empathy_presence_get_state (presence_b);
 
+		state_a = contact_list_store_ordered_presence (state_a);
+		state_b = contact_list_store_ordered_presence (state_b);
+
 		if (state_a < state_b) {
 			ret_val = -1;
 		} else if (state_a > state_b) {