Size-allocate the embed if it's not mapped but has never been

2004-11-12  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-tab.c: (ephy_tab_size_allocate), (ephy_tab_map):

	Size-allocate the embed if it's not mapped but has never been
	size-allocated before. Fixes bug #156854.

2 files changed, 24 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d2941a634..bc3b93da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2004-11-12  Christian Persch  <chpe@cvs.gnome.org>
 
+	* src/ephy-tab.c: (ephy_tab_size_allocate), (ephy_tab_map):
+
+	Size-allocate the embed if it's not mapped but has never been
+	size-allocated before. Fixes bug #156854.
+
+2004-11-12  Christian Persch  <chpe@cvs.gnome.org>
+
+	* src/ephy-session.c: (ephy_session_autoresume),
+	(ephy_session_close), (ephy_session_save):
+
+2004-11-12  Christian Persch  <chpe@cvs.gnome.org>
+
 	* configure.ac:
 
 	Update gtk+ dependency.
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 94ce6cbfa..b543a60e8 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -260,14 +260,18 @@ ephy_tab_size_allocate (GtkWidget *widget,
 			GtkAllocation *allocation)
 {
 	GtkWidget *child;
+	GtkAllocation invalid = { -1, -1, 1, 1 };
 
 	widget->allocation = *allocation;
 
 	child = GTK_BIN (widget)->child;
 	g_return_if_fail (child != NULL);
 
-	/* only resize if we're mapped (which means we're drawable) */
-	if (GTK_WIDGET_MAPPED (child))
+	/* only resize if we're mapped (bug #128191),
+	 * or if this is the initial size-allocate (bug #156854).
+	 */
+	if (GTK_WIDGET_MAPPED (child) ||
+	    memcmp (&child->allocation, &invalid, sizeof (GtkAllocation)) == 0)
 	{
 		gtk_widget_size_allocate (child, allocation);
 	}
@@ -285,8 +289,13 @@ ephy_tab_map (GtkWidget *widget)
 
 	/* we do this since the window might have been resized while this
 	 * tab wasn't mapped (i.e. was a non-active tab during the resize).
+	 * See bug #156854.
 	 */
-	gtk_widget_size_allocate (child, &widget->allocation);
+	if (memcmp (&widget->allocation, &child->allocation,
+	    sizeof (GtkAllocation)) != 0)
+	{
+		gtk_widget_size_allocate (child, &widget->allocation);
+	}
 
 	GTK_WIDGET_CLASS (parent_class)->map (widget);	
 }