diff options
| author | Harish Krishnaswamy <kharish@novell.com> | 2006-02-09 19:42:40 +0800 |
|---|---|---|
| committer | Harish Krishnaswamy <kharish@src.gnome.org> | 2006-02-09 19:42:40 +0800 |
| commit | c52ad9438e7914262f5e139de155180a635c8943 (patch) | |
| tree | 1d241b9c8fff36f15e166962dd91ea6c1312b514 /calendar | |
| parent | 2cde7b00f9dca4f0adccaae3409f6d8ccfa27a97 (diff) | |
| download | gsoc2013-evolution-c52ad9438e7914262f5e139de155180a635c8943.tar.gz gsoc2013-evolution-c52ad9438e7914262f5e139de155180a635c8943.tar.zst gsoc2013-evolution-c52ad9438e7914262f5e139de155180a635c8943.zip | |
Pass the client along with the id for search to handle cases where the
2006-02-09 Harish Krishnaswamy <kharish@novell.com>
* gui/e-cal-model.c: (e_cal_view_objects_added_cb):
Pass the client along with the id for search to handle
cases where the same backend source has multiple clients
in the view. Remove the FIXME.
svn path=/trunk/; revision=31462
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9251309628..8257a33fd6 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2006-02-09 Harish Krishnaswamy <kharish@novell.com> + + * gui/e-cal-model.c: (e_cal_view_objects_added_cb): + Pass the client along with the id for search to handle + cases where the same backend source has multiple clients + in the view. Remove the FIXME. + 2006-01-09 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> Fixes #329768 diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 3fcd5fbe7a..c3380d0cef 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1237,7 +1237,6 @@ find_client_data (ECalModel *model, ECal *client) return NULL; } -/* FIXME how do we prevent the same UID is different calendars? */ static ECalModelComponent * search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalComponentId *id) { @@ -1358,12 +1357,13 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data ECalModelComponent *comp_data; ECalComponentId *id; ECalComponent *comp = e_cal_component_new (); + ECal *client = e_cal_view_get_client (query); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data)); id = e_cal_component_get_id (comp); /* remove the components if they are already present and re-add them */ - while ((comp_data = search_by_id_and_client (priv, NULL, + while ((comp_data = search_by_id_and_client (priv, client, id))) { int pos; |