aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-cal-model.c
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-09-03 02:44:00 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-09-03 02:44:00 +0800
commitf8374109ac06f8c0528dcf27f214f26c5d2aaf8d (patch)
tree6f433c6f52d6f71cc54e4852c0866c8982e1ecb8 /calendar/gui/e-cal-model.c
parent8c122d342656c0cad8babf4cb26796256b636fb4 (diff)
downloadgsoc2013-evolution-f8374109ac06f8c0528dcf27f214f26c5d2aaf8d.tar.gz
gsoc2013-evolution-f8374109ac06f8c0528dcf27f214f26c5d2aaf8d.tar.zst
gsoc2013-evolution-f8374109ac06f8c0528dcf27f214f26c5d2aaf8d.zip
** Fix for bug #471791 (Move away from asserts to g_ret*)
svn path=/trunk/; revision=34156
Diffstat (limited to 'calendar/gui/e-cal-model.c')
-rw-r--r--calendar/gui/e-cal-model.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index eb069760d4..a86c893cc6 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -202,7 +202,10 @@ clear_objects_array (ECalModelPrivate *priv)
ECalModelComponent *comp_data;
comp_data = g_ptr_array_index (priv->objects, i);
- g_assert (comp_data != NULL);
+ if (comp_data == NULL) {
+ g_warning ("comp_data is null\n");
+ continue;
+ }
e_cal_model_free_component_data (comp_data);
}
@@ -441,7 +444,7 @@ ecm_value_at (ETableModel *etm, int col, int row)
g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
comp_data = g_ptr_array_index (priv->objects, row);
- g_assert (comp_data != NULL);
+ g_return_val_if_fail (comp_data != NULL, NULL);
switch (col) {
case E_CAL_MODEL_FIELD_CATEGORIES :
@@ -679,7 +682,7 @@ ecm_set_value_at (ETableModel *etm, int col, int row, const void *value)
g_return_if_fail (row >= 0 && row < priv->objects->len);
comp_data = g_ptr_array_index (priv->objects, row);
- g_assert (comp_data != NULL);
+ g_return_if_fail (comp_data != NULL);
switch (col) {
case E_CAL_MODEL_FIELD_CATEGORIES :
@@ -1171,10 +1174,12 @@ e_cal_model_set_default_client (ECalModel *model, ECal *client)
if (priv->default_client) {
client_data = find_client_data (model, priv->default_client);
- g_assert (client_data);
-
- if (!client_data->do_query)
- remove_client (model, client_data);
+ if (!client_data) {
+ g_warning ("client_data is NULL\n");
+ } else {
+ if (!client_data->do_query)
+ remove_client (model, client_data);
+ }
}
/* Make sure its in the model */
@@ -1499,7 +1504,7 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data)
}
/* prepare the query */
- g_assert (priv->full_sexp != NULL);
+ g_return_if_fail (priv->full_sexp != NULL);
/* Don't create the new query if we won't use it */
if (!client_data->do_query)
@@ -1551,7 +1556,7 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data)
g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, cal_opened_cb, model);
client_data = find_client_data (model, client);
- g_assert (client_data);
+ g_return_if_fail (client_data);
update_e_cal_view_for_client (model, client_data);
}
@@ -1620,7 +1625,7 @@ remove_client_objects (ECalModel *model, ECalModelClient *client_data)
for (i = model->priv->objects->len; i > 0; i--) {
ECalModelComponent *comp_data = (ECalModelComponent *) g_ptr_array_index (model->priv->objects, i - 1);
- g_assert (comp_data != NULL);
+ g_return_if_fail (comp_data != NULL);
if (comp_data->client == client_data->client) {
e_table_model_pre_change (E_TABLE_MODEL (model));