Return immediately if clist->drag_pos < 0. This is a workaround for the

Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkctree.c (resync_selection):
	* gtk/gtkclist.c (resync_selection):

	Return immediately if clist->drag_pos < 0. This is a workaround
	for the corrupt state that the clist gets into when a
	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().

	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.

	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
	variable from recent commit.

10 files changed, 106 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e41d4a763..a89e8b564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e41d4a763..a89e8b564 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e41d4a763..a89e8b564 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e41d4a763..a89e8b564 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e41d4a763..a89e8b564 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e41d4a763..a89e8b564 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e41d4a763..a89e8b564 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Fri Jan 28 12:28:17 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkctree.c (resync_selection): 
+	* gtk/gtkclist.c (resync_selection):
+
+	Return immediately if clist->drag_pos < 0. This is a workaround
+	for the corrupt state that the clist gets into when a
+	GDK_2BUTTON_PRESS occurs. See note in gtk_clist_button_press().
+
+	Bug #5487, #2051, #2677; fix suggested by David Helder and T. Alexander Popiel.
+	
+	* gtk/gtknotebook.c (gtk_notebook_size_request): Fix uninitialized
+	variable from recent commit.
+
 Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 9d65cad26..248b0a9e2 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -3948,7 +3948,7 @@ resync_selection (GtkCList *clist,
   GList *list;
   GtkCListRow *clist_row;
 
-  if (clist->anchor < 0)
+  if (clist->anchor < 0 || clist->drag_pos < 0)
     return;
 
   gtk_clist_freeze (clist);
@@ -4942,6 +4942,10 @@ gtk_clist_button_press (GtkWidget      *widget,
 	      clist->click_cell.column = column;
 	      clist->drag_button = event->button;
 	    }
+	  /* FIXME FIXME FIXME: The following code is harmful, because it results in the
+	   * necessary cleanup not being done in gtk_clist_button_release()
+	   * when we get a GDK_BUTTON_PRESS GDK_2BUTTON_PRESS GDK_BUTTON_RELEASE sequence.
+	   */
 	  else
 	    {
 	      clist->click_cell.row = -1;
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index d9889d62d..300250dfa 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -5637,7 +5637,7 @@ resync_selection (GtkCList *clist, GdkEvent *event)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CTREE (clist));
 
-  if (clist->anchor < 0)
+  if (clist->anchor < 0 || clist->drag_pos < 0)
     return;
 
   ctree = GTK_CTREE (clist);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 84b5fa689..6605cef4e 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -808,6 +808,8 @@ gtk_notebook_size_request (GtkWidget      *widget,
 	  for (children = notebook->children; children;
 	       children = children->next)
 	    {
+	      page = children->data;
+	      
 	      if (GTK_WIDGET_VISIBLE (page->tab_label))
 		gtk_widget_hide (page->tab_label);
 	    }