File bgo-347987-eds-crash.patch of Package evolution-data-server

Overview Repositories Revisions Requests Users Attributes Meta

File bgo-347987-eds-crash.patch of Package evolution-data-server

Index: backends/groupwise/e-cal-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise.c,v
retrieving revision 1.182
diff -u -p -r1.182 e-cal-backend-groupwise.c
--- calendar/backends/groupwise/e-cal-backend-groupwise.c	10 Jul 2006 10:35:49 -0000	1.182
+++ calendar/backends/groupwise/e-cal-backend-groupwise.c	21 Jul 2006 07:51:17 -0000
@@ -498,6 +498,7 @@ get_deltas (gpointer handle)
 		GCompareFunc func = NULL;
 		GSList *remove = NULL;
 		char *real_key = NULL;
+		const char *recur_key;
 
 		if (calid->recur_key && calid->ical_id) {
 			const char *rid = NULL;
@@ -511,16 +512,19 @@ get_deltas (gpointer handle)
 			real_key = g_strconcat (calid->recur_key, "@", rid, NULL);
 		}
 		
-		if (!calid->recur_key || real_key) 
+		if (!calid->recur_key || real_key) {
+			recur_key = real_key;
 			func = (GCompareFunc) strcmp;
-		else
+		} else {
+			recur_key = calid->recur_key;
 			func = (GCompareFunc) compare_prefix;
+		}
 
-		if (!(remove = g_slist_find_custom (cache_keys, calid->recur_key ? real_key :
+		if (!(remove = g_slist_find_custom (cache_keys, calid->recur_key ? recur_key :
 						calid->ical_id,  func))) {
 			g_ptr_array_add (uid_array, g_strdup (calid->item_id));
 			needs_to_get = TRUE;
		} else  {
-			cache_keys = g_slist_delete_link (cache_keys, remove);
+			cache_keys = g_slist_remove_link (cache_keys, remove);
		}

Places

File bgo-347987-eds-crash.patch of Package evolution-data-server

Places