[gnome-calendar] e-cal-data-model: code updated from Evolution
- From: Erick Pérez Castellanos <erickpc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] e-cal-data-model: code updated from Evolution
- Date: Fri, 6 Feb 2015 14:25:53 +0000 (UTC)
commit e942f6c885b0c3fec73a121c5f3aacac1b4012ed
Author: Erick Pérez Castellanos <erick red gmail com>
Date: Wed Feb 4 12:46:21 2015 -0500
e-cal-data-model: code updated from Evolution
src/e-cal-data-model.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/src/e-cal-data-model.c b/src/e-cal-data-model.c
index 2fb09f7..785b56d 100644
--- a/src/e-cal-data-model.c
+++ b/src/e-cal-data-model.c
@@ -1415,13 +1415,19 @@ cal_data_model_view_complete (ECalClientView *view,
LOCK_PROPS ();
client = e_cal_client_view_ref_client (view);
- view_data =
- g_hash_table_lookup (data_model->priv->views, client);
+ if (!client) {
+ UNLOCK_PROPS ();
+ return;
+ }
+
+ view_data = g_hash_table_lookup (data_model->priv->views, client);
+
+ g_clear_object (&client);
+
if (view_data) {
view_data_ref (view_data);
g_warn_if_fail (view_data->view == view);
}
- g_object_unref (client);
UNLOCK_PROPS ();
@@ -1439,6 +1445,8 @@ cal_data_model_view_complete (ECalClientView *view,
view_data->lost_components = NULL;
}
+ cal_data_model_emit_view_state_changed (data_model, view, E_CAL_DATA_MODEL_VIEW_STATE_COMPLETE, 0,
NULL, error);
+
view_data_unlock (view_data);
view_data_unref (view_data);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]