aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-07-28 10:39:37 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-07-28 10:39:37 +0800
commit8fe17523da287ebf38278da806b4be6b3b838d15 (patch)
tree394adf4c97e066014f8f94bb9640f46493505762 /calendar/gui
parent08f6274a49e4eaf478dfb6d50463f69ff67c62d7 (diff)
downloadgsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.tar
gsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.tar.gz
gsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.tar.bz2
gsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.tar.lz
gsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.tar.xz
gsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.tar.zst
gsoc2013-evolution-8fe17523da287ebf38278da806b4be6b3b838d15.zip
Miscellaneous cleanups.
Diffstat (limited to 'calendar/gui')
-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
3 files changed, 14 insertions, 15 deletions
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)