[evolution/wip/webkit-composer: 834/966] Rename -x-evolution-signature to -x-evo-signature



commit dbe1f37867f3a5ccf1921a031bfd0e580896343b
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Feb 26 15:13:58 2014 +0100

    Rename -x-evolution-signature to -x-evo-signature

 composer/e-composer-private.c |    6 +++---
 composer/e-msg-composer.c     |    2 +-
 e-util/e-editor-widget.c      |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index a81830e..e058e6b 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -874,7 +874,7 @@ composer_move_caret (EMsgComposer *composer)
        }
 
        list = webkit_dom_document_get_elements_by_class_name (document, "-x-evo-paragraph");
-       signature = webkit_dom_document_query_selector (document, ".-x-evolution-signature", NULL);
+       signature = webkit_dom_document_query_selector (document, ".-x-evo-signature", NULL);
        /* Situation when wrapped paragraph is just in signature and not in message body */
        if (webkit_dom_node_list_get_length (list) == 1) {
                if (signature && webkit_dom_element_query_selector (signature, ".-x-evo-paragraph", NULL))
@@ -1044,7 +1044,7 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
 
        g_string_append_printf (
                html_buffer,
-               "<SPAN class=\"-x-evolution-signature\" id=\"1\" name=\"%s\">",
+               "<SPAN class=\"-x-evo-signature\" id=\"1\" name=\"%s\">",
                (active_id != NULL) ? active_id : "");
 
        if (!is_html)
@@ -1092,7 +1092,7 @@ insert:
        document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (editor_widget));
 
        signatures = webkit_dom_document_get_elements_by_class_name (
-               document, "-x-evolution-signature");
+               document, "-x-evo-signature");
        list_length = webkit_dom_node_list_get_length (signatures);
        for (ii = 0; ii < list_length; ii++) {
                WebKitDOMNode *node;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 028d994..f4ec767 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3045,7 +3045,7 @@ set_signature_gui (EMsgComposer *composer)
 
        uid = NULL;
        nodes = webkit_dom_document_get_elements_by_class_name (
-               document, "-x-evolution-signature");
+               document, "-x-evo-signature");
        length = webkit_dom_node_list_get_length (nodes);
        for (ii = 0; ii < length; ii++) {
                WebKitDOMNode *node;
diff --git a/e-util/e-editor-widget.c b/e-util/e-editor-widget.c
index df798b5..f9b30b7 100644
--- a/e-util/e-editor-widget.c
+++ b/e-util/e-editor-widget.c
@@ -2151,7 +2151,7 @@ html_plain_text_convertor_load_status_changed (WebKitWebView *web_view,
        top_signature = webkit_dom_document_query_selector (
                document, ".-x-evo-top-signature", NULL);
        signature = webkit_dom_document_query_selector (
-               document, "span.-x-evolution-signature", NULL);
+               document, "span.-x-evo-signature", NULL);
 
        new_blockquote = webkit_dom_document_create_element (
                document, "blockquote", NULL);
@@ -3306,7 +3306,7 @@ process_elements (WebKitDOMNode *node,
                return;
 
        /* Skip signature */
-       if (element_has_class (WEBKIT_DOM_ELEMENT (node), "-x-evolution-signature")) {
+       if (element_has_class (WEBKIT_DOM_ELEMENT (node), "-x-evo-signature")) {
                if (to_plain_text && !changing_mode)
                        g_string_append (buffer, "\n");
                if (to_html)
@@ -3506,7 +3506,7 @@ process_elements (WebKitDOMNode *node,
                        add_br = TRUE;
 
                if (next_sibling && WEBKIT_DOM_IS_HTML_DIV_ELEMENT (next_sibling)) {
-                       if (webkit_dom_element_query_selector (WEBKIT_DOM_ELEMENT (next_sibling), 
"span.-x-evolution-signature", NULL))
+                       if (webkit_dom_element_query_selector (WEBKIT_DOM_ELEMENT (next_sibling), 
"span.-x-evo-signature", NULL))
                                add_br = FALSE;
                }
 
@@ -3773,7 +3773,7 @@ convert_when_changing_composer_mode (EEditorWidget *widget)
        top_signature = webkit_dom_document_query_selector (
                document, ".-x-evo-top-signature", NULL);
        signature = webkit_dom_document_query_selector (
-               document, "span.-x-evolution-signature", NULL);
+               document, "span.-x-evo-signature", NULL);
        blockquote = webkit_dom_document_get_element_by_id (
                document, "-x-evo-main-cite");
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]