Drop the "quote-from-selection" property.

David's solution is simpler: check if the HTML widget is mapped.
Avoids having to propagate the property to Srini's new classes.

1 files changed, 1 insertions, 41 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 4c5b3fd039..adf56fac7e 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -85,8 +85,7 @@ struct _EMailReaderPrivate {
 	guint folder_was_just_selected    : 1;
 	guint restoring_message_selection : 1;
 
-	guint group_by_threads     : 1;
-	guint quote_from_selection : 1;
+	guint group_by_threads : 1;
 };
 
 enum {
@@ -2756,15 +2755,6 @@ mail_reader_class_init (EMailReaderIface *iface)
 			FALSE,
 			G_PARAM_READWRITE));
 
-	g_object_interface_install_property (
-		iface,
-		g_param_spec_boolean (
-			"quote-from-selection",
-			"Quote From Selection",
-			"Quote selected text when replying",
-			FALSE,
-			G_PARAM_READWRITE));
-
 	signals[CHANGED] = g_signal_new (
 		"changed",
 		G_OBJECT_CLASS_TYPE (iface),
@@ -3503,36 +3493,6 @@ e_mail_reader_set_group_by_threads (EMailReader *reader,
 	g_object_notify (G_OBJECT (reader), "group-by-threads");
 }
 
-gboolean
-e_mail_reader_get_quote_from_selection (EMailReader *reader)
-{
-	EMailReaderPrivate *priv;
-
-	g_return_val_if_fail (E_IS_MAIL_READER (reader), FALSE);
-
-	priv = E_MAIL_READER_GET_PRIVATE (reader);
-
-	return priv->quote_from_selection;
-}
-
-void
-e_mail_reader_set_quote_from_selection (EMailReader *reader,
-                                        gboolean quote_from_selection)
-{
-	EMailReaderPrivate *priv;
-
-	g_return_if_fail (E_IS_MAIL_READER (reader));
-
-	priv = E_MAIL_READER_GET_PRIVATE (reader);
-
-	if (quote_from_selection == priv->quote_from_selection)
-		return;
-
-	priv->quote_from_selection = quote_from_selection;
-
-	g_object_notify (G_OBJECT (reader), "quote-from-selection");
-}
-
 void
 e_mail_reader_create_charset_menu (EMailReader *reader,
                                    GtkUIManager *ui_manager,