callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed superfluous if check. (e_cal_view_objects_modified_cb): add all

Browse Source 
2004-12-26  Rodrigo Moya <rodrigo@novell.com>

	* gui/e-cal-model.c (search_by_uid_and_client): removed superfluous if
	check.
	(e_cal_view_objects_modified_cb): add all objects at once.

svn path=/trunk/; revision=28203
This commit is contained in:
Rodrigo Moya
2004-12-27 13:36:04 +00:00
committed by Rodrigo Moya
parent a5f55d492e
commit dd22d9bacf
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/ChangeLog
View File

@ -1,5 +1,9 @@
2004-12-26 Rodrigo Moya <rodrigo@novell.com>
* gui/e-cal-model.c (search_by_uid_and_client): removed superfluous if
check.
(e_cal_view_objects_modified_cb): add all objects at once.
* gui/e-day-view.c (e_day_view_remove_event_cb): set fields we
free to NULL.

10
calendar/gui/e-cal-model.c
View File

@ -1238,7 +1238,7 @@ search_by_uid_and_client (ECalModelPrivate *priv, ECal *client, const char *uid)
tmp_uid = icalcomponent_get_uid (comp_data->icalcomp);
if (tmp_uid && *tmp_uid) {
if ((!client || comp_data->client == client) && !strcmp (uid, tmp_uid))
if (comp_data->client == client && !strcmp (uid, tmp_uid))
return comp_data;
}
}
@ -1384,7 +1384,6 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
for (l = objects; l; l = l->next) {
ECalModelComponent *comp_data;
GList node;
/* remove all recurrences and re-add them after generating them */
while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query),
@ -1397,11 +1396,10 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
g_ptr_array_remove (priv->objects, comp_data);
e_cal_model_free_component_data (comp_data);
}
node.prev = node.next = NULL;
node.data = l->data;
e_cal_view_objects_added_cb (query, &node, model);
}
/* now re-add all objects */
e_cal_view_objects_added_cb (query, objects, model);
}
static void