gnome-terminal r2493 - trunk/src

[chpe svn gnome org]

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

Log:
Remove selection_changed_callback, and just connect the signal swapped
directly to terminal_window_update_copy_sensitivity.


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:13:46 2008
@@ -627,7 +627,7 @@
 /* Actions stuff */
 
 static void
-update_copy_sensitivity (TerminalWindow *window)
+terminal_window_update_copy_sensitivity (TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
   GtkAction *action;
@@ -1565,13 +1565,6 @@
     gdk_window_set_icon_name (GTK_WIDGET (window)->window, terminal_screen_get_icon_title (screen));
 }
 
-static void
-selection_changed_callback (TerminalScreen *screen,
-                            TerminalWindow *window)
-{
-  update_copy_sensitivity (window);
-}
-
 /* Notebook callbacks */
 
 static void
@@ -1905,11 +1898,10 @@
 #endif
   terminal_window_set_size (window, screen, TRUE);
   
-  update_copy_sensitivity (window);
-  
   terminal_window_update_set_profile_menu (window); /* FIXMEchpe no need to do this, just update the current profile action's active state! */
   terminal_window_update_new_terminal_menus (window);
   terminal_window_update_encoding_menu (window);
+  terminal_window_update_copy_sensitivity (window);
   terminal_window_update_zoom_sensitivity (window);
 }
 
@@ -1986,10 +1978,10 @@
                     G_CALLBACK (icon_title_changed_callback),
                     window);
 
-  g_signal_connect (G_OBJECT (screen),
-                    "selection-changed",
-                    G_CALLBACK (selection_changed_callback),
-                    window);
+  g_signal_connect_swapped (G_OBJECT (screen),
+                            "selection-changed",
+                            G_CALLBACK (terminal_window_update_copy_sensitivity),
+                            window);
 
   g_signal_connect (screen, "show-popup-menu",
                     G_CALLBACK (screen_show_popup_menu_callback), window);
@@ -2059,7 +2051,7 @@
                                         window);
 
   g_signal_handlers_disconnect_by_func (G_OBJECT (screen),
-                                        G_CALLBACK (selection_changed_callback),
+                                        G_CALLBACK (terminal_window_update_copy_sensitivity),
                                         window);
 
   g_signal_handlers_disconnect_by_func (screen,