Mercurial > pidgin.yaz

changeset 14744:ab10f1467acb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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. committer: Tailor Script <tailor@pidgin.im>
author Etan Reisner <pidgin@unreliablesource.net>
date Tue, 17 Oct 2006 20:44:05 +0000
parents 01dcb6d7657d
children 61416f315d1c
files gtk/gtkstatusbox.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 	{