** Fixes part of bug #495123

2007-12-01  Matthew Barnes  <mbarnes@redhat.com>

	** 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

1 files changed, 10 insertions, 9 deletions

diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index 4ef761e450..6d3626218f 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -1,5 +1,9 @@
 #include "e-composer-text-header.h"
 
+/* Convenience macro */
+#define E_COMPOSER_TEXT_HEADER_GET_ENTRY(header) \
+	(GTK_ENTRY (E_COMPOSER_HEADER (header)->input_widget))
+
 static gpointer parent_class;
 
 static void
@@ -96,25 +100,22 @@ e_composer_text_header_new_button (const gchar *label)
 const gchar *
 e_composer_text_header_get_text (EComposerTextHeader *header)
 {
-	GtkWidget *input_widget;
+	GtkEntry *entry;
 
 	g_return_val_if_fail (E_IS_COMPOSER_TEXT_HEADER (header), NULL);
 
-	input_widget = E_COMPOSER_HEADER (header)->input_widget;
-	return gtk_entry_get_text (GTK_ENTRY (input_widget));
+	entry = E_COMPOSER_TEXT_HEADER_GET_ENTRY (header);
+	return gtk_entry_get_text (entry);
 }
 
 void
 e_composer_text_header_set_text (EComposerTextHeader *header,
                                  const gchar *text)
 {
-	GtkWidget *input_widget;
+	GtkEntry *entry;
 
 	g_return_if_fail (E_IS_COMPOSER_TEXT_HEADER (header));
 
-	if (text == NULL)
-		text = "";
-
-	input_widget = E_COMPOSER_HEADER (header)->input_widget;
-	gtk_entry_set_text (GTK_ENTRY (input_widget), text);
+	entry = E_COMPOSER_TEXT_HEADER_GET_ENTRY (header);
+	gtk_entry_set_text (entry, (text != NULL) ? text : "");
 }