From 8266bb685a189d8560450ff161efdd5629849f11 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 2 Dec 2007 01:41:04 +0000 Subject: ** Fixes part of bug #495123 2007-12-01 Matthew Barnes ** Fixes part of bug #495123 * composer/e-msg-composer.c: * composer/e-msg-composer-hdrs.h: * composer/e-msg-composer-hdrs.c: Move signature handling to e-msg-composer-hdrs.c. Use an ESignatureComboBox. * composer/e-composer-from-header.h: * composer/e-composer-from-header.c: Clean up the GtkHBox hack. The signature combo is now packed directly into the GtkTable. * composer/e-composer-name-header.c: * composer/e-composer-text-header.c: Code cleanup. * widgets/misc/Makefile.am: Add e-signature-combo-box.[ch]. * widget/misc/e-account-combo-box.c (account_combo_box_refresh_cb): Make sure the EAccount isn't lost while swapping models. * widget/misc/e-signature-combo-box.c: * widget/misc/e-signature-combo-box.h: New widget renders an ESignatureList as a combo box. Also listens for changes to the ESignatureList and updates itself accordingly. svn path=/trunk/; revision=34620 --- widgets/misc/e-account-combo-box.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'widgets/misc/e-account-combo-box.c') diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index 064ed2bd10..6a96644bfd 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -155,8 +155,12 @@ account_combo_box_refresh_cb (EAccountList *account_list, skip: /* Restore the previously selected account. */ account = e_account_combo_box_get_active (combo_box); + if (account != NULL) + g_object_ref (account); gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), model); e_account_combo_box_set_active (combo_box, account); + if (account != NULL) + g_object_unref (account); } static GObject * -- cgit