[evolution-patches] [Calendar] Fix for http://bugzilla.gnome.org/show_bug.cgi?id=327427



Hi,

Attached patch fixes http://bugzilla.gnome.org/show_bug.cgi?id=327427

ChangeLog explains it all.

Let me know your comments.

Thanks,

V. Varadhan
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.552
diff -u -p -r1.552 ChangeLog
--- calendar/ChangeLog	17 Jan 2006 08:36:44 -0000	1.552
+++ calendar/ChangeLog	18 Jan 2006 16:01:14 -0000
@@ -1,3 +1,9 @@
+2006-01-18  Veerapuram Varadhan <vvaradhan novell com>
+
+	** Fixes #327427
+	* libedata-cal/e-data-cal-factory.c: (impl_CalFactory_getCal): Do
+	not ref a NULL object.
+	
 2006-01-17  Harish Krishnaswamy  <kharish novell com>
 
 	* backends/caldav/Makefile.am: make distcheck
Index: calendar/libedata-cal/e-data-cal-factory.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-data-cal-factory.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-data-cal-factory.c
--- calendar/libedata-cal/e-data-cal-factory.c	7 Oct 2005 08:53:18 -0000	1.15
+++ calendar/libedata-cal/e-data-cal-factory.c	18 Jan 2006 16:01:14 -0000
@@ -138,6 +138,7 @@ impl_CalFactory_getCal (PortableServer_S
 			const GNOME_Evolution_Calendar_CalListener listener,
 			CORBA_Environment *ev)
 {
+	GNOME_Evolution_Calendar_Cal ret_cal = NULL;
 	EDataCalFactory *factory;
 	EDataCalFactoryPrivate *priv;
 	EDataCal *cal = CORBA_OBJECT_NIL;
@@ -233,12 +234,13 @@ impl_CalFactory_getCal (PortableServer_S
 	e_cal_backend_add_client (backend, cal);
 	e_cal_backend_set_mode (backend, priv->mode);
 	
+	ret_cal = CORBA_Object_duplicate (BONOBO_OBJREF (cal), ev);
  cleanup:
 	e_uri_free (uri);
 	g_free (uri_type_string);
 	g_object_unref (source);
 
-	return CORBA_Object_duplicate (BONOBO_OBJREF (cal), ev);
+	return ret_cal;
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]