[gnumeric] ItemGrid: fix glib criticals.



commit ecaf8964fe006f41fa0b259139373510bdfe0e95
Author: Morten Welinder <terra gnome org>
Date:   Wed Dec 25 18:49:55 2013 -0500

    ItemGrid: fix glib criticals.
    
    We let a timeout lapse, but didn't update our state to reflect that.
    Later we would then re-remove the source triggering glib criticals.

 ChangeLog       |    5 +++++
 NEWS            |    1 +
 src/item-grid.c |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ffac2ac..c296ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-25  Morten Welinder  <terra gnome org>
+
+       * src/item-grid.c (cb_cursor_come_to_rest): Clear ->tip_timer when
+       we return FALSE so we don't try to remove the source later.
+
 2013-12-22  Morten Welinder  <terra gnome org>
 
        * src/gui-util.c (gnm_widget_measure_string): New function
diff --git a/NEWS b/NEWS
index e38cc0b..99d70c4 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Morten:
        [#715002]
        * Resurrect list of functions on the new Gnumeric wiki.
        * Resurrect support for non-ascii filenames on win32.  [#557815]
+       * Fix timeout related critical in ItemGrid.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.9
diff --git a/src/item-grid.c b/src/item-grid.c
index 7dbaa72..e8e2739 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -1082,6 +1082,7 @@ cb_cursor_come_to_rest (GnmItemGrid *ig)
                }
        }
 
+       ig->tip_timer = 0;
        return FALSE;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]