gtk+ r20339 - in trunk: . gtk

[bjornl svn gnome org]

Author: bjornl
Date: Sun Jun  8 21:41:16 2008
New Revision: 20339
URL: http://svn.gnome.org/viewvc/gtk+?rev=20339&view=rev

Log:
2008-06-08  BjÃrn Lindqvist  <bjourne gmail com>

	Bug 131920 â gtkNotebook sends incorrect switch_page value

	* gtk/gtknotebook.c (gtk_notebook_real_remove): Make switch-page
	signal send correct page index when page index 0 is active and
	removed. (#131920, Samuel Fogh)


Modified:
   trunk/ChangeLog
   trunk/gtk/gtknotebook.c

Modified: trunk/gtk/gtknotebook.c
==============================================================================
--- trunk/gtk/gtknotebook.c	(original)
+++ trunk/gtk/gtknotebook.c	Sun Jun  8 21:41:16 2008
@@ -4323,9 +4323,11 @@
   priv = GTK_NOTEBOOK_GET_PRIVATE (notebook);
   destroying = GTK_OBJECT_FLAGS (notebook) & GTK_IN_DESTRUCTION;
   
-  next_list = gtk_notebook_search_page (notebook, list, STEP_PREV, TRUE);
+  next_list = gtk_notebook_search_page (notebook, list, STEP_NEXT, TRUE);
   if (!next_list)
-    next_list = gtk_notebook_search_page (notebook, list, STEP_NEXT, TRUE);
+    next_list = gtk_notebook_search_page (notebook, list, STEP_PREV, TRUE);
+
+  notebook->children = g_list_remove_link (notebook->children, list);
 
   if (notebook->cur_page == list->data)
     { 
@@ -4370,7 +4372,6 @@
   if (!page->default_menu)
     g_object_unref (page->menu_label);
   
-  notebook->children = g_list_remove_link (notebook->children, list);
   g_list_free (list);
 
   if (page->last_focus_child)