diff options
author | Michael Meeks <michael.meeks@novell.com> | 2010-05-11 22:42:14 +0800 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-05-11 22:42:14 +0800 |
commit | 69ee9bcccbe42f413c5acf99093f553918991651 (patch) | |
tree | 3b7dd286131087f6b7866ca3abe84b340fe7373a /modules | |
parent | 3cc02e83c7f854e1a088cdc7c8ac53032fedf40d (diff) | |
parent | bde1bc6bca4c5ed63a193f7dc50252e550a0fb40 (diff) | |
download | gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.gz gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.bz2 gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.lz gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.xz gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.zst gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.zip |
Merge commit 'origin/express2' into express2
Diffstat (limited to 'modules')
-rw-r--r-- | modules/calendar/e-cal-shell-view-actions.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 1330ac7003..83f6101d0a 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1196,6 +1196,25 @@ 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 action_event_schedule_appointment_cb (GtkAction *action, ECalShellView *cal_shell_view) @@ -1428,6 +1447,13 @@ static GtkActionEntry calendar_entries[] = { N_("Converts a meeting to an appointment"), G_CALLBACK (action_event_schedule_appointment_cb) }, + { "quit-calendar", + GTK_STOCK_CLOSE, + N_("Quit"), + NULL, + NULL, /* XXX Add a tooltip! */ + G_CALLBACK (quit_calendar_cb) }, + /*** Menus ***/ { "calendar-actions-menu", |