From 887b0ad8536c0940de0ac053e2da7b2540aa5267 Mon Sep 17 00:00:00 2001 From: Sushma Rai Date: Fri, 11 Mar 2005 12:02:48 +0000 Subject: Handling static capability for disabling general send options at the right palce. Fixes #73501 svn path=/trunk/; revision=29000 --- calendar/gui/dialogs/event-page.c | 11 ++++++----- calendar/gui/dialogs/task-page.c | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index f659ad71fe..51b11170cd 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -655,10 +655,6 @@ event_page_show_options (EventPage *page) g_return_if_fail (IS_EVENT_PAGE (page)); gtk_widget_show (page->priv->sendoptions_frame); - - if (e_cal_get_static_capability (COMP_EDITOR_PAGE (page)->client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) - e_sendoptions_set_need_general_options (page->priv->sod, FALSE); - page->priv->sendoptions_shown = TRUE; } @@ -1619,7 +1615,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data) EventPagePrivate *priv; GtkWidget *toplevel; ESource *source; - + epage = EVENT_PAGE (data); priv = epage->priv; @@ -1630,6 +1626,11 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data) priv->sod->data->initialized = TRUE; } + if (e_cal_get_static_capability (COMP_EDITOR_PAGE (epage)->client, + CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) { + e_sendoptions_set_need_general_options (priv->sod, FALSE); + } + toplevel = gtk_widget_get_toplevel (priv->main); e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_CALENDAR); } diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 48128c4099..04aca3ebba 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -287,10 +287,6 @@ task_page_show_options (TaskPage *page) g_return_if_fail (IS_TASK_PAGE (page)); gtk_widget_show (page->priv->sendoptions_frame); - - if (e_cal_get_static_capability (COMP_EDITOR_PAGE (page)->client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) - e_sendoptions_set_need_general_options (page->priv->sod, FALSE); - page->priv->sendoptions_shown = TRUE; } @@ -912,6 +908,11 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data) e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } + if (e_cal_get_static_capability (COMP_EDITOR_PAGE (tpage)->client, + CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) { + e_sendoptions_set_need_general_options (priv->sod, FALSE); + } + toplevel = gtk_widget_get_toplevel (priv->main); e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_TASK); } -- cgit