gnome-terminal r2612 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:38:37 2008
New Revision: 2612
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2612&view=rev

Log:
Small logic fix.


Modified:
   trunk/src/terminal-screen.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:38:37 2008
@@ -270,7 +270,7 @@
 
   screen = gtk_widget_get_screen (widget);
   if (previous_screen != NULL &&
-      (screen != previous_screen || screen == NULL)) {
+      screen != previous_screen) {
     settings = gtk_settings_get_for_screen (previous_screen);
     g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA,
                                           0, 0, NULL, NULL,
@@ -281,7 +281,7 @@
     GTK_WIDGET_CLASS (terminal_screen_parent_class)->screen_changed (widget, previous_screen);
   }
 
-  if (screen == previous_screen)
+  if (screen == previous_screen || screen == NULL)
     return;
 
   settings = gtk_widget_get_settings (widget);