aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-03-11 20:02:48 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-03-11 20:02:48 +0800
commit887b0ad8536c0940de0ac053e2da7b2540aa5267 (patch)
treebc1de760762896fc14f1a110c774aaec1fb870d0
parent29e5339298f35383c7925a3c6f71942c8e164634 (diff)
downloadgsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.tar
gsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.tar.gz
gsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.tar.bz2
gsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.tar.lz
gsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.tar.xz
gsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.tar.zst
gsoc2013-evolution-887b0ad8536c0940de0ac053e2da7b2540aa5267.zip
Handling static capability for disabling general send options at the
right palce. Fixes #73501 svn path=/trunk/; revision=29000
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/gui/dialogs/event-page.c11
-rw-r--r--calendar/gui/dialogs/task-page.c9
-rw-r--r--widgets/ChangeLog5
-rw-r--r--widgets/misc/e-send-options.c1
5 files changed, 29 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d99d4fbe51..9eb77e13cb 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-11 Sushma Rai <rsushma@novell.com>
+
+ * gui/dialogs/event-page.c (event_page_show_options): Removed the check
+ for general options page static capability. Send options dialog will
+ not be created at this point.
+ (e_sendoptions_clicked_cb): Checking for the general options page
+ static capability, when used clicks send options button.
+
+ * gui/dialogs/task-page.c (task_page_show_options)
+ (e_sendoptions_clicked_cb): Similar.
+ Fixes #73501
+
2005-03-09 Not Zed <NotZed@Ximian.com>
* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
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);
}
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index e7cdc43f73..0f5a28fdff 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-11 Sushma Rai <rsushma@novell.com>
+
+ * misc/e-send-options.c (setup_widgets): Not showing the send options
+ notebook tabs, in case general options page is disabled. Fixes #73501
+
2005-02-09 Hans Petter Jansson <hpj@novell.com>
* e-timezone-dialog/Makefile.am:
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 3be5152ef8..846131ae03 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -472,6 +472,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
priv = sod->priv;
if (!priv->gopts_needed) {
+ gtk_notebook_set_show_tabs (priv->notebook, FALSE);
gtk_notebook_set_current_page (priv->notebook, 1);
gtk_widget_hide (priv->delay_until);
} else