[evolution-patches] [Calendar] Patch for 62655



Just throws in a check.

--
Hans Petter
? 62655.patch
? cal.diff
? backends/file/crap
? libical/src/python/Makefile
? libical/src/python/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.308
diff -u -p -r1.308 ChangeLog
--- ChangeLog	10 Aug 2004 15:19:44 -0000	1.308
+++ ChangeLog	12 Aug 2004 00:34:45 -0000
@@ -1,3 +1,10 @@
+2004-08-11  Hans Petter Jansson  <hpj ximian com>
+
+	Fixes bug #62655.
+
+	* backends/contacts/e-cal-backend-contacts.c (source_group_added_cb):
+	If source group's URI is NULL, do nothing, i.e. don't crash.
+
 2004-08-09  Jeffrey Stedfast  <fejj novell com>
 
 	Fixes bug #58150
Index: backends/contacts/e-cal-backend-contacts.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/e-cal-backend-contacts.c,v
retrieving revision 1.12
diff -u -p -r1.12 e-cal-backend-contacts.c
--- backends/contacts/e-cal-backend-contacts.c	16 Jul 2004 21:10:04 -0000	1.12
+++ backends/contacts/e-cal-backend-contacts.c	12 Aug 2004 00:34:46 -0000
@@ -273,12 +273,17 @@ static void
 source_group_added_cb (ESourceList *source_list, ESourceGroup *group, gpointer user_data)
 {
         ECalBackendContacts *cbc = E_CAL_BACKEND_CONTACTS (user_data);
+        const gchar *base_uri;
         GSList *i;
         
         g_return_if_fail (cbc);
 
+        base_uri = e_source_group_peek_base_uri (group);
+        if (!base_uri)
+                return;
+
         /* Load all address books from this group */
-	if (!strncmp (e_source_group_peek_base_uri (group), "file", 4)) {
+	if (!strncmp (base_uri, "file", 4)) {
 		for (i = e_source_group_peek_sources (group); i; i = i->next) {
 			ESource *source = E_SOURCE (i->data);
 			add_source (cbc, source);


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