[evolution] Miscellaneous cleanups.



commit 8fe17523da287ebf38278da806b4be6b3b838d15
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jul 27 22:39:37 2013 -0400

    Miscellaneous cleanups.

 addressbook/gui/widgets/ea-minicard-view.c |    7 ++++---
 calendar/alarm-notify/alarm-queue.c        |    2 +-
 calendar/gui/dialogs/send-comp.c           |    8 ++++----
 calendar/gui/e-calendar-view.c             |   20 ++++++++++----------
 calendar/gui/e-day-view.c                  |    1 -
 modules/calendar/e-cal-shell-sidebar.c     |    3 ++-
 6 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index 0362b3c..d1592df 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -273,9 +273,10 @@ ea_minicard_view_ref_child (AtkObject *accessible,
        if (index < child_num) {
                if (reflow->items[index] == NULL) {
                        reflow->items[index] = e_reflow_model_incarnate (reflow->model, index, 
GNOME_CANVAS_GROUP (reflow));
-                       g_object_set (reflow->items[index],
-                                     "width", (double) reflow->column_width,
-                                     NULL);
+                       g_object_set (
+                               reflow->items[index],
+                               "width", (double) reflow->column_width,
+                               NULL);
                }
                card = E_MINICARD (reflow->items[index]);
                atk_object = atk_gobject_accessible_for_object (G_OBJECT (card));
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 3b2b1e4..4cab17f 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -1595,7 +1595,7 @@ tray_list_add_new (TrayIconData *data)
 
 static void
 alarm_queue_get_alarm_summary (ECalClient *cal_client,
-                              ECalComponent *comp,
+                               ECalComponent *comp,
                                const ECalComponentAlarmInstance *instance,
                                ECalComponentText *text,
                                ECalComponentAlarm **palarm)
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 5f76785..70dd372 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -248,10 +248,10 @@ send_component_dialog (GtkWindow *parent,
  **/
 GtkResponseType
 send_dragged_or_resized_component_dialog (GtkWindow *parent,
-                                         ECalClient *client,
-                                         ECalComponent *comp,
-                                         gboolean *strip_alarms,
-                                         gboolean *only_new_attendees)
+                                          ECalClient *client,
+                                          ECalComponent *comp,
+                                          gboolean *strip_alarms,
+                                          gboolean *only_new_attendees)
 {
        ECalComponentVType vtype;
        const gchar *id;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 70c4dd5..9344d9f 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1791,14 +1791,14 @@ e_calendar_view_modify_and_send (ECalendarView *cal_view,
 
 gboolean
 e_calendar_view_modify (ECalendarView *cal_view,
-                       ECalComponent *comp,
-                       ECalClient *client,
-                       CalObjModType mod)
+                        ECalComponent *comp,
+                        ECalClient *client,
+                        CalObjModType mod)
 {
        GError *error = NULL;
        gboolean ret;
 
-       g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
+       g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
 
        e_cal_component_commit_sequence (comp);
 
@@ -1819,12 +1819,12 @@ e_calendar_view_modify (ECalendarView *cal_view,
 
 void
 e_calendar_view_send (ECalendarView *cal_view,
-                     ECalComponent *comp,
-                     ECalClient *client,
-                     CalObjModType mod,
-                     GtkWindow *toplevel,
-                     gboolean strip_alarms,
-                     gboolean only_new_attendees)
+                      ECalComponent *comp,
+                      ECalClient *client,
+                      CalObjModType mod,
+                      GtkWindow *toplevel,
+                      gboolean strip_alarms,
+                      gboolean only_new_attendees)
 {
        ESourceRegistry *registry;
        ECalModel *model;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index e8a3686..65f3855 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -8884,7 +8884,6 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
                        } else if (e_cal_component_is_instance (comp))
                                mod = CALOBJ_MOD_THIS;
 
-
                        modified = e_calendar_view_modify (E_CALENDAR_VIEW (day_view), comp, client, mod);
 
                        if (modified && send == GTK_RESPONSE_YES)
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 196e519..f8d982a 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -419,7 +419,8 @@ cal_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
 
        priv = E_CAL_SHELL_SIDEBAR_GET_PRIVATE (shell_sidebar);
 
-       g_signal_handlers_disconnect_by_func (shell_window,
+       g_signal_handlers_disconnect_by_func (
+               shell_window,
                cal_shell_sidebar_restore_state_cb, shell_sidebar);
 
        selector = E_SOURCE_SELECTOR (priv->selector);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]