[evolution] Replace deprecated icalproperty_remove_parameter() with icalproperty_remove_parameter_by_kind()



commit e441d0ec4cc9d1e08260abf576bdb5401d9204f6
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jan 5 14:13:52 2017 +0100

    Replace deprecated icalproperty_remove_parameter() with icalproperty_remove_parameter_by_kind()
    
    The upcoming libical release can have the deprecated symbol removed
    and the replacement is available in the requested minimum version
    of the libical already, thus no dependency change by replacing it.

 src/calendar/gui/comp-util.c                  |    2 +-
 src/calendar/gui/e-cal-model.c                |    2 +-
 src/calendar/gui/e-comp-editor-page-general.c |    6 +++---
 src/modules/itip-formatter/itip-view.c        |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/calendar/gui/comp-util.c b/src/calendar/gui/comp-util.c
index 4132dba..437be49 100644
--- a/src/calendar/gui/comp-util.c
+++ b/src/calendar/gui/comp-util.c
@@ -1330,7 +1330,7 @@ cal_comp_util_update_tzid_parameter (icalproperty *prop,
                        icalproperty_add_parameter (prop, param);
                }
        } else if (param) {
-               icalproperty_remove_parameter (prop, ICAL_TZID_PARAMETER);
+               icalproperty_remove_parameter_by_kind (prop, ICAL_TZID_PARAMETER);
        }
 }
 
diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
index ab34778..f9accea 100644
--- a/src/calendar/gui/e-cal-model.c
+++ b/src/calendar/gui/e-cal-model.c
@@ -2692,7 +2692,7 @@ e_cal_model_update_comp_time (ECalModel *model,
                if (tzid && strcmp (tzid, "UTC")) {
                        icalparameter_set_tzid (param, (gchar *) tzid);
                } else {
-                       icalproperty_remove_parameter (prop, ICAL_TZID_PARAMETER);
+                       icalproperty_remove_parameter_by_kind (prop, ICAL_TZID_PARAMETER);
                }
        }
 }
diff --git a/src/calendar/gui/e-comp-editor-page-general.c b/src/calendar/gui/e-comp-editor-page-general.c
index cd6ca71..8d5b1b8 100644
--- a/src/calendar/gui/e-comp-editor-page-general.c
+++ b/src/calendar/gui/e-comp-editor-page-general.c
@@ -980,7 +980,7 @@ ecep_general_fill_component (ECompEditorPage *page,
                                        icalparameter_set_cn (param, organizer_name);
                                }
                        } else if (param) {
-                               icalproperty_remove_parameter (prop, ICAL_CN_PARAMETER);
+                               icalproperty_remove_parameter_by_kind (prop, ICAL_CN_PARAMETER);
                        }
 
                        param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
@@ -1000,12 +1000,12 @@ ecep_general_fill_component (ECompEditorPage *page,
                                                icalparameter_set_sentby (param, sentby);
                                        }
                                } else if (param) {
-                                       icalproperty_remove_parameter (prop, ICAL_SENTBY_PARAMETER);
+                                       icalproperty_remove_parameter_by_kind (prop, ICAL_SENTBY_PARAMETER);
                                }
 
                                g_free (sentby);
                        } else if (param) {
-                               icalproperty_remove_parameter (prop, ICAL_SENTBY_PARAMETER);
+                               icalproperty_remove_parameter_by_kind (prop, ICAL_SENTBY_PARAMETER);
                        }
                }
 
diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
index b9f9b7a..885d41b 100644
--- a/src/modules/itip-formatter/itip-view.c
+++ b/src/modules/itip-formatter/itip-view.c
@@ -4242,7 +4242,7 @@ change_status (ESourceRegistry *registry,
        if (prop) {
                icalparameter *param;
 
-               icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
+               icalproperty_remove_parameter_by_kind (prop, ICAL_PARTSTAT_PARAMETER);
                param = icalparameter_new_partstat (status);
                icalproperty_add_parameter (prop, param);
        } else {


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