From a8e8c4612266db75e1f1a7a489ba3545215eb02f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Nov 2011 17:53:17 +0100 Subject: Bug #664018 - Cannot create task/memo from a mail --- plugins/mail-to-task/mail-to-task.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index f028528575..29329d284e 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -1070,7 +1070,6 @@ mail_to_event (ECalClientSourceType source_type, CamelFolder *folder; GPtrArray *uids; ESourceList *source_list = NULL; - gboolean done = FALSE; GSList *groups, *p; ESource *source = NULL, *default_source = NULL; GError *error = NULL; @@ -1103,7 +1102,7 @@ mail_to_event (ECalClientSourceType source_type, /* Find 'Default' source. When no source is default, ask user to pick one */ groups = e_source_list_peek_groups (source_list); - for (p = groups; p != NULL && !done; p = p->next) { + for (p = groups; p != NULL; p = p->next) { ESourceGroup *group = E_SOURCE_GROUP (p->data); GSList *sources, *q; @@ -1113,8 +1112,6 @@ mail_to_event (ECalClientSourceType source_type, if (s && e_source_get_property (s, "default") && !e_source_get_readonly (s)) { default_source = s; - done = TRUE; - break; } if (s && !e_source_get_readonly (s)) { @@ -1124,7 +1121,7 @@ mail_to_event (ECalClientSourceType source_type, } } - if (!default_source && writable_sources > 1) { + if (writable_sources > 1) { GtkWidget *dialog; /* ask the user which tasks list to save to */ @@ -1142,7 +1139,7 @@ mail_to_event (ECalClientSourceType source_type, gtk_widget_destroy (dialog); } else if (!source && default_source) { source = default_source; - } else { + } else if (!source) { e_notice (NULL, GTK_MESSAGE_ERROR, _("No writable calendar is available.")); g_object_unref (source_list); -- cgit v1.2.3 From 10376436225014326f7cd55f14f4b26c245a3198 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Nov 2011 18:38:26 +0100 Subject: Bug #663615 - Saving calendar duplicates the first event --- plugins/save-calendar/csv-format.c | 2 +- plugins/save-calendar/ical-format.c | 2 +- plugins/save-calendar/rdf-format.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins') 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 c93eb1fb59..968a9d6496 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -259,7 +259,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; -- cgit v1.2.3