diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
| commit | 00e495279937c6495d6fab99fe7f89583859ecd1 (patch) | |
| tree | 34b9779e6406e44a646bd8bf65a66dc55654f51a /plugins/save-calendar | |
| parent | 0c83b9b25d967ce6d6793ef851e86bc272a2f129 (diff) | |
| parent | f3abed7ac2c6099dbf5fd3e7c2483b6d75a637b5 (diff) | |
| download | gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.gz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.bz2 gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.lz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.xz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.zst gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.zip | |
Merge branch 'master' into wip/gsettings
Conflicts:
mail/e-mail-paned-view.c
Diffstat (limited to 'plugins/save-calendar')
| -rw-r--r-- | plugins/save-calendar/csv-format.c | 2 | ||||
| -rw-r--r-- | plugins/save-calendar/ical-format.c | 2 | ||||
| -rw-r--r-- | plugins/save-calendar/rdf-format.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index d80ee25753..f9d97fcf68 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -414,7 +414,7 @@ do_save_calendar_csv (FormatHandler *handler, } for (iter = objects; iter; iter = iter->next) { - ECalComponent *comp = objects->data; + ECalComponent *comp = iter->data; gchar *delimiter_temp = NULL; const gchar *temp_constchar; GSList *temp_list; diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index f323fed99a..1be8ff1147 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -128,7 +128,7 @@ do_save_calendar_ical (FormatHandler *handler, tdata.client = source_client; for (iter = objects; iter; iter = iter->next) { - icalcomponent *icalcomp = objects->data; + icalcomponent *icalcomp = iter->data; icalcomponent_foreach_tzid (icalcomp, insert_tz_comps, &tdata); icalcomponent_add_component (top_level, icalcomp); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index fe2e6d0a1a..d840177dfe 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -255,7 +255,7 @@ do_save_calendar_rdf (FormatHandler *handler, xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0"); for (iter = objects; iter; iter = iter->next) { - ECalComponent *comp = objects->data; + ECalComponent *comp = iter->data; const gchar *temp_constchar; gchar *tmp_str = NULL; GSList *temp_list; |