Move signature script execution to e-util/e-signature-utils.s so the

composer can invoke it.  Composer no longer needs mail-config.h.

Split signature preview into a new widget: ESignaturePreview.


svn path=/branches/kill-bonobo/; revision=37272

4 files changed, 470 insertions, 3 deletions

diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index a1d555085b..589bd1083e 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -80,6 +80,7 @@ widgetsinclude_HEADERS =			\
 	e-signature-combo-box.h			\
 	e-signature-editor.h			\
 	e-signature-manager.h			\
+	e-signature-preview.h			\
 	e-signature-script-dialog.h		\
 	e-signature-tree-view.h			\
 	e-unicode.h				\
@@ -131,6 +132,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-signature-combo-box.c			\
 	e-signature-editor.c			\
 	e-signature-manager.c			\
+	e-signature-preview.c			\
 	e-signature-script-dialog.c		\
 	e-signature-tree-view.c			\
 	e-unicode.c				\
diff --git a/widgets/misc/e-signature-preview.c b/widgets/misc/e-signature-preview.c
new file mode 100644
index 0000000000..d618e05daa
--- /dev/null
+++ b/widgets/misc/e-signature-preview.c
@@ -0,0 +1,344 @@
+/*
+ * e-signature-preview.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include "e-signature-preview.h"
+
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <glib/gstdio.h>
+#include "e-util/e-signature-utils.h"
+
+#define E_SIGNATURE_PREVIEW_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_SIGNATURE_PREVIEW, ESignaturePreviewPrivate))
+
+enum {
+	PROP_0,
+	PROP_ALLOW_SCRIPTS,
+	PROP_SIGNATURE
+};
+
+enum {
+	REFRESH,
+	LAST_SIGNAL
+};
+
+struct _ESignaturePreviewPrivate {
+	ESignature *signature;
+	guint allow_scripts : 1;
+};
+
+static gpointer parent_class;
+static guint signals[LAST_SIGNAL];
+
+static void
+signature_preview_set_property (GObject *object,
+                                guint property_id,
+                                const GValue *value,
+                                GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ALLOW_SCRIPTS:
+			e_signature_preview_set_allow_scripts (
+				E_SIGNATURE_PREVIEW (object),
+				g_value_get_boolean (value));
+			return;
+
+		case PROP_SIGNATURE:
+			e_signature_preview_set_signature (
+				E_SIGNATURE_PREVIEW (object),
+				g_value_get_object (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+signature_preview_get_property (GObject *object,
+                                guint property_id,
+                                GValue *value,
+                                GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ALLOW_SCRIPTS:
+			g_value_set_boolean (
+				value, e_signature_preview_get_allow_scripts (
+				E_SIGNATURE_PREVIEW (object)));
+			return;
+
+		case PROP_SIGNATURE:
+			g_value_set_object (
+				value, e_signature_preview_get_signature (
+				E_SIGNATURE_PREVIEW (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+signature_preview_dispose (GObject *object)
+{
+	ESignaturePreviewPrivate *priv;
+
+	priv = E_SIGNATURE_PREVIEW_GET_PRIVATE (object);
+
+	if (priv->signature != NULL) {
+		g_object_unref (priv->signature);
+		priv->signature = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+signature_preview_url_requested (GtkHTML *html,
+                                 const gchar *url,
+                                 GtkHTMLStream *handle)
+{
+	GtkHTMLStreamStatus status;
+	gchar buffer[128];
+	gchar *filename;
+	gssize size;
+	gint fd;
+
+	/* FIXME Use GInputStream for this. */
+
+	if (g_str_has_prefix (url, "file:"))
+		filename = g_filename_from_uri (url, NULL, NULL);
+	else
+		filename = g_strdup (url);
+	fd = g_open (filename, O_RDONLY, 0);
+	g_free (filename);
+
+	status = GTK_HTML_STREAM_OK;
+	if (fd != -1) {
+		while ((size = read (fd, buffer, sizeof (buffer)))) {
+			if (size == -1) {
+				status = GTK_HTML_STREAM_ERROR;
+				break;
+			} else
+				gtk_html_write (html, handle, buffer, size);
+		}
+	} else
+		status = GTK_HTML_STREAM_ERROR;
+
+	gtk_html_end (html, handle, status);
+
+	if (fd > 0)
+		close (fd);
+}
+
+static void
+signature_preview_refresh (ESignaturePreview *preview)
+{
+	GtkHTML *html;
+	ESignature *signature;
+	gchar *content = NULL;
+	gsize length;
+
+	/* XXX We should show error messages in the preview. */
+
+	html = GTK_HTML (preview);
+	signature = e_signature_preview_get_signature (preview);
+
+	if (signature == NULL)
+		goto clear;
+
+	if (signature->script && !preview->priv->allow_scripts)
+		goto clear;
+
+	if (signature->script)
+		content = e_run_signature_script (signature->filename);
+	else
+		content = e_read_signature_file (signature, FALSE, NULL);
+
+	if (content == NULL || *content == '\0')
+		goto clear;
+
+	length = strlen (content);
+
+	if (signature->html)
+		gtk_html_load_from_string (html, content, length);
+	else {
+		GtkHTMLStream *stream;
+
+		stream = gtk_html_begin_content (
+			html, "text/html; charset=utf-8");
+		gtk_html_write (html, stream, "<PRE>", 5);
+		if (length > 0)
+			gtk_html_write (html, stream, content, length);
+		gtk_html_write (html, stream, "</PRE>", 6);
+		gtk_html_end (html, stream, GTK_HTML_STREAM_OK);
+	}
+
+	g_free (content);
+	return;
+
+clear:
+	gtk_html_load_from_string (html, " ", 1);
+	g_free (content);
+}
+
+static void
+signature_preview_class_init (ESignaturePreviewClass *class)
+{
+	GObjectClass *object_class;
+	GtkHTMLClass *html_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (ESignaturePreviewPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = signature_preview_set_property;
+	object_class->get_property = signature_preview_get_property;
+	object_class->dispose = signature_preview_dispose;
+
+	html_class = GTK_HTML_CLASS (class);
+	html_class->url_requested = signature_preview_url_requested;
+
+	class->refresh = signature_preview_refresh;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_ALLOW_SCRIPTS,
+		g_param_spec_boolean (
+			"allow-scripts",
+			"Allow Scripts",
+			NULL,
+			TRUE,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_SIGNATURE,
+		g_param_spec_object (
+			"signature",
+			"Signature",
+			NULL,
+			E_TYPE_SIGNATURE,
+			G_PARAM_READWRITE));
+
+	signals[REFRESH] = g_signal_new (
+		"refresh",
+		G_TYPE_FROM_CLASS (class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		G_STRUCT_OFFSET (ESignaturePreviewClass, refresh),
+		NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
+}
+
+static void
+signature_preview_init (ESignaturePreview *preview)
+{
+	preview->priv = E_SIGNATURE_PREVIEW_GET_PRIVATE (preview);
+}
+
+GType
+e_signature_preview_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (ESignaturePreviewClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) signature_preview_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (ESignaturePreview),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) signature_preview_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			GTK_TYPE_HTML, "ESignaturePreview", &type_info, 0);
+	}
+
+	return type;
+}
+
+GtkWidget *
+e_signature_preview_new (void)
+{
+	return g_object_new (E_TYPE_SIGNATURE_PREVIEW, NULL);
+}
+
+void
+e_signature_preview_refresh (ESignaturePreview *preview)
+{
+	g_return_if_fail (E_IS_SIGNATURE_PREVIEW (preview));
+
+	g_signal_emit (preview, signals[REFRESH], 0);
+}
+
+gboolean
+e_signature_preview_get_allow_scripts (ESignaturePreview *preview)
+{
+	g_return_val_if_fail (E_IS_SIGNATURE_PREVIEW (preview), FALSE);
+
+	return preview->priv->allow_scripts;
+}
+
+void
+e_signature_preview_set_allow_scripts (ESignaturePreview *preview,
+                                       gboolean allow_scripts)
+{
+	g_return_if_fail (E_IS_SIGNATURE_PREVIEW (preview));
+
+	preview->priv->allow_scripts = allow_scripts;
+	g_object_notify (G_OBJECT (preview), "allow-scripts");
+}
+
+ESignature *
+e_signature_preview_get_signature (ESignaturePreview *preview)
+{
+	g_return_val_if_fail (E_IS_SIGNATURE_PREVIEW (preview), NULL);
+
+	return preview->priv->signature;
+}
+
+void
+e_signature_preview_set_signature (ESignaturePreview *preview,
+                                   ESignature *signature)
+{
+	g_return_if_fail (E_IS_SIGNATURE_PREVIEW (preview));
+
+	if (signature != NULL) {
+		g_return_if_fail (E_IS_SIGNATURE (signature));
+		g_object_ref (signature);
+	}
+
+	if (preview->priv->signature != NULL)
+		g_object_unref (preview->priv->signature);
+
+	preview->priv->signature = signature;
+	g_object_notify (G_OBJECT (preview), "signature");
+
+	e_signature_preview_refresh (preview);
+}
diff --git a/widgets/misc/e-signature-preview.h b/widgets/misc/e-signature-preview.h
new file mode 100644
index 0000000000..2cedcc1d2f
--- /dev/null
+++ b/widgets/misc/e-signature-preview.h
@@ -0,0 +1,81 @@
+/*
+ * e-signature-preview.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_SIGNATURE_PREVIEW_H
+#define E_SIGNATURE_PREVIEW_H
+
+#include <gtkhtml/gtkhtml.h>
+#include <e-util/e-signature.h>
+
+/* Standard GObject macros */
+#define E_TYPE_SIGNATURE_PREVIEW \
+	(e_signature_preview_get_type ())
+#define E_SIGNATURE_PREVIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_SIGNATURE_PREVIEW, ESignaturePreview))
+#define E_SIGNATURE_PREVIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_SIGNATURE_PREVIEW, ESignaturePreviewClass))
+#define E_IS_SIGNATURE_PREVIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_SIGNATURE_PREVIEW))
+#define E_IS_SIGNATURE_PREVIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_SIGNATURE_PREVIEW))
+#define E_SIGNATURE_PREVIEW_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_SIGNATURE_PREVIEW, ESignaturePreview))
+
+G_BEGIN_DECLS
+
+typedef struct _ESignaturePreview ESignaturePreview;
+typedef struct _ESignaturePreviewClass ESignaturePreviewClass;
+typedef struct _ESignaturePreviewPrivate ESignaturePreviewPrivate;
+
+struct _ESignaturePreview {
+	GtkHTML parent;
+	ESignaturePreviewPrivate *priv;
+};
+
+struct _ESignaturePreviewClass {
+	GtkHTMLClass parent_class;
+
+	/* Signals */
+	void		(*refresh)		(ESignaturePreview *preview);
+};
+
+GType		e_signature_preview_get_type	(void);
+GtkWidget *	e_signature_preview_new		(void);
+void		e_signature_preview_refresh	(ESignaturePreview *preview);
+gboolean	e_signature_preview_get_allow_scripts
+						(ESignaturePreview *preview);
+void		e_signature_preview_set_allow_scripts
+						(ESignaturePreview *preview,
+						 gboolean allow_scripts);
+ESignature *	e_signature_preview_get_signature
+						(ESignaturePreview *preview);
+void		e_signature_preview_set_signature
+						(ESignaturePreview *preview,
+						 ESignature *signature);
+
+G_END_DECLS
+
+#endif /* E_SIGNATURE_PREVIEW_H */
diff --git a/widgets/misc/e-signature-tree-view.c b/widgets/misc/e-signature-tree-view.c
index ef1cc36b14..1f6d75b5b5 100644
--- a/widgets/misc/e-signature-tree-view.c
+++ b/widgets/misc/e-signature-tree-view.c
@@ -32,6 +32,7 @@ enum {
 
 enum {
 	PROP_0,
+	PROP_SELECTED,
 	PROP_SIGNATURE_LIST
 };
 
@@ -46,7 +47,7 @@ struct _ESignatureTreeViewPrivate {
 };
 
 static gpointer parent_class;
-static guint signal_ids[LAST_SIGNAL];
+static guint signals[LAST_SIGNAL];
 
 static void
 signature_tree_view_refresh_cb (ESignatureList *signature_list,
@@ -117,7 +118,13 @@ skip:
 	if (signature != NULL)
 		g_object_unref (signature);
 
-	g_signal_emit (tree_view, signal_ids[REFRESHED], 0);
+	g_signal_emit (tree_view, signals[REFRESHED], 0);
+}
+
+static void
+signature_tree_view_selection_changed_cb (ESignatureTreeView *tree_view)
+{
+	g_object_notify (G_OBJECT (tree_view), "selected");
 }
 
 static GObject *
@@ -154,6 +161,12 @@ signature_tree_view_set_property (GObject *object,
                                   GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_SELECTED:
+			e_signature_tree_view_set_selected (
+				E_SIGNATURE_TREE_VIEW (object),
+				g_value_get_object (value));
+			return;
+
 		case PROP_SIGNATURE_LIST:
 			e_signature_tree_view_set_signature_list (
 				E_SIGNATURE_TREE_VIEW (object),
@@ -171,6 +184,13 @@ signature_tree_view_get_property (GObject *object,
                                   GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_SELECTED:
+			g_value_set_object (
+				value,
+				e_signature_tree_view_get_selected (
+				E_SIGNATURE_TREE_VIEW (object)));
+			return;
+
 		case PROP_SIGNATURE_LIST:
 			g_value_set_object (
 				value,
@@ -233,6 +253,16 @@ signature_tree_view_class_init (ESignatureTreeViewClass *class)
 
 	g_object_class_install_property (
 		object_class,
+		PROP_SELECTED,
+		g_param_spec_object (
+			"selected",
+			"Selected Signature",
+			NULL,
+			E_TYPE_SIGNATURE,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
 		PROP_SIGNATURE_LIST,
 		g_param_spec_object (
 			"signature-list",
@@ -242,7 +272,7 @@ signature_tree_view_class_init (ESignatureTreeViewClass *class)
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
 
-	signal_ids[REFRESHED] = g_signal_new (
+	signals[REFRESHED] = g_signal_new (
 		"refreshed",
 		G_TYPE_FROM_CLASS (class),
 		G_SIGNAL_RUN_LAST,
@@ -255,6 +285,7 @@ static void
 signature_tree_view_init (ESignatureTreeView *tree_view)
 {
 	GHashTable *index;
+	GtkTreeSelection *selection;
 
 	/* Reverse-lookup index */
 	index = g_hash_table_new_full (
@@ -264,6 +295,13 @@ signature_tree_view_init (ESignatureTreeView *tree_view)
 
 	tree_view->priv = E_SIGNATURE_TREE_VIEW_GET_PRIVATE (tree_view);
 	tree_view->priv->index = index;
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+
+	g_signal_connect_swapped (
+		selection, "changed",
+		G_CALLBACK (signature_tree_view_selection_changed_cb),
+		tree_view);
 }
 
 GType
@@ -401,5 +439,7 @@ e_signature_tree_view_set_selected (ESignatureTreeView *tree_view,
 	gtk_tree_selection_select_path (selection, path);
 	gtk_tree_path_free (path);
 
+	g_object_notify (G_OBJECT (tree_view), "selected");
+
 	return TRUE;
 }