[Pspp-cvs] pspp/src/ui/gui ChangeLog text-data-import-dial...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 08/05/07 00:16:52

Modified files:
        src/ui/gui     : ChangeLog text-data-import-dialog.c 

Log message:
        (get_tooltip_location): Prevent crash when a tooltip is being prepared
        when the assistant is closed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/text-data-import-dialog.c?cvsroot=pspp&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- ChangeLog   7 May 2008 00:10:45 -0000       1.122
+++ ChangeLog   7 May 2008 00:16:51 -0000       1.123
@@ -1,5 +1,13 @@
 2008-05-06  Ben Pfaff  <address@hidden>
 
+       Bug #23127.  Reviewed by John Darrington.  Tested by Jason Stover,
+       in an earlier form.
+
+       * text-data-import-dialog.c (get_tooltip_location): Prevent crash
+       when a tooltip is being prepared when the assistant is closed.
+
+2008-05-06  Ben Pfaff  <address@hidden>
+
        * text-data-import-dialog.c (text_data_import_assistant): Allocate
        the struct import_assistant on the heap instead of the stack, to
        make it easier for memory debuggers such as Valgrind to point out

Index: text-data-import-dialog.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/text-data-import-dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- text-data-import-dialog.c   7 May 2008 00:10:46 -0000       1.2
+++ text-data-import-dialog.c   7 May 2008 00:16:51 -0000       1.3
@@ -1808,6 +1808,19 @@
   GtkTreeModel *tree_model;
   bool ok;
 
+  /* Check that WIDGET is really visible on the screen before we
+     do anything else.  This is a bug fix for a sticky situation:
+     when text_data_import_assistant() returns, it frees the data
+     necessary to compose the tool tip message, but there may be
+     a tool tip under preparation at that point (even if there is
+     no visible tool tip) that will call back into us a little
+     bit later.  Perhaps the correct solution to this problem is
+     to make the data related to the tool tips part of a GObject
+     that only gets destroyed when all references are released,
+     but this solution appears to be effective too. */
+  if (!GTK_WIDGET_MAPPED (widget))
+    return FALSE;
+
   gtk_tree_view_convert_widget_to_bin_window_coords (tree_view,
                                                      wx, wy, &bx, &by);
   if (!gtk_tree_view_get_path_at_pos (tree_view, bx, by,