gnome-panel r11164 - trunk/applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Mon Jun 30 17:44:16 2008
New Revision: 11164
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11164&view=rev

Log:
2008-06-30  Vincent Untz  <vuntz gnome org>

	* calendar-client.c: (get_ical_rid): don't strdup the value returned by
	icaltime_as_ical_string, we already own it (see bug #516408)
	(calendar_appointment_finalize): fix leak


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/calendar-client.c

Modified: trunk/applets/clock/calendar-client.c
==============================================================================
--- trunk/applets/clock/calendar-client.c	(original)
+++ trunk/applets/clock/calendar-client.c	Mon Jun 30 17:44:16 2008
@@ -29,6 +29,7 @@
 
 #include <libintl.h>
 #include <string.h>
+#define HANDLE_LIBICAL_MEMORY
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-recur.h>
@@ -596,7 +597,7 @@
   ical_time = icalproperty_get_recurrenceid (prop);
 
   return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ? 
-    g_strdup (icaltime_as_ical_string (ical_time)) : NULL;
+    icaltime_as_ical_string (ical_time) : NULL;
 }
 
 static char *
@@ -853,6 +854,9 @@
   g_free (appointment->uid);
   appointment->uid = NULL;
 
+  g_free (appointment->rid);
+  appointment->rid = NULL;
+
   g_free (appointment->uri);
   appointment->uri = NULL;