** Fix for bug #510409

2008-01-25  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #510409

	* gui/e-memos.c: (obtain_list_of_components):
	* gui/e-tasks.c: (obtain_list_of_components):
	* gui/e-calendar-table.c: (e_calendar_table_copy_clipboard):
	* gui/e-memo-table.c: (e_memo_table_copy_clipboard):
	Do not free memmory owned by libical.
	* gui/e-week-view.c: (e_week_view_reshape_events):
	Free memory before assigning NULL.


svn path=/trunk/; revision=34893

6 files changed, 24 insertions, 4 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7b97236316..7fcec8ff8c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-25  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #510409
+
+	* gui/e-memos.c: (obtain_list_of_components):
+	* gui/e-tasks.c: (obtain_list_of_components):
+	* gui/e-calendar-table.c: (e_calendar_table_copy_clipboard):
+	* gui/e-memo-table.c: (e_memo_table_copy_clipboard):
+	Do not free memmory owned by libical.
+	* gui/e-week-view.c: (e_week_view_reshape_events):
+	Free memory before assigning NULL.
+
 2008-01-25  Tor Lillqvist  <tml@novell.com>
 
 	* gui/Makefile.am (libevolution_calendar_la_LIBADD): Link with
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index e0db8a12a0..3f39d72875 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -873,7 +873,9 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table)
 	if (!gtk_clipboard_set_with_data(clipboard, target_types, n_target_types,
 					 clipboard_get_calendar_cb,
 					 NULL, comp_str)) {
-		g_free (comp_str);
+
+		/* do not free this pointer, it owns libical */
+		/* g_free (comp_str); */
 	} else {
 		gtk_clipboard_set_can_store (clipboard, target_types + 1, n_target_types - 1);
 	}
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 684e819433..b8e55c6aaf 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -602,7 +602,8 @@ e_memo_table_copy_clipboard (EMemoTable *memo_table)
 	if (!gtk_clipboard_set_with_data(clipboard, target_types, n_target_types,
 					 clipboard_get_calendar_cb,
 					 NULL, comp_str)) {
-		g_free (comp_str);
+		/* do not free this pointer, it owns libical */
+		/* g_free (comp_str); */
 	} else {
 		gtk_clipboard_set_can_store (clipboard, target_types + 1, n_target_types - 1);
 	}
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 397e0fd17c..69d1f8db68 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -417,7 +417,9 @@ obtain_list_of_components (gpointer data, gpointer user_data)
 			const char *source_uid = e_source_peek_uid (source);
 
 			*list = g_slist_prepend (*list, g_strdup_printf ("%s\n%s", source_uid, comp_str));
-			g_free (comp_str);
+
+			/* do not free this pointer, it owns libical */
+			/* g_free (comp_str); */
 		}
 
 		icalcomponent_free (vcal);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index acd176a7c2..84a03344df 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -514,7 +514,9 @@ obtain_list_of_components (gpointer data, gpointer user_data)
 			const char *source_uid = e_source_peek_uid (source);
 
 			*list = g_slist_prepend (*list, g_strdup_printf ("%s\n%s", source_uid, comp_str));
-			g_free (comp_str);
+
+			/* do not free this pointer, it owns libical */
+			/* g_free (comp_str); */
 		}
 
 		icalcomponent_free (vcal);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b6254750a9..f638fb9a91 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2518,6 +2518,7 @@ e_week_view_reshape_events (EWeekView *week_view)
 				EWeekViewEventSpan *span;
 				span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
 				e_canvas_item_grab_focus (span->text_item, TRUE);
+				g_free (week_view->last_edited_comp_string);
 				week_view->last_edited_comp_string = NULL;
 			}
 		}