Author: juha
Date: 2007-10-15 19:36:09 +0000 (Mon, 15 Oct 2007)
New Revision: 26133
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/ical-code.c
Log:
Fixed core dump when closing event-list and updating appointment after that.
Minor cleaning.
Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c 2007-10-15 18:30:14 UTC (rev 26132)
+++ xfcalendar/trunk/src/appointment.c 2007-10-15 19:36:09 UTC (rev 26133)
@@ -1061,8 +1061,11 @@
if (ok) {
apptw->appointment_new = FALSE;
mark_appointment_unchanged(apptw);
+ /* FIXME: This fails if event_list window has been removed.
+ * We should check that it really still exists, before calling this.
if (apptw->el != NULL)
refresh_el_win((el_win *)apptw->el);
+ */
orage_mark_appointments();
}
}
@@ -1128,8 +1131,11 @@
xfical_file_close(TRUE);
}
+ /* FIXME: This fails if event_list window has been removed.
+ * We should check that it really still exists, before calling this.
if (apptw->el != NULL)
refresh_el_win((el_win *)apptw->el);
+ */
orage_mark_appointments();
app_free_memory(apptw);
Modified: xfcalendar/trunk/src/event-list.c
===================================================================
--- xfcalendar/trunk/src/event-list.c 2007-10-15 18:30:14 UTC (rev 26132)
+++ xfcalendar/trunk/src/event-list.c 2007-10-15 19:36:09 UTC (rev 26133)
@@ -101,8 +101,8 @@
model = gtk_tree_view_get_model(view);
if (gtk_tree_model_get_iter(model, &iter, path)) {
- gtk_tree_model_get(model, &iter, COL_UID, &uid, -1);
- gtk_tree_model_get(model, &iter, COL_FLAGS, &flags, -1);
+ gtk_tree_model_get(model, &iter
+ , COL_UID, &uid, COL_FLAGS, &flags, -1);
if (flags && flags[3] == 'A') {
xfical_unarchive_uid(uid);
/* note that file id changes after archive */
@@ -111,6 +111,7 @@
}
apptw = create_appt_win("UPDATE", uid, el);
g_free(uid);
+ g_free(flags);
}
}
Modified: xfcalendar/trunk/src/ical-code.c
===================================================================
--- xfcalendar/trunk/src/ical-code.c 2007-10-15 18:30:14 UTC (rev 26132)
+++ xfcalendar/trunk/src/ical-code.c 2007-10-15 19:36:09 UTC (rev 26133)
@@ -744,13 +744,6 @@
return(xfical_internal_file_open(&x_ical, &x_fical, file_name, TRUE));
}
-/*
- * guint = g_timeout_add(30*1000, (GtkFunction)orage_foreign_files_check,
NULL);
- * if (tune->timeout_id) {
- * g_source_remove(tune->timeout_id);
- * tune->timeout_id = 0;
- * }
- * */
gboolean delayed_file_close(gpointer user_data)
{
#undef P_N
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
