Added missing elsemerge-to-themes-2-1

8 files changed, 14 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d4cad6ea3..de1cb36d1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -14,7 +14,7 @@ Tue Aug  4 10:59:19 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktable.[ch]: Empty rows/columns of the table
         should not have been marked as being able to shrink.
-	(Fixes prorlem with shrinking scrollbarless GIMP canvases)
+	(Fixes problem with shrinking scrollbarless GIMP canvases)
 
 1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 08a27ab53..b6884eeb1 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -1234,12 +1234,13 @@ gtk_table_size_allocate_init (GtkTable *table)
 	  table->rows[row].expand = FALSE;
 	  table->rows[row].shrink = FALSE;
 	}
-      {
-	if (table->rows[row].need_expand)
-	  table->rows[row].expand = TRUE;
-	if (!table->rows[row].need_shrink)
-	  table->rows[row].shrink = FALSE;
-      }
+      else
+	{
+	  if (table->rows[row].need_expand)
+	    table->rows[row].expand = TRUE;
+	  if (!table->rows[row].need_shrink)
+	    table->rows[row].shrink = FALSE;
+	}
     }
 }