diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-17 17:22:31 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-17 17:22:31 +0000 |
| commit | 1f9befb77a49bcf1444b0f6d4c9b9edb1d38869f (patch) | |
| tree | ba3b5c51341b4c10f799fec5d767f0a36d3718b8 | |
| parent | da6c726ce02633b3cf0fb5086fff44ac3e819b3b (diff) | |
| download | gtk+-1f9befb77a49bcf1444b0f6d4c9b9edb1d38869f.tar.gz | |
Don't undo reordering if we haven't been reordering. (#346836, Ed Catmur)
2006-07-17 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_stop_reorder): Don't undo
reordering if we haven't been reordering. (#346836, Ed Catmur)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 5 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2006-07-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Don't undo + reordering if we haven't been reordering. (#346836, Ed Catmur) + 2006-07-17 Richard Hult <richard@imendio.com> * gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 622233257b..e20795822d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-07-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Don't undo + reordering if we haven't been reordering. (#346836, Ed Catmur) + 2006-07-17 Richard Hult <richard@imendio.com> * gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index c032a89238..9ecd0806b0 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2596,7 +2596,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook) if (page->reorderable || page->detachable) { - if (!priv->during_detach) + if (priv->during_reorder) { gint old_page_num, page_num; GList *element; @@ -2605,8 +2605,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook) old_page_num = g_list_position (notebook->children, notebook->focus_tab); page_num = reorder_tab (notebook, element, notebook->focus_tab); - if (priv->has_scrolled || - old_page_num != page_num) + if (priv->has_scrolled || old_page_num != page_num) g_signal_emit (notebook, notebook_signals[PAGE_REORDERED], 0, page->child, page_num); |