[Gaim-commits] SF.net SVN: gaim: [17501] trunk/gtk/gtkstatusbox.c

[<de...@us...>]

Revision: 17501
          http://svn.sourceforge.net/gaim/?rev=17501&view=rev
Author:   deryni9
Date:     2006-10-17 13:44:05 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
This should fix the problem that my last commit introduced. Having the base
primitive status of a saved status selected in the dropdown sounded like a
pretty good idea, only it broke actually selecting that primitive once the
saved status was selected. So any saved status based off of the Away primitive
locked you out from being able to choose the Away primitive when that saved
status was selected. So go back to selecting nothing for saved statuses.

Modified Paths:
--------------
    trunk/gtk/gtkstatusbox.c

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-10-17 19:21:30 UTC (rev 17500)
+++ trunk/gtk/gtkstatusbox.c	2006-10-17 20:44:05 UTC (rev 17501)
@@ -689,10 +689,13 @@
 	primitive = gaim_savedstatus_get_type(saved_status);
 	if (!status_box->token_status_account)
 	{
-		index = get_statusbox_index(status_box, saved_status);
-		gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), index);
-		if (index == -1)
+		if (gaim_savedstatus_is_transient(saved_status)) {
+			index = get_statusbox_index(status_box, saved_status);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(status_box),
+			                         index);
+		} else {
 			gtk_gaim_status_box_refresh(status_box);
+		}
 	}
 	else
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.