diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 02:43:37 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 02:43:37 +0800 |
| commit | 1097c5c115b0bb0dbff5a388ec86944beca381ca (patch) | |
| tree | 7a13a2a3b9d96060cdb691c59e151972dafc9a5c /modules | |
| parent | c9ec8c3f4dce2b02c91268529977770364ef87fe (diff) | |
| download | gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.tar gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.tar.gz gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.tar.bz2 gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.tar.lz gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.tar.xz gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.tar.zst gsoc2013-evolution-1097c5c115b0bb0dbff5a388ec86944beca381ca.zip | |
Some post-merge cleanup.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/calendar/e-cal-shell-view-actions.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 19812751d8..16b5ecfb34 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1228,31 +1228,13 @@ action_event_schedule_cb (GtkAction *action, edit_event_as (cal_shell_view, TRUE); } - static void -quit_calendar_cb (GtkAction *action, - ECalShellView *cal_shell_view) -{ - EShellView *shell_view; - EShellWindow *shell_window; - GdkEvent *event; - - shell_view = E_SHELL_VIEW (cal_shell_view); - shell_window = e_shell_view_get_shell_window (shell_view); - - /* Synthesize a delete_event on this window. */ - event = gdk_event_new (GDK_DELETE); - event->any.window = g_object_ref (((GtkWidget *) shell_window)->window); - event->any.send_event = TRUE; - gtk_main_do_event (event); - gdk_event_free (event); -} - static void quit_calendar_cb (GtkAction *action, - ECalShellView *cal_shell_view) + ECalShellView *cal_shell_view) { EShellView *shell_view; EShellWindow *shell_window; + GdkWindow *window; GdkEvent *event; shell_view = E_SHELL_VIEW (cal_shell_view); @@ -1260,7 +1242,8 @@ quit_calendar_cb (GtkAction *action, /* Synthesize a delete_event on this window. */ event = gdk_event_new (GDK_DELETE); - event->any.window = g_object_ref (gtk_widget_get_window (GTK_WIDGET (shell_window))); + window = gtk_widget_get_window (GTK_WIDGET (shell_window)); + event->any.window = g_object_ref (window); event->any.send_event = TRUE; gtk_main_do_event (event); gdk_event_free (event); @@ -1269,7 +1252,7 @@ quit_calendar_cb (GtkAction *action, static void action_event_schedule_appointment_cb (GtkAction *action, - ECalShellView *cal_shell_view) + ECalShellView *cal_shell_view) { edit_event_as (cal_shell_view, FALSE); } |