[evolution] Composer - Move comment about the signatures on top to the right place
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Composer - Move comment about the signatures on top to the right place
- Date: Thu, 23 Oct 2014 14:00:56 +0000 (UTC)
commit 3895eeea107e5956550487154b1e1f94eee3a1ea
Author: Tomas Popela <tpopela redhat com>
Date: Thu Oct 23 15:50:48 2014 +0200
Composer - Move comment about the signatures on top to the right place
composer/e-composer-private.c | 13 +++++++++++++
composer/e-msg-composer.c | 18 +-----------------
2 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 5719675..5f26c0d 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -880,6 +880,19 @@ composer_move_caret (EMsgComposer *composer)
if (signature && webkit_dom_element_query_selector (signature, ".-x-evo-paragraph", NULL))
has_paragraphs_in_body = FALSE;
+ /*
+ *
+ * Keeping Signatures in the beginning of composer
+ * ------------------------------------------------
+ *
+ * Purists are gonna blast me for this.
+ * But there are so many people (read Outlook users) who want this.
+ * And Evo is an exchange-client, Outlook-replacement etc.
+ * So Here it goes :(
+ *
+ * -- Sankar
+ *
+ */
if (signature && top_signature) {
element_add_class (signature, "-x-evo-top-signature");
element = prepare_paragraph (editor_selection, document);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d8973fa..a62ace0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1539,25 +1539,9 @@ set_editor_text (EMsgComposer *composer,
g_return_if_fail (E_IS_MSG_COMPOSER (composer));
g_return_if_fail (text != NULL);
- /*
- *
- * Keeping Signatures in the beginning of composer
- * ------------------------------------------------
- *
- * Purists are gonna blast me for this.
- * But there are so many people (read Outlook users) who want this.
- * And Evo is an exchange-client, Outlook-replacement etc.
- * So Here it goes :(
- *
- * -- Sankar
- *
- */
-
- /* "Edit as New Message" sets "priv->is_from_message".
- * Always put the signature at the bottom for that case. */
-
editor = e_msg_composer_get_editor (composer);
view = e_html_editor_get_view (editor);
+
if (is_html)
e_html_editor_view_set_text_html (view, text);
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]