diff options
| author | Rodrigo Moya <rodrigo@novell.com> | 2004-12-27 21:36:04 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2004-12-27 21:36:04 +0800 |
| commit | dd22d9bacf944cf16ca75231ddd0eb8ed2aa73cf (patch) | |
| tree | ff9ec503841a83fbcba2f8593969f2f5354f56bb /calendar/gui/e-cal-model.c | |
| parent | a5f55d492ee468b7d9be7ab979d4bf7a0c1046c6 (diff) | |
| download | gsoc2013-evolution-dd22d9bacf944cf16ca75231ddd0eb8ed2aa73cf.tar.gz gsoc2013-evolution-dd22d9bacf944cf16ca75231ddd0eb8ed2aa73cf.tar.zst gsoc2013-evolution-dd22d9bacf944cf16ca75231ddd0eb8ed2aa73cf.zip | |
removed superfluous if check. (e_cal_view_objects_modified_cb): add all
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
Diffstat (limited to 'calendar/gui/e-cal-model.c')
| -rw-r--r-- | calendar/gui/e-cal-model.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index edc0c046a3..9d1cf2d0ab 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -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 |