GNOME.org
 

[evolution/gnome-3-32] Use lower-case "mailto:" consistently in the code

commit 8bd507bb24821955c4e9acf16534203756ec8bab
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 9 18:11:37 2019 +0200

    Use lower-case "mailto:"; consistently in the code

 src/calendar/gui/e-comp-editor-page-general.c   | 10 +++++-----
 src/calendar/gui/e-meeting-list-view.c          |  8 ++++----
 src/calendar/gui/e-meeting-store.c              |  2 +-
 src/calendar/gui/itip-utils.c                   |  4 ++--
 src/modules/calendar/e-cal-shell-view-actions.c |  2 +-
 src/modules/itip-formatter/itip-view.c          |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/calendar/gui/e-comp-editor-page-general.c b/src/calendar/gui/e-comp-editor-page-general.c
index 90e881f519..74d3d5cc2e 100644
--- a/src/calendar/gui/e-comp-editor-page-general.c
+++ b/src/calendar/gui/e-comp-editor-page-general.c
@@ -269,7 +269,7 @@ ecep_general_attendees_add_clicked_cb (GtkButton *button,
        attendee = e_meeting_store_add_attendee_with_defaults (page_general->priv->meeting_store);
 
        if ((flags & E_COMP_EDITOR_FLAG_DELEGATE) != 0)
-               e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s",
+               e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("mailto:%s";,
                        page_general->priv->user_delegator ? page_general->priv->user_delegator : ""));
 
        e_meeting_list_view_edit (E_MEETING_LIST_VIEW (page_general->priv->attendees_list_view), attendee);
@@ -463,7 +463,7 @@ ecep_general_attendee_added_cb (EMeetingListView *meeting_list_view,
        client = e_comp_editor_get_target_client (comp_editor);
 
        /* do not remove here, it did EMeetingListView already */
-       e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s",
+       e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("mailto:%s";,
                page_general->priv->user_delegator ? page_general->priv->user_delegator : ""));
 
        if (client && !e_client_check_capability (E_CLIENT (client), CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) 
{
@@ -531,7 +531,7 @@ ecep_general_get_organizer (ECompEditorPageGeneral *page_general,
                        if (out_name)
                                *out_name = g_strdup (str_name);
                        if (out_mailto)
-                               *out_mailto = g_strconcat ("MAILTO:", itip_strip_mailto (str_address), NULL);
+                               *out_mailto = g_strconcat ("mailto:";, itip_strip_mailto (str_address), NULL);
                } else if (out_error_message) {
                        *out_error_message = _("Organizer address is not a valid user mail address");
                }
@@ -637,7 +637,7 @@ ecep_general_list_view_event_cb (EMeetingListView *list_view,
                flags = e_comp_editor_get_flags (comp_editor);
 
                if ((flags & E_COMP_EDITOR_FLAG_DELEGATE) != 0) {
-                       e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("MAILTO:%s", 
page_general->priv->user_delegator));
+                       e_meeting_attendee_set_delfrom (attendee, g_strdup_printf ("mailto:%s";, 
page_general->priv->user_delegator));
                }
 
                g_clear_object (&comp_editor);
@@ -1130,7 +1130,7 @@ ecep_general_fill_component (ECompEditorPage *page,
                                gchar *sentby;
                                gboolean differs;
 
-                               sentby = g_strconcat ("MAILTO:", cal_email_address, NULL);
+                               sentby = g_strconcat ("mailto:";, cal_email_address, NULL);
                                differs = !organizer_mailto || g_ascii_strcasecmp (sentby, organizer_mailto) 
!= 0;
 
                                if (differs) {
diff --git a/src/calendar/gui/e-meeting-list-view.c b/src/calendar/gui/e-meeting-list-view.c
index 5bd9fb2eb0..8b4b67b62b 100644
--- a/src/calendar/gui/e-meeting-list-view.c
+++ b/src/calendar/gui/e-meeting-list-view.c
@@ -381,7 +381,7 @@ attendee_edited_cb (GtkCellRenderer *renderer,
                        }
 
                        attendee = e_meeting_store_add_attendee_with_defaults (model);
-                       e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *) 
l->data));
+                       e_meeting_attendee_set_address (attendee, g_strdup_printf ("mailto:%s";, (gchar *) 
l->data));
                        e_meeting_attendee_set_cn (attendee, g_strdup (m->data));
                        if (existing_attendee) {
                                e_meeting_attendee_set_cutype (attendee, e_meeting_attendee_get_cutype 
(existing_attendee));
@@ -418,7 +418,7 @@ attendee_edited_cb (GtkCellRenderer *renderer,
                        if (existing_attendee) {
                                const gchar *addr = e_meeting_attendee_get_address (existing_attendee);
 
-                               if (addr && g_ascii_strncasecmp (addr, "MAILTO:", 7) == 0)
+                               if (addr && g_ascii_strncasecmp (addr, "mailto:";, 7) == 0)
                                        addr += 7;
 
                                address_changed = addr && g_ascii_strcasecmp (addr, email) != 0;
@@ -432,7 +432,7 @@ attendee_edited_cb (GtkCellRenderer *renderer,
                        value_edited (view, E_MEETING_STORE_ADDRESS_COL, path, email);
                        value_edited (view, E_MEETING_STORE_CN_COL, path, name);
 
-                       e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", email));
+                       e_meeting_attendee_set_address (attendee, g_strdup_printf ("mailto:%s";, email));
                        e_meeting_attendee_set_cn (attendee, g_strdup (name));
                        e_meeting_attendee_set_role (attendee, ICAL_ROLE_REQPARTICIPANT);
 
@@ -1001,7 +1001,7 @@ process_section (EMeetingListView *view,
                        if (e_meeting_store_find_attendee (priv->store, email_addr, NULL) == NULL) {
                                EMeetingAttendee *ia = e_meeting_store_add_attendee_with_defaults 
(priv->store);
 
-                               e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", 
email_addr));
+                               e_meeting_attendee_set_address (ia, g_strdup_printf ("mailto:%s";, 
email_addr));
                                e_meeting_attendee_set_role (ia, role);
                                if (role == ICAL_ROLE_NONPARTICIPANT)
                                        e_meeting_attendee_set_cutype (ia, ICAL_CUTYPE_RESOURCE);
diff --git a/src/calendar/gui/e-meeting-store.c b/src/calendar/gui/e-meeting-store.c
index 1d897f222b..02c8766285 100644
--- a/src/calendar/gui/e-meeting-store.c
+++ b/src/calendar/gui/e-meeting-store.c
@@ -543,7 +543,7 @@ e_meeting_store_set_value (EMeetingStore *store,
                if (val != NULL && *((gchar *) val))
                        e_meeting_attendee_set_address (
                                attendee, g_strdup_printf (
-                               "MAILTO:%s", (gchar *) val));
+                               "mailto:%s";, (gchar *) val));
                break;
        case E_MEETING_STORE_MEMBER_COL:
                e_meeting_attendee_set_member (attendee, g_strdup (val));
diff --git a/src/calendar/gui/itip-utils.c b/src/calendar/gui/itip-utils.c
index 23d1769ada..84ae2a8176 100644
--- a/src/calendar/gui/itip-utils.c
+++ b/src/calendar/gui/itip-utils.c
@@ -1386,7 +1386,7 @@ comp_sentby (ECalComponent *comp,
 
        e_cal_component_get_organizer (comp, &organizer);
        if (!organizer.value && name != NULL && address != NULL) {
-               organizer.value = g_strdup_printf ("MAILTO:%s", address);
+               organizer.value = g_strdup_printf ("mailto:%s";, address);
                organizer.sentby = NULL;
                organizer.cn = name;
                organizer.language = NULL;
@@ -1420,7 +1420,7 @@ comp_sentby (ECalComponent *comp,
            !itip_sentby_is_user (registry, comp, cal_client) &&
            address != NULL) {
                organizer.value = g_strdup (organizer.value);
-               organizer.sentby = g_strdup_printf ("MAILTO:%s", address);
+               organizer.sentby = g_strdup_printf ("mailto:%s";, address);
                organizer.cn = g_strdup (organizer.cn);
                organizer.language = g_strdup (organizer.language);
 
diff --git a/src/modules/calendar/e-cal-shell-view-actions.c b/src/modules/calendar/e-cal-shell-view-actions.c
index 91f6831116..dcc9a25ba9 100644
--- a/src/modules/calendar/e-cal-shell-view-actions.c
+++ b/src/modules/calendar/e-cal-shell-view-actions.c
@@ -694,7 +694,7 @@ action_event_delegate_cb (GtkAction *action,
                icalparameter *parameter;
                gchar *address;
 
-               address = g_strdup_printf ("MAILTO:%s", attendee);
+               address = g_strdup_printf ("mailto:%s";, attendee);
 
                property = icalproperty_new_attendee (address);
                icalcomponent_add_property (clone, property);
diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
index 7849b8d9e9..fd16145837 100644
--- a/src/modules/itip-formatter/itip-view.c
+++ b/src/modules/itip-formatter/itip-view.c
@@ -5080,7 +5080,7 @@ set_attendee (ECalComponent *comp,
 
        if (!found) {
                icalparameter *param;
-               gchar *temp = g_strdup_printf ("MAILTO:%s", address);
+               gchar *temp = g_strdup_printf ("mailto:%s";, address);
 
                prop = icalproperty_new_attendee ((const gchar *) temp);
                icalcomponent_add_property (icalcomp, prop);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]