[gtksourceview/wip/various-stuff] Revert "Prevent construction of completion after dispose has run"



commit cc857a75bc0c2e0aea7170ddeba5eb9a7d95a13f
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Jan 25 13:23:01 2014 +0100

    Revert "Prevent construction of completion after dispose has run"
    
    This reverts commit 89382601e772c0504ae7e5f709399f4dd3b0d291.
    
    It was used in get_completion() to prevent the creation of
    GtkSourceCompletion if dispose() has already run. But if
    get_completion() is called in such a (rare) situation, it means that
    GtkSourceView is still alive, and that dispose() will anyway be run a
    second time, where g_clear_object() will clear the completion object a
    second time if needed.

 gtksourceview/gtksourceview.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 98193a1..78ad85f 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -163,7 +163,6 @@ struct _GtkSourceViewPrivate
        guint            show_right_margin  : 1;
        guint            style_scheme_applied : 1;
        guint            current_line_color_set : 1;
-       guint            dispose_has_run : 1;
 };
 
 typedef struct _MarkCategory MarkCategory;
@@ -986,8 +985,6 @@ gtk_source_view_dispose (GObject *object)
        g_clear_object (&view->priv->left_gutter);
        g_clear_object (&view->priv->right_gutter);
 
-       view->priv->dispose_has_run = 1;
-
        G_OBJECT_CLASS (gtk_source_view_parent_class)->dispose (object);
 }
 
@@ -4269,7 +4266,7 @@ gtk_source_view_get_completion (GtkSourceView *view)
 {
        g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL);
 
-       if (view->priv->completion == NULL && !view->priv->dispose_has_run)
+       if (view->priv->completion == NULL)
        {
                view->priv->completion = gtk_source_completion_new (view);
        }


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