gnome-terminal r3379 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu Mar 19 13:48:52 2009
New Revision: 3379
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3379&view=rev

Log:
Move GTK_WIDGET_REALIZED check up. After that, we know the
TerminalWindow containing the screen is still alive, so accessing it
is ok. Might explain bug #574776.

Modified:
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu Mar 19 13:48:52 2009
@@ -1197,8 +1197,6 @@
   GtkWidget *popup_menu, *im_menu, *im_menu_item;
   GtkAction *action;
   gboolean can_paste, can_paste_uris, show_link, show_email_link, show_call_link, show_input_method_menu;
-  
-  remove_popup_info (window);
 
   if (!GTK_WIDGET_REALIZED (info->screen))
     {
@@ -1206,6 +1204,9 @@
       return;
     }
 
+  /* Now we know that the screen is realized, we know that the window is still alive */
+  remove_popup_info (window);
+
   priv->popup_info = info; /* adopt the ref added when requesting the clipboard */
 
   can_paste = targets != NULL && gtk_targets_include_text (targets, n_targets);