gnome-terminal r2497 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Mar 19 18:14:26 2008
New Revision: 2497
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2497&view=rev

Log:
Also update the tabs menu sensitivity when the notebook tabs were reordered
with the mouse.


Modified:
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Mar 19 18:14:26 2008
@@ -688,7 +688,7 @@
 }
 
 static void
-update_tabs_menu_sensitivity (TerminalWindow *window)
+terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
   GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook);
@@ -1266,6 +1266,9 @@
                           G_CALLBACK (notebook_page_added_callback), window);
   g_signal_connect_after (priv->notebook, "page-removed",
                           G_CALLBACK (notebook_page_removed_callback), window);
+  g_signal_connect_data (priv->notebook, "page-reordered",
+                         G_CALLBACK (terminal_window_update_tabs_menu_sensitivity),
+                         window, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER);
   
   gtk_box_pack_end (GTK_BOX (main_vbox), priv->notebook, TRUE, TRUE, 0);
   gtk_widget_show (priv->notebook);
@@ -1928,8 +1931,7 @@
   terminal_widget_set_size (new_widget, old_grid_width, old_grid_height);
 
   terminal_window_set_active (window, screen);
-
-  update_tabs_menu_sensitivity (window);
+  terminal_window_update_tabs_menu_sensitivity (window);
 }
 
 static void
@@ -1972,7 +1974,7 @@
 
   update_notebook (window);
 
-  update_tabs_menu_sensitivity (window);
+  terminal_window_update_tabs_menu_sensitivity (window);
   update_tab_visibility (window, 0);
 
   term = terminal_screen_get_widget (screen);
@@ -2046,7 +2048,7 @@
 
   update_notebook (window);
 
-  update_tabs_menu_sensitivity (window);
+  terminal_window_update_tabs_menu_sensitivity (window);
   update_tab_visibility (window, 0);
 
   pages = priv->terms;
@@ -2586,11 +2588,8 @@
   page_num = gtk_notebook_get_current_page (notebook);
   last_page = gtk_notebook_get_n_pages (notebook) - 1;
   page = gtk_notebook_get_nth_page (notebook, page_num);
-  
 
   gtk_notebook_reorder_child (notebook, page, page_num == 0 ? last_page : page_num - 1);
-
-  update_tabs_menu_sensitivity (window);
 }
 
 static void
@@ -2607,8 +2606,6 @@
   page = gtk_notebook_get_nth_page (notebook, page_num);
   
   gtk_notebook_reorder_child (notebook, page, page_num == last_page ? 0 : page_num + 1);
-
-  update_tabs_menu_sensitivity (window);
 }
 
 /* FIXMEchpe this is bogus bogus! */