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, 6 insertions, 8 deletions

diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 8827375ed3..7d8be346bc 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -353,7 +353,8 @@ html_contains_nonwhitespace (const gchar *html,
 }
 
 void
-e_mail_reader_reply_to_message (EMailReader *reader, CamelMimeMessage *src_message,
+e_mail_reader_reply_to_message (EMailReader *reader,
+                                CamelMimeMessage *src_message,
                                 gint reply_mode)
 {
 	EMFormatHTML *formatter;
@@ -384,15 +385,12 @@ e_mail_reader_reply_to_message (EMailReader *reader, CamelMimeMessage *src_messa
 	if (!gtk_widget_get_mapped (GTK_WIDGET(web_view)))
 		goto whole_message;
 
-	if (!src_message) {
-		src_message = CAMEL_MIME_MESSAGE (EM_FORMAT (formatter)->message);
-		if (src_message)
-			g_object_ref(src_message);
+	if (src_message == NULL) {
+		src_message = EM_FORMAT (formatter)->message;
+		if (src_message != NULL)
+			g_object_ref (src_message);
 	}
 
-	if (!e_mail_reader_get_quote_from_selection (reader))
-		goto whole_message;
-
 	if (!e_web_view_is_selection_active (web_view))
 		goto whole_message;