From 1257b0d78251d35c907932d30c2eb8ae3e2e3eb0 Mon Sep 17 00:00:00 2001
From: Jesse Pavel <jpavel@src.gnome.org>
Date: Tue, 21 Nov 2000 19:40:14 +0000
Subject: Fixed size allocation bug.

svn path=/trunk/; revision=6634
---
 calendar/ChangeLog                |  8 ++++++
 calendar/gui/e-itip-control.c     | 12 ---------
 calendar/gui/e-itip-control.glade | 55 +++++++++------------------------------
 3 files changed, 21 insertions(+), 54 deletions(-)

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e5bdf9696c..b0c8420f5d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-21   Jesse Pavel   <jpavel@helixcode.com>
+
+	* gui/e-itip-control.c: fixed the stupid Bonobo widget size
+	allocation bug that had been vexing me.
+
+	* gui/e-itip-control.glade: I removed some hacks that were
+	necessary for said size bug.
+
 2000-11-16   Jesse Pavel   <jpavel@helixcode.com>
 
 	* gui/e-itip-control.c, gui/e-meeting-edit.c: added cancellation
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index fc93489618..e545f326be 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -123,16 +123,6 @@ itip_control_destroy_cb (GtkObject *object,
 	g_free (priv);
 }
 	
-static void
-itip_control_size_request_cb (GtkWidget *widget, GtkRequisition *requisition)
-{
-
-	/* gtk_widget_set (GTK_WIDGET (widget), "width", DEFAULT_WIDTH, NULL); */
-	/* gtk_widget_set (GTK_WIDGET (widget), "height", DEFAULT_HEIGHT, NULL); */
-	requisition->width = DEFAULT_WIDTH;
-	requisition->height = DEFAULT_HEIGHT;
-}
-
 
 static void
 cal_loaded_cb (GtkObject *object, CalClientGetStatus status, gpointer data)
@@ -1010,8 +1000,6 @@ e_itip_control_factory (BonoboGenericFactory *Factory, void *closure)
 
 	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "destroy",
 			    GTK_SIGNAL_FUNC (itip_control_destroy_cb), priv);
-	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "size_request",
-			    GTK_SIGNAL_FUNC (itip_control_size_request_cb), priv);
 
 	gtk_widget_show (priv->main_frame);
 
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
index 481874368a..eb950139a1 100644
--- a/calendar/gui/e-itip-control.glade
+++ b/calendar/gui/e-itip-control.glade
@@ -381,10 +381,14 @@
 	  </widget>
 
 	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox3</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
+	    <class>GtkScrolledWindow</class>
+	    <name>scrolledwindow3</name>
+	    <border_width>3</border_width>
+	    <width>365</width>
+	    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
+	    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
 	    <child>
 	      <padding>0</padding>
 	      <expand>True</expand>
@@ -392,44 +396,11 @@
 	    </child>
 
 	    <widget>
-	      <class>GtkScrolledWindow</class>
-	      <name>scrolledwindow3</name>
-	      <border_width>3</border_width>
-	      <width>365</width>
-	      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkText</class>
-		<name>message_text</name>
-		<can_focus>True</can_focus>
-		<editable>False</editable>
-		<text></text>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label></label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
+	      <class>GtkText</class>
+	      <name>message_text</name>
+	      <can_focus>True</can_focus>
+	      <editable>False</editable>
+	      <text></text>
 	    </widget>
 	  </widget>
 
-- 
cgit v1.2.3