Unset the during_reorder flag. (#348049, Sven Herzberg, patch by Benjamin

2006-07-21  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
        the during_reorder flag.  (#348049, Sven Herzberg, patch
        by Benjamin Otte)

diff --git a/ChangeLog b/ChangeLog
index 0531f95208fb4dce25517081007b42a5cbc8f66b..f3fdacf5320c5048242d9825f0c19f4e3a327084 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
+       the during_reorder flag.  (#348049, Sven Herzberg, patch
+       by Benjamin Otte)
+
 2006-07-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_destroy): Just remove the scroll

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0531f95208fb4dce25517081007b42a5cbc8f66b..f3fdacf5320c5048242d9825f0c19f4e3a327084 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
+       the during_reorder flag.  (#348049, Sven Herzberg, patch
+       by Benjamin Otte)
+
 2006-07-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_destroy): Just remove the scroll

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9ecd0806b01d4021d041061a5290af58b2e0f6ee..9cd57ccfd2c38c1eb0080c50bd046b08e9c97039 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2611,6 +2611,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
                           page->child, page_num);
 
          priv->has_scrolled = FALSE;
+          priv->during_reorder = FALSE; 
        }
 
       hide_drag_window (notebook, priv, page);