evolution-webcal r444 - in trunk: . src

[dobey svn gnome org]

Author: dobey
Date: Wed Aug 27 02:36:33 2008
New Revision: 444
URL: http://svn.gnome.org/viewvc/evolution-webcal?rev=444&view=rev

Log:
2008-08-26  Rodney Dawes  <dobey pwns gmail com>

	* configure.ac:
	Define HANDLE_LIBECAL_MEMORY to avoid the warning message

	* src/evolution-webcal-main.c (e_webcal_load):
	Free the name and description when LIBICAL_MEMFIXES is defined



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/evolution-webcal-main.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Aug 27 02:36:33 2008
@@ -28,6 +28,9 @@
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
+# EDS's libical now has an #ifndef and warns about memory management
+AC_DEFINE_UNQUOTED(HANDLE_LIBICAL_MEMORY,, [Handle libical memory])
+
 PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.4 libgnome-2.0 >= 2.14 libgnomeui-2.0 libecal-1.2 >= 1.1.0 libsoup-2.4 >= 2.3.0)
 AC_SUBST(EVOLUTION_WEBCAL_CFLAGS)
 AC_SUBST(EVOLUTION_WEBCAL_LIBS)

Modified: trunk/src/evolution-webcal-main.c
==============================================================================
--- trunk/src/evolution-webcal-main.c	(original)
+++ trunk/src/evolution-webcal-main.c	Wed Aug 27 02:36:33 2008
@@ -40,7 +40,7 @@
   icalcomponent * comp;
   icalproperty * prop;
   gint i, numprops;
-  const gchar * name = NULL, * desc = NULL;
+  gchar * name = NULL, * desc = NULL;
   gboolean has_events, has_tasks;
 
   comp = icalparser_parse_string (body);
@@ -97,6 +97,11 @@
 
   e_webcal_query_user (name, desc, uri, has_events, has_tasks);
 
+#if LIBICAL_MEMFIXES
+  g_free (name);
+  g_free (desc);
+#endif
+
   bonobo_main_quit ();
 }