[evolution/gnome-3-8] Add a boolean return to e_cal_model_remove_client().

[Matthew Barnes <mbarnes src gnome org>]

commit a02dba5e8cb5d2d41d7dc3d5b45453deca836b82
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 1 10:06:47 2013 -0400

    Add a boolean return to e_cal_model_remove_client().
    
    The function now returns TRUE if the ECalClient was actually removed
    from the model, or FALSE if the model did not have the ECalClient.
    
    Use this to avoid an unnecessary gnome_calendar_update_query() call
    in cal_shell_view_selector_client_removed().
    
    (cherry picked from commit 2aa759bc58ea8e14dd1d28a9d7f23e2f5f627c3f)

 calendar/gui/e-cal-model.c                  |   19 ++++++++++++++++---
 calendar/gui/e-cal-model.h                  |    2 +-
 modules/calendar/e-cal-shell-view-private.c |    5 ++---
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index b9c4d84..a682d39 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -3298,21 +3298,34 @@ remove_client (ECalModel *model,
 
 /**
  * e_cal_model_remove_client
+ * @model: an #ECalModel
+ * @client: an #ECalClient
+ *
+ * Removes @client from @model along with its internal #ECalClientView.
+ *
+ * If @model does not have @client then the function does nothing and
+ * returns %FALSE.
+ *
+ * Returns: %TRUE is @client was remove, %FALSE if @model did not have it
  */
-void
+gboolean
 e_cal_model_remove_client (ECalModel *model,
                            ECalClient *client)
 {
        ClientData *client_data;
+       gboolean removed = FALSE;
 
-       g_return_if_fail (E_IS_CAL_MODEL (model));
-       g_return_if_fail (E_IS_CAL_CLIENT (client));
+       g_return_val_if_fail (E_IS_CAL_MODEL (model), FALSE);
+       g_return_val_if_fail (E_IS_CAL_CLIENT (client), FALSE);
 
        client_data = cal_model_clients_lookup (model, client);
        if (client_data != NULL) {
                remove_client (model, client_data);
                client_data_unref (client_data);
+               removed = TRUE;
        }
+
+       return removed;
 }
 
 /**
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 19c89a7..c07a073 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -249,7 +249,7 @@ void                e_cal_model_set_default_client  (ECalModel *model,
 GList *                e_cal_model_list_clients        (ECalModel *model);
 gboolean       e_cal_model_add_client          (ECalModel *model,
                                                 ECalClient *cal_client);
-void           e_cal_model_remove_client       (ECalModel *model,
+gboolean       e_cal_model_remove_client       (ECalModel *model,
                                                 ECalClient *cal_client);
 void           e_cal_model_remove_all_clients  (ECalModel *model);
 void           e_cal_model_get_time_range      (ECalModel *model,
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 37e686e..7e578b7 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -350,9 +350,8 @@ cal_shell_view_selector_client_removed_cb (ECalShellView *cal_shell_view,
        calendar = e_cal_shell_content_get_calendar (cal_shell_content);
        model = gnome_calendar_get_model (calendar);
 
-       e_cal_model_remove_client (model, client);
-
-       gnome_calendar_update_query (calendar);
+       if (e_cal_model_remove_client (model, client))
+               gnome_calendar_update_query (calendar);
 }
 
 static void