diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-04-20 00:22:19 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-20 00:22:19 +0800 |
| commit | 289e749fd74f09772b3b51d9dbe82feba9ff7d44 (patch) | |
| tree | a7a24235077ba69f67f8634d43d5b85f00676fdf | |
| parent | 8505a33d996442ba045333883518d744263ead23 (diff) | |
| parent | f26a82441354513e83f8e47187a65e0a9a7ad955 (diff) | |
| download | gsoc2013-evolution-289e749fd74f09772b3b51d9dbe82feba9ff7d44.tar.gz gsoc2013-evolution-289e749fd74f09772b3b51d9dbe82feba9ff7d44.tar.zst gsoc2013-evolution-289e749fd74f09772b3b51d9dbe82feba9ff7d44.zip | |
Merge commit 'origin/express2' into express2
| -rw-r--r-- | calendar/gui/dialogs/event-page.c | 2 | ||||
| -rw-r--r-- | modules/calendar/e-cal-shell-view-actions.c | 27 |
2 files changed, 1 insertions, 28 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 7627e4af4c..3aa42a48b0 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -825,7 +825,7 @@ sensitize_widgets (EventPage *epage) } else { gtk_widget_show (priv->calendar_label); gtk_widget_show (priv->list_box); - if (e_shell_get_express_mode(e_shell_get_default())) + if (!e_shell_get_express_mode(e_shell_get_default())) gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 339faaa091..1330ac7003 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1197,26 +1197,6 @@ action_event_schedule_cb (GtkAction *action, } 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) { @@ -1448,13 +1428,6 @@ 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", |