From bab4ad240f77663e1b9b8707fcc2ecaf30ca091a Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@novell.com>
Date: Mon, 11 Oct 2004 17:02:40 +0000
Subject: Fixes #45951

2004-10-08  Rodrigo Moya <rodrigo@novell.com>

	Fixes #45951

	* gui/dialogs/event-page.glade:
	* gui/dialogs/task-page.glade: attach the description field correctly
	to the table so that it scrolls correctly instead of making the dialog
	bigger as you write.

	* gui/dialogs/comp-editor.c (setup_widgets): no need to create an extra
	GtkVBox, just use the GtkDialog's one.

svn path=/trunk/; revision=27538
---
 calendar/ChangeLog                    | 12 ++++++++++++
 calendar/gui/dialogs/comp-editor.c    | 10 +---------
 calendar/gui/dialogs/event-page.glade |  4 ++--
 calendar/gui/dialogs/task-page.glade  |  6 +++---
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a06356f4eb..5e7ffb78a1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2004-10-08  Rodrigo Moya <rodrigo@novell.com>
+
+	Fixes #45951
+
+	* gui/dialogs/event-page.glade:
+	* gui/dialogs/task-page.glade: attach the description field correctly
+	to the table so that it scrolls correctly instead of making the dialog
+	bigger as you write.
+
+	* gui/dialogs/comp-editor.c (setup_widgets): no need to create an extra
+	GtkVBox, just use the GtkDialog's one.
+
 2004-10-07  JP Rosevear  <jpr@novell.com>
 
 	* gui/dialogs/cal-prefs-dialog.c: remove useless include
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 8d26689eca..49b0a43715 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -384,21 +384,13 @@ static void
 setup_widgets (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
-	GtkWidget *vbox;
 
 	priv = editor->priv;
 
-	/* Basic vbox */
-	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (vbox);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), vbox,
-			    TRUE, TRUE, 6);
-
 	/* Notebook */
 	priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
 	gtk_widget_show (GTK_WIDGET (priv->notebook));
-	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->notebook),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), GTK_WIDGET (priv->notebook),
 			    TRUE, TRUE, 6);
 
 	/* Buttons */
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index efa8dd4ef6..eef0ef201f 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -205,8 +205,8 @@
 		  <property name="right_attach">2</property>
 		  <property name="top_attach">4</property>
 		  <property name="bottom_attach">5</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options">expand|shrink|fill</property>
 		</packing>
 	      </child>
 
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index e3248afd4b..1b688fe1ab 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -289,7 +289,7 @@
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow1">
 		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -319,8 +319,8 @@
 		  <property name="right_attach">2</property>
 		  <property name="top_attach">3</property>
 		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
+		  <property name="x_options">expand|shrink|fill</property>
+		  <property name="y_options">expand|shrink|fill</property>
 		</packing>
 	      </child>
 
-- 
cgit v1.2.3