aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/gui/widgets/ea-minicard-view.c7
-rw-r--r--calendar/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/dialogs/send-comp.c8
-rw-r--r--calendar/gui/e-calendar-view.c20
-rw-r--r--calendar/gui/e-day-view.c1
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c3
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 0362b3cf91..d1592df69e 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 3b2b1e489a..4cab17fc3c 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 5f76785c34..70dd372400 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 70c4dd5a8d..9344d9ff1e 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 e8a36869c4..65f3855b0d 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 196e519ca3..f8d982a681 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);