[Gaim-commits] CVS: gaim/src gtkstatusbox.c,1.99,1.100

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16693

Modified Files:
	gtkstatusbox.c 
Log Message:
Are people complaining that, when selecting a saved status out of
the list of popular statuses, the status box will sometimes show
"Available" or "Away" or "Invisible" or "Offline" instead of
showing the title+message of the saved status?

This fixes that.  My bad!


Index: gtkstatusbox.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -p -r1.99 -r1.100
--- gtkstatusbox.c	2 Feb 2006 19:14:54 -0000	1.99
+++ gtkstatusbox.c	3 Feb 2006 04:26:27 -0000	1.100
@@ -432,7 +432,8 @@ update_to_reflect_current_status(GtkGaim
 	else
 	{
 		GtkTreeIter iter;
-			gpointer data;
+		GtkGaimStatusBoxItemType type;
+		gpointer data;
 
 		/* Unset the active item */
 		gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), -1);
@@ -443,9 +444,11 @@ update_to_reflect_current_status(GtkGaim
 			do
 			{
 				gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter,
+							TYPE_COLUMN, &type,
 							DATA_COLUMN, &data,
 							-1);
-				if (GPOINTER_TO_INT(data) == gaim_savedstatus_get_creation_time(saved_status))
+				if ((type == GTK_GAIM_STATUS_BOX_TYPE_POPULAR) &&
+					(GPOINTER_TO_INT(data) == gaim_savedstatus_get_creation_time(saved_status)))
 				{
 					/* Found! */
 					gtk_combo_box_set_active_iter(GTK_COMBO_BOX(status_box), &iter);
@@ -1194,7 +1197,7 @@ activate_currently_selected_status(GtkGa
 		/* Global */
 		/* Save the newly selected status to prefs.xml and status.xml */
 
-		/* Has the status been really changed? */
+		/* Has the status really been changed? */
 		saved_status = gaim_savedstatus_get_current();
 		if (gaim_savedstatus_get_type(saved_status) == GPOINTER_TO_INT(data))
 		{