From 8db3da39d77c5c360e4bfe29cf652e333e737374 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 3 May 2012 16:19:58 -0400
Subject: Revert "Bug #669463 - HTML signature opens in editor as Plain text"

This reverts commit f25826211b007a615118f9b583a66d7027eddeac.

Not an issue on the account-mgmt branch.  We can do without this hack.
---
 widgets/misc/e-signature-editor.c  | 48 +-------------------------------------
 widgets/misc/e-signature-editor.h  |  5 ----
 widgets/misc/e-signature-manager.c |  2 --
 3 files changed, 1 insertion(+), 54 deletions(-)

(limited to 'widgets')

diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c
index ce181138ec..0ddfb8d513 100644
--- a/widgets/misc/e-signature-editor.c
+++ b/widgets/misc/e-signature-editor.c
@@ -40,8 +40,7 @@
 enum {
 	PROP_0,
 	PROP_FOCUS_TRACKER,
-	PROP_SIGNATURE,
-	PROP_EDITING_OLD
+	PROP_SIGNATURE
 };
 
 struct _ESignatureEditorPrivate {
@@ -50,7 +49,6 @@ struct _ESignatureEditorPrivate {
 	ESignature *signature;
 	GtkWidget *entry;
 	gchar *original_name;
-	gboolean editing_old;
 };
 
 static const gchar *ui =
@@ -256,12 +254,6 @@ signature_editor_set_property (GObject *object,
 				E_SIGNATURE_EDITOR (object),
 				g_value_get_object (value));
 			return;
-
-		case PROP_EDITING_OLD:
-			e_signature_editor_set_editing_old (
-				E_SIGNATURE_EDITOR (object),
-				g_value_get_boolean (value));
-			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -285,12 +277,6 @@ signature_editor_get_property (GObject *object,
 				value, e_signature_editor_get_signature (
 				E_SIGNATURE_EDITOR (object)));
 			return;
-
-		case PROP_EDITING_OLD:
-			g_value_set_boolean (
-				value, e_signature_editor_get_editing_old (
-				E_SIGNATURE_EDITOR (object)));
-			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -403,16 +389,6 @@ e_signature_editor_class_init (ESignatureEditorClass *class)
 			NULL,
 			E_TYPE_SIGNATURE,
 			G_PARAM_READWRITE));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_EDITING_OLD,
-		g_param_spec_boolean (
-			"editing-old",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE));
 }
 
 static void
@@ -609,25 +585,3 @@ exit:
 
 	g_object_notify (G_OBJECT (editor), "signature");
 }
-
-void
-e_signature_editor_set_editing_old (ESignatureEditor *editor,
-                                    gboolean editing_old)
-{
-	g_return_if_fail (E_IS_SIGNATURE_EDITOR (editor));
-
-	if (editor->priv->editing_old == editing_old)
-		return;
-
-	editor->priv->editing_old = editing_old;
-
-	g_object_notify (G_OBJECT (editor), "editing-old");
-}
-
-gboolean
-e_signature_editor_get_editing_old (ESignatureEditor *editor)
-{
-	g_return_val_if_fail (E_IS_SIGNATURE_EDITOR (editor), FALSE);
-
-	return editor->priv->editing_old;
-}
diff --git a/widgets/misc/e-signature-editor.h b/widgets/misc/e-signature-editor.h
index f848e89fbf..0d07cb840e 100644
--- a/widgets/misc/e-signature-editor.h
+++ b/widgets/misc/e-signature-editor.h
@@ -67,11 +67,6 @@ EFocusTracker *	e_signature_editor_get_focus_tracker
 ESignature *	e_signature_editor_get_signature (ESignatureEditor *editor);
 void		e_signature_editor_set_signature (ESignatureEditor *editor,
 						  ESignature *signature);
-void		e_signature_editor_set_editing_old
-						 (ESignatureEditor *editor,
-						  gboolean editing_old);
-gboolean	e_signature_editor_get_editing_old
-						 (ESignatureEditor *editor);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c
index 888a9df3c4..eb68dd251d 100644
--- a/widgets/misc/e-signature-manager.c
+++ b/widgets/misc/e-signature-manager.c
@@ -378,8 +378,6 @@ signature_manager_edit_signature (ESignatureManager *manager)
 	editor = e_signature_editor_new ();
 	e_signature_editor_set_signature (
 		E_SIGNATURE_EDITOR (editor), signature);
-	e_signature_editor_set_editing_old (
-		E_SIGNATURE_EDITOR (editor), TRUE);
 	signature_manager_emit_editor_created (manager, editor);
 
 	goto exit;
-- 
cgit v1.2.3