GNOME.org
 

[evolution] M!45 - Typos in internal variable names

commit 148054c10587e9b0879422e81cdb6ec5d585befc
Author: Nour E-Din Osama Mohamed <nouredinosama gmail com>
Date:   Fri Mar 6 10:00:32 2020 +0100

    M!45 - Typos in internal variable names
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/814
    Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/45

 src/e-util/e-filter-code.c                     |  4 ++--
 src/e-util/e-filter-color.c                    |  4 ++--
 src/e-util/e-filter-element.h                  |  8 ++++----
 src/e-util/e-filter-file.c                     |  4 ++--
 src/e-util/e-filter-input.c                    |  4 ++--
 src/e-util/e-filter-int.c                      |  4 ++--
 src/libemail-engine/em-filter-folder-element.c |  4 ++--
 src/mail/em-filter-editor.c                    | 12 ++++++------
 src/mail/em-filter-source-element.c            |  4 ++--
 9 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/src/e-util/e-filter-code.c b/src/e-util/e-filter-code.c
index 0df165fd6d..4354bfde79 100644
--- a/src/e-util/e-filter-code.c
+++ b/src/e-util/e-filter-code.c
@@ -67,11 +67,11 @@ filter_code_describe (EFilterElement *element,
        EFilterInput *fi = (EFilterInput *) element;
        GList *link;
 
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_START);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_START);
        for (link = fi->values; link; link = g_list_next (link)) {
                g_string_append (out, (const gchar *) link->data);
        }
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 }
 
 static void
diff --git a/src/e-util/e-filter-color.c b/src/e-util/e-filter-color.c
index 5562ae5f5c..37f2af3054 100644
--- a/src/e-util/e-filter-color.c
+++ b/src/e-util/e-filter-color.c
@@ -147,9 +147,9 @@ filter_color_describe (EFilterElement *element,
        g_string_append_c (out, '[');
        g_string_append (out, spec);
        g_string_append (out, "] ");
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_COLOR_START);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_COLOR_START);
        g_string_append (out, spec);
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_COLOR_END);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_COLOR_END);
 }
 
 static void
diff --git a/src/e-util/e-filter-element.h b/src/e-util/e-filter-element.h
index e3e39d816a..360d54270b 100644
--- a/src/e-util/e-filter-element.h
+++ b/src/e-util/e-filter-element.h
@@ -53,10 +53,10 @@
        ((obj), E_TYPE_FILTER_ELEMENT, EFilterElementClass))
 
 /* Keep the values in sync with their escaped values ("&#1;" and so on) in em-filter-editor.c  */
-#define E_FILTER_ELEMENT_DESCIPTION_VALUE_START        '\1'
-#define E_FILTER_ELEMENT_DESCIPTION_VALUE_END  '\2'
-#define E_FILTER_ELEMENT_DESCIPTION_COLOR_START        '\3'
-#define E_FILTER_ELEMENT_DESCIPTION_COLOR_END  '\4'
+#define E_FILTER_ELEMENT_DESCRIPTION_VALUE_START       '\1'
+#define E_FILTER_ELEMENT_DESCRIPTION_VALUE_END '\2'
+#define E_FILTER_ELEMENT_DESCRIPTION_COLOR_START       '\3'
+#define E_FILTER_ELEMENT_DESCRIPTION_COLOR_END '\4'
 
 G_BEGIN_DECLS
 
diff --git a/src/e-util/e-filter-file.c b/src/e-util/e-filter-file.c
index 536ddbdcf5..446a39ef97 100644
--- a/src/e-util/e-filter-file.c
+++ b/src/e-util/e-filter-file.c
@@ -206,9 +206,9 @@ filter_file_describe (EFilterElement *element,
 {
        EFilterFile *file = E_FILTER_FILE (element);
 
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_START);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_START);
        g_string_append (out, file->path);
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 }
 
 static void
diff --git a/src/e-util/e-filter-input.c b/src/e-util/e-filter-input.c
index 33769beff4..3f352797df 100644
--- a/src/e-util/e-filter-input.c
+++ b/src/e-util/e-filter-input.c
@@ -375,7 +375,7 @@ filter_input_describe (EFilterElement *element,
        GList *link;
        gboolean added = FALSE;
 
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_START);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_START);
 
        for (link = input->values; link; link = g_list_next (link)) {
                const gchar *value = link->data;
@@ -390,7 +390,7 @@ filter_input_describe (EFilterElement *element,
                }
        }
 
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 }
 
 static void
diff --git a/src/e-util/e-filter-int.c b/src/e-util/e-filter-int.c
index df9f3be062..35ccf8c7e3 100644
--- a/src/e-util/e-filter-int.c
+++ b/src/e-util/e-filter-int.c
@@ -177,9 +177,9 @@ filter_int_describe (EFilterElement *element,
        EFilterInt *filter_int = E_FILTER_INT (element);
 
        g_string_append_printf (out, "%c%d%c",
-               E_FILTER_ELEMENT_DESCIPTION_VALUE_START,
+               E_FILTER_ELEMENT_DESCRIPTION_VALUE_START,
                filter_int->val,
-               E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+               E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 }
 
 static void
diff --git a/src/libemail-engine/em-filter-folder-element.c b/src/libemail-engine/em-filter-folder-element.c
index d2e355e84f..cd3f2833b3 100644
--- a/src/libemail-engine/em-filter-folder-element.c
+++ b/src/libemail-engine/em-filter-folder-element.c
@@ -283,9 +283,9 @@ em_filter_folder_element_describe (EMFilterFolderElement *element,
                        g_free (folder_name);
                }
 
-               g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_START);
+               g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_START);
                g_string_append (out, use_name);
-               g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+               g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 
                g_free (full_name);
        }
diff --git a/src/mail/em-filter-editor.c b/src/mail/em-filter-editor.c
index c16e7dbfdc..b2c07cb533 100644
--- a/src/mail/em-filter-editor.c
+++ b/src/mail/em-filter-editor.c
@@ -156,9 +156,9 @@ emfe_describe_filters_cb (GtkWidget *button,
                        g_string_append_c (description, '\n');
 
                rule_name = g_strdup_printf ("%c%s%c",
-                       E_FILTER_ELEMENT_DESCIPTION_VALUE_START,
+                       E_FILTER_ELEMENT_DESCRIPTION_VALUE_START,
                        rule->name,
-                       E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+                       E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 
                if (account) {
                        /* Translators: The first '%s' is replaced with the rule name;
@@ -218,7 +218,7 @@ emfe_describe_filters_cb (GtkWidget *button,
        html = camel_text_to_html (description->str, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | 
CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES, 0);
        g_string_free (description, TRUE);
 
-       description = e_str_replace_string (html, "&#1;", "<b>"); /* E_FILTER_ELEMENT_DESCIPTION_VALUE_START 
*/
+       description = e_str_replace_string (html, "&#1;", "<b>"); /* E_FILTER_ELEMENT_DESCRIPTION_VALUE_START 
*/
        g_string_prepend (description, "<div style=\"white-space: nowrap;\">");
        g_string_append (description, "</div>");
        g_free (html);
@@ -229,11 +229,11 @@ emfe_describe_filters_cb (GtkWidget *button,
                g_free (html); \
                html = g_string_free (description, FALSE);
 
-       replace_in_html ("&#2;", "</b>"); /* E_FILTER_ELEMENT_DESCIPTION_VALUE_END */
+       replace_in_html ("&#2;", "</b>"); /* E_FILTER_ELEMENT_DESCRIPTION_VALUE_END */
 
        if (strstr (html, "&#3;") && strstr (html, "&#4;")) {
-               replace_in_html ("&#3;", "<span style=\"background-color:"); /* 
E_FILTER_ELEMENT_DESCIPTION_COLOR_START */
-               replace_in_html ("&#4;", 
";\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"); /* 
E_FILTER_ELEMENT_DESCIPTION_COLOR_END */
+               replace_in_html ("&#3;", "<span style=\"background-color:"); /* 
E_FILTER_ELEMENT_DESCRIPTION_COLOR_START */
+               replace_in_html ("&#4;", 
";\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"); /* 
E_FILTER_ELEMENT_DESCRIPTION_COLOR_END */
        }
 
        #undef replace_in_html
diff --git a/src/mail/em-filter-source-element.c b/src/mail/em-filter-source-element.c
index 04ab2f3a98..496a90b168 100644
--- a/src/mail/em-filter-source-element.c
+++ b/src/mail/em-filter-source-element.c
@@ -419,7 +419,7 @@ filter_source_element_describe (EFilterElement *fe,
        registry = e_mail_session_get_registry (mail_session);
        source = e_source_registry_ref_source (registry, fs->priv->active_id);
 
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_START);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_START);
 
        if (source) {
                g_string_append (out, e_source_get_display_name (source));
@@ -428,7 +428,7 @@ filter_source_element_describe (EFilterElement *fe,
                g_string_append (out, fs->priv->active_id);
        }
 
-       g_string_append_c (out, E_FILTER_ELEMENT_DESCIPTION_VALUE_END);
+       g_string_append_c (out, E_FILTER_ELEMENT_DESCRIPTION_VALUE_END);
 }
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]