Mercurial > pidgin.yaz
comparison gtk/gtkstatusbox.c @ 14744:ab10f1467acb
[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 | 091b6ce6372e |
comparison
equal
deleted
inserted
replaced
14743:01dcb6d7657d | 14744:ab10f1467acb |
---|---|
687 * dropdown using a loop. Otherwise select from the default list. | 687 * dropdown using a loop. Otherwise select from the default list. |
688 */ | 688 */ |
689 primitive = gaim_savedstatus_get_type(saved_status); | 689 primitive = gaim_savedstatus_get_type(saved_status); |
690 if (!status_box->token_status_account) | 690 if (!status_box->token_status_account) |
691 { | 691 { |
692 index = get_statusbox_index(status_box, saved_status); | 692 if (gaim_savedstatus_is_transient(saved_status)) { |
693 gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), index); | 693 index = get_statusbox_index(status_box, saved_status); |
694 if (index == -1) | 694 gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), |
695 index); | |
696 } else { | |
695 gtk_gaim_status_box_refresh(status_box); | 697 gtk_gaim_status_box_refresh(status_box); |
698 } | |
696 } | 699 } |
697 else | 700 else |
698 { | 701 { |
699 GtkTreeIter iter; | 702 GtkTreeIter iter; |
700 GtkGaimStatusBoxItemType type; | 703 GtkGaimStatusBoxItemType type; |