callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't undo reordering if we haven't been reordering. (#346836, Ed Catmur)

Browse Source 
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)
This commit is contained in:
Matthias Clasen
2006-07-17 17:22:31 +00:00
committed by Matthias Clasen
parent da6c726ce0
commit 1f9befb77a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2006-07-17 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special * gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special

5
ChangeLog.pre-2-10
View File

@ -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> 2006-07-17 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special * gdk/quartz/gdkkeys-quartz.c: Add escape to the list of special

5
gtk/gtknotebook.c
View File

@ -2596,7 +2596,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
if (page->reorderable || page->detachable) if (page->reorderable || page->detachable)
{ {
if (!priv->during_detach) if (priv->during_reorder)
{ {
gint old_page_num, page_num; gint old_page_num, page_num;
GList *element; GList *element;
@ -2605,8 +2605,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
old_page_num = g_list_position (notebook->children, notebook->focus_tab); old_page_num = g_list_position (notebook->children, notebook->focus_tab);
page_num = reorder_tab (notebook, element, notebook->focus_tab); page_num = reorder_tab (notebook, element, notebook->focus_tab);
if (priv->has_scrolled || if (priv->has_scrolled || old_page_num != page_num)
old_page_num != page_num)
g_signal_emit (notebook, g_signal_emit (notebook,
notebook_signals[PAGE_REORDERED], 0, notebook_signals[PAGE_REORDERED], 0,
page->child, page_num); page->child, page_num);