** 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, 55 insertions, 0 deletions

diff --git a/widgets/misc/e-signature-combo-box.h b/widgets/misc/e-signature-combo-box.h
new file mode 100644
index 0000000000..31786978ef
--- /dev/null
+++ b/widgets/misc/e-signature-combo-box.h
@@ -0,0 +1,55 @@
+#ifndef E_SIGNATURE_COMBO_BOX_H
+#define E_SIGNATURE_COMBO_BOX_H
+
+#include <gtk/gtk.h>
+#include "e-util/e-signature.h"
+#include "e-util/e-signature-list.h"
+
+/* Standard GObject macros */
+#define E_TYPE_SIGNATURE_COMBO_BOX \
+	(e_signature_combo_box_get_type ())
+#define E_SIGNATURE_COMBO_BOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_SIGNATURE_COMBO_BOX, ESignatureComboBox))
+#define E_SIGNATURE_COMBO_BOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_SIGNATURE_COMBO_BOX, ESignatureComboBoxClass))
+#define E_IS_SIGNATURE_COMBO_BOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_SIGNATURE_COMBO_BOX))
+#define E_IS_SIGNATURE_COMBO_BOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_SIGNATURE_COMBO_BOX))
+#define E_SIGNATURE_COMBO_BOX_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_SIGNATURE_COMBO_BOX, ESignatureComboBoxClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESignatureComboBox ESignatureComboBox;
+typedef struct _ESignatureComboBoxClass ESignatureComboBoxClass;
+typedef struct _ESignatureComboBoxPrivate ESignatureComboBoxPrivate;
+
+struct _ESignatureComboBox {
+	GtkComboBox parent;
+	ESignatureComboBoxPrivate *priv;
+};
+
+struct _ESignatureComboBoxClass {
+	GtkComboBoxClass parent_class;
+};
+
+GType		e_signature_combo_box_get_type	(void);
+GtkWidget *	e_signature_combo_box_new	(void);
+void		e_signature_combo_box_set_signature_list
+					(ESignatureComboBox *combo_box,
+					 ESignatureList *signature_list);
+ESignature *	e_signature_combo_box_get_active
+					(ESignatureComboBox *combo_box);
+gboolean	e_signature_combo_box_set_active
+					(ESignatureComboBox *combo_box,
+					 ESignature *signature);
+
+G_END_DECLS
+
+#endif /* E_SIGNATURE_COMBO_BOX_H */