[evolution-patches] patch for calendar send options (#73501)

[Sushma Rai <rsushma novell com>]

Hi,

Exchange connector doesn't require general options tab.
This patch fixes handling static capability for that.
Please review.

Thanks,
Sushma.

Index: gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.79
diff -u -p -r1.79 event-page.c
--- gui/dialogs/event-page.c	18 Feb 2005 05:41:06 -0000	1.79
+++ gui/dialogs/event-page.c	10 Mar 2005 11:55:16 -0000
@@ -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 *but
 	EventPagePrivate *priv;
 	GtkWidget *toplevel;
 	ESource *source;
-	
+
 	epage = EVENT_PAGE (data);
 	priv = epage->priv;
 
@@ -1629,6 +1625,11 @@ e_sendoptions_clicked_cb (GtkWidget *but
 		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
 		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);
Index: gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.71
diff -u -p -r1.71 task-page.c
--- gui/dialogs/task-page.c	18 Feb 2005 05:41:06 -0000	1.71
+++ gui/dialogs/task-page.c	10 Mar 2005 11:55:31 -0000
@@ -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;
 }
 
@@ -910,6 +906,11 @@ e_sendoptions_clicked_cb (GtkWidget *but
 		priv->sod->data->initialized = TRUE;
 		source = e_source_option_menu_peek_selected  (E_SOURCE_OPTION_MENU (priv->source_selector));
 		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);
Index: misc/e-send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-send-options.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-send-options.c
--- misc/e-send-options.c	12 Jan 2005 14:03:41 -0000	1.4
+++ misc/e-send-options.c	10 Mar 2005 11:55:56 -0000
@@ -472,6 +472,7 @@ setup_widgets (ESendOptionsDialog *sod, 
 	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
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2683
diff -u -r1.2683 ChangeLog
--- calendar/ChangeLog	8 Mar 2005 07:59:01 -0000	1.2683
+++ calendar/ChangeLog	10 Mar 2005 12:08:20 -0000
@@ -1,3 +1,15 @@
+2005-03-10  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-08  Chenthill Palanisamy  <pchenthill novell com>
 
 	Fixes #73141
Index: widgets/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.129
diff -u -r1.129 ChangeLog
--- widgets/ChangeLog	10 Feb 2005 05:34:02 -0000	1.129
+++ widgets/ChangeLog	10 Mar 2005 12:08:41 -0000
@@ -1,3 +1,8 @@
+2005-03-10  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: