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

5 files changed, 415 insertions, 0 deletions

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 559bf58055..93934b2bbc 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #495123
+
+	* Makefile.am:
+	Add e-signature-combo-box.[ch].
+
+	* e-account-combo-box.c (account_combo_box_refresh_cb):
+	Make sure the EAccount isn't lost while swapping models.
+
+	* e-signature-combo-box.c:
+	* 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.
+
 2007-11-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #495123
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index c35d7a9f2c..267ded9aab 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -76,6 +76,7 @@ widgetsinclude_HEADERS =			\
 	e-selection-model-array.h		\
 	e-selection-model-simple.h		\
 	e-selection-model.h			\
+	e-signature-combo-box.h			\
 	e-unicode.h				\
 	e-colors.h
 
@@ -122,6 +123,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-selection-model-array.c		\
 	e-selection-model-simple.c		\
 	e-selection-model.c			\
+	e-signature-combo-box.c			\
 	e-unicode.c				\
 	e-colors.c
 
@@ -136,6 +138,7 @@ libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/a11y/libevolution-a11y.la			\
 	$(CAMEL_LIBS)							\
 	$(GNOME_PLATFORM_LIBS)						\
+	$(EVOLUTON_MAIL_LIBS)						\
 	$(ICONV_LIBS)
 
 libefilterbar_la_SOURCES =	\
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 *
diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c
new file mode 100644
index 0000000000..be19755ef6
--- /dev/null
+++ b/widgets/misc/e-signature-combo-box.c
@@ -0,0 +1,338 @@
+#include "e-signature-combo-box.h"
+
+#include <glib/gi18n.h>
+
+#define E_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_SIGNATURE_COMBO_BOX, ESignatureComboBoxPrivate))
+
+enum {
+	COLUMN_STRING,
+	COLUMN_SIGNATURE
+};
+
+enum {
+	REFRESHED,
+	LAST_SIGNAL
+};
+
+struct _ESignatureComboBoxPrivate {
+	ESignatureList *signature_list;
+	GHashTable *index;
+};
+
+static gpointer parent_class;
+static guint signal_ids[LAST_SIGNAL];
+
+static void
+signature_combo_box_refresh_cb (ESignatureList *signature_list,
+                                ESignature *unused,
+                                ESignatureComboBox *combo_box)
+{
+	GtkListStore *store;
+	GtkTreeModel *model;
+	GtkTreeIter tree_iter;
+	EIterator *signature_iter;
+	ESignature *signature;
+	GHashTable *index;
+	GList *list = NULL;
+	GList *iter;
+
+	store = gtk_list_store_new (2, G_TYPE_STRING, E_TYPE_SIGNATURE);
+	model = GTK_TREE_MODEL (store);
+	index = combo_box->priv->index;
+
+	g_hash_table_remove_all (index);
+
+	gtk_list_store_append (store, &tree_iter);
+	gtk_list_store_set (
+		store, &tree_iter,
+		COLUMN_STRING, _("None"),
+		COLUMN_SIGNATURE, NULL, -1);
+
+	if (signature_list == NULL)
+		goto skip;
+
+	/* Build a list of ESignatures to display. */
+	signature_iter = e_list_get_iterator (E_LIST (signature_list));
+	while (e_iterator_is_valid (signature_iter)) {
+
+		/* XXX EIterator misuses const. */
+		signature = (ESignature *) e_iterator_get (signature_iter);
+		list = g_list_prepend (list, signature);
+		e_iterator_next (signature_iter);
+	}
+	g_object_unref (signature_iter);
+
+	list = g_list_reverse (list);
+
+	/* Populate the list store and index. */
+	for (iter = list; iter != NULL; iter = iter->next) {
+		GtkTreeRowReference *reference;
+		GtkTreePath *path;
+		const gchar *string;
+
+		signature = iter->data;
+
+		if (signature->autogen)
+			string = _("Autogenerated");
+		else
+			string = signature->name;
+
+		gtk_list_store_append (store, &tree_iter);
+		gtk_list_store_set (
+			store, &tree_iter,
+			COLUMN_STRING, string,
+			COLUMN_SIGNATURE, signature, -1);
+
+		path = gtk_tree_model_get_path (model, &tree_iter);
+		reference = gtk_tree_row_reference_new (model, path);
+		g_hash_table_insert (index, signature, reference);
+		gtk_tree_path_free (path);
+	}
+
+skip:
+	/* Restore the previously selected signature. */
+	signature = e_signature_combo_box_get_active (combo_box);
+	if (signature != NULL)
+		g_object_ref (signature);
+	gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), model);
+	e_signature_combo_box_set_active (combo_box, signature);
+	if (signature != NULL)
+		g_object_unref (signature);
+
+	g_signal_emit (combo_box, signal_ids[REFRESHED], 0);
+}
+
+static GObject *
+signature_combo_box_constructor (GType type,
+                                 guint n_construct_properties,
+                                 GObjectConstructParam *construct_properties)
+{
+	GObject *object;
+	GtkCellRenderer *renderer;
+
+	/* Chain up to parent's constructor() method. */
+	object = G_OBJECT_CLASS (parent_class)->constructor (
+		type, n_construct_properties, construct_properties);
+
+	renderer = gtk_cell_renderer_text_new ();
+
+	gtk_cell_layout_pack_start (
+		GTK_CELL_LAYOUT (object), renderer, TRUE);
+	gtk_cell_layout_add_attribute (
+		GTK_CELL_LAYOUT (object), renderer, "text", COLUMN_STRING);
+
+	e_signature_combo_box_set_signature_list (
+		E_SIGNATURE_COMBO_BOX (object), NULL);
+
+	return object;
+}
+
+static void
+signature_combo_box_dispose (GObject *object)
+{
+	ESignatureComboBoxPrivate *priv;
+
+	priv = E_SIGNATURE_COMBO_BOX_GET_PRIVATE (object);
+
+	if (priv->signature_list != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			priv->signature_list,
+			signature_combo_box_refresh_cb, object);
+		g_object_unref (priv->signature_list);
+		priv->signature_list = NULL;
+	}
+
+	g_hash_table_remove_all (priv->index);
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+signature_combo_box_finalize (GObject *object)
+{
+	ESignatureComboBoxPrivate *priv;
+
+	priv = E_SIGNATURE_COMBO_BOX_GET_PRIVATE (object);
+
+	g_hash_table_destroy (priv->index);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+signature_combo_box_class_init (ESignatureComboBoxClass *class)
+{
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (ESignatureComboBoxPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructor = signature_combo_box_constructor;
+	object_class->dispose = signature_combo_box_dispose;
+	object_class->finalize = signature_combo_box_finalize;
+
+	signal_ids[REFRESHED] = g_signal_new (
+		"refreshed",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST,
+		0, NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
+}
+
+static void
+signature_combo_box_init (ESignatureComboBox *combo_box)
+{
+	GHashTable *index;
+
+	/* Reverse-lookup index */
+	index = g_hash_table_new_full (
+		g_direct_hash, g_direct_equal,
+		(GDestroyNotify) g_object_unref,
+		(GDestroyNotify) gtk_tree_row_reference_free);
+
+	combo_box->priv = E_SIGNATURE_COMBO_BOX_GET_PRIVATE (combo_box);
+	combo_box->priv->index = index;
+}
+
+GType
+e_signature_combo_box_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (ESignatureComboBoxClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) signature_combo_box_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (ESignatureComboBox),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) signature_combo_box_init,
+			NULL  /* value_table */
+		};
+
+		type = g_type_register_static (
+			GTK_TYPE_COMBO_BOX, "ESignatureComboBox",
+			&type_info, 0);
+	}
+
+	return type;
+}
+
+GtkWidget *
+e_signature_combo_box_new (void)
+{
+	return g_object_new (E_TYPE_SIGNATURE_COMBO_BOX, NULL);
+}
+
+void
+e_signature_combo_box_set_signature_list (ESignatureComboBox *combo_box,
+                                          ESignatureList *signature_list)
+{
+	ESignatureComboBoxPrivate *priv;
+
+	g_return_if_fail (E_IS_SIGNATURE_COMBO_BOX (combo_box));
+
+	if (signature_list != NULL)
+		g_return_if_fail (E_IS_SIGNATURE_LIST (signature_list));
+
+	priv = E_SIGNATURE_COMBO_BOX_GET_PRIVATE (combo_box);
+
+	if (priv->signature_list != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			priv->signature_list,
+			signature_combo_box_refresh_cb, combo_box);
+		g_object_unref (priv->signature_list);
+		priv->signature_list = NULL;
+	}
+
+	if (signature_list != NULL) {
+		priv->signature_list = g_object_ref (signature_list);
+
+		/* Listen for changes to the signature list. */
+		g_signal_connect (
+			priv->signature_list, "signature-added",
+			G_CALLBACK (signature_combo_box_refresh_cb),
+			combo_box);
+		g_signal_connect (
+			priv->signature_list, "signature-changed",
+			G_CALLBACK (signature_combo_box_refresh_cb),
+			combo_box);
+		g_signal_connect (
+			priv->signature_list, "signature-removed",
+			G_CALLBACK (signature_combo_box_refresh_cb),
+			combo_box);
+	}
+
+	signature_combo_box_refresh_cb (signature_list, NULL, combo_box);
+}
+
+ESignature *
+e_signature_combo_box_get_active (ESignatureComboBox *combo_box)
+{
+	ESignature *signature;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	gboolean iter_set;
+
+	g_return_val_if_fail (E_IS_SIGNATURE_COMBO_BOX (combo_box), NULL);
+
+	iter_set = gtk_combo_box_get_active_iter (
+		GTK_COMBO_BOX (combo_box), &iter);
+	if (!iter_set)
+		return NULL;
+
+	model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+	gtk_tree_model_get (model, &iter, COLUMN_SIGNATURE, &signature, -1);
+
+	return signature;
+}
+
+gboolean
+e_signature_combo_box_set_active (ESignatureComboBox *combo_box,
+                                  ESignature *signature)
+{
+	GtkTreeRowReference *reference;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	gboolean iter_set;
+
+	g_return_val_if_fail (E_IS_SIGNATURE_COMBO_BOX (combo_box), FALSE);
+
+	if (signature != NULL)
+		g_return_val_if_fail (E_IS_SIGNATURE (signature), FALSE);
+
+	/* NULL means select "None" (always the first item). */
+	if (signature == NULL) {
+		gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
+		return TRUE;
+	}
+
+	/* Lookup the tree row reference for the signature. */
+	reference = g_hash_table_lookup (combo_box->priv->index, signature);
+	if (reference == NULL)
+		return FALSE;
+
+	/* Convert the reference to a tree iterator. */
+	path = gtk_tree_row_reference_get_path (reference);
+	model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
+	iter_set = gtk_tree_model_get_iter (model, &iter, path);
+	gtk_tree_path_free (path);
+
+	if (!iter_set)
+		return FALSE;
+
+	/* Activate the corresponding combo box item. */
+	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter);
+
+	return TRUE;
+}
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 */