Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

[gaim-migrate @ 17501]

Tue, 17 Oct 2006 20:44:05 +0000

author

Etan Reisner <deryni@pidgin.im>

date

Tue, 17 Oct 2006 20:44:05 +0000

changeset 14806

5898b78f849e

parent 14805

d8a4f41f6c6d

child 14807

45797fd1d1dc

[gaim-migrate @ 17501]
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.

--- a/gtk/gtkstatusbox.c	Tue Oct 17 19:21:30 2006 +0000
+++ b/gtk/gtkstatusbox.c	Tue Oct 17 20:44:05 2006 +0000
@@ -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
 	{