aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/gui/calendar-commands.c2
-rw-r--r--calendar/gui/e-itip-control.c4
-rw-r--r--calendar/gui/e-meeting-model.c3
4 files changed, 16 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index acb7df00c0..3c725c89da 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2001-09-19 JP Rosevear <jpr@ximian.com>
+
+ * gui/e-meeting-model.c (e_meeting_model_refresh_busy_periods):
+ remove silly debug #if 0
+
+ * gui/calendar-commands.c (publish_freebusy_cmd): g_list_free
+ rather than g_free
+
+ * gui/e-itip-control.c (write_html): eliminate code path that
+ caused double freed memory
+
2001-09-18 JP Rosevear <jpr@ximian.com>
* gui/dialogs/schedule-page.*: A page that shows the meeting time
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 83693bab25..5de5b0091f 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -351,7 +351,7 @@ publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
gtk_object_unref (GTK_OBJECT (comp));
}
- g_free (comp_list);
+ g_list_free (comp_list);
}
}
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 0045ebb0ae..8bbafb8dbd 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -637,7 +637,9 @@ write_html (EItipControl *itip, gchar *itip_desc, gchar *itip_title, gchar *opti
html = g_strdup_printf (itip_desc,
organizer.cn ?
organizer.cn :
- itip_strip_mailto (organizer.value));
+ itip_strip_mailto (organizer.value));
+ else
+ html = g_strdup_printf (itip_desc, "An unknown person");
break;
}
gtk_html_write (GTK_HTML (priv->html), html_stream, html, strlen(html));
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index f492c89a07..35c50c153c 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -1218,7 +1218,6 @@ e_meeting_model_refresh_busy_periods (EMeetingModel *im, EMeetingModelRefreshCal
for (i = 0; i < priv->attendees->len; i++)
g_ptr_array_index (not_found, i) = g_ptr_array_index (priv->attendees, i);
-#if 0
/* Check the server for free busy data */
if (priv->client) {
GList *fb_data, *users = NULL, *l;
@@ -1260,7 +1259,7 @@ e_meeting_model_refresh_busy_periods (EMeetingModel *im, EMeetingModelRefreshCal
process_free_busy (im, ia, cal_component_get_as_string (comp));
}
}
-#endif
+
/* Look for fburl's of attendee with no free busy info on server */
if (!priv->book_loaded) {
priv->book_load_wait = TRUE;