[gedit/zbrown/deteplification-src: 280/633] GeditDocument: use _gedit_settings_peek_editor_settings()

[Zander Brown <zbrown src gnome org>]

commit bb5798202fda15ffc3d19b3d358211477a8acb50
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Apr 27 01:49:14 2020 +0200

    GeditDocument: use _gedit_settings_peek_editor_settings()

 gedit/gedit-document.c | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)
---
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 9a4f8dcb8..f9d42b317 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -224,7 +224,6 @@ gedit_document_dispose (GObject *object)
                priv->file = NULL;
        }
 
-       g_clear_object (&priv->editor_settings);
        g_clear_object (&priv->metadata_info);
        g_clear_object (&priv->search_context);
        g_clear_object (&priv->metadata_manager);
@@ -383,9 +382,11 @@ static void
 gedit_document_constructed (GObject *object)
 {
        GeditDocument *doc = GEDIT_DOCUMENT (object);
-       GeditDocumentPrivate *priv;
+       GeditSettings *settings;
+       GSettings *editor_settings;
 
-       priv = gedit_document_get_instance_private (doc);
+       settings = _gedit_settings_get_singleton ();
+       editor_settings = _gedit_settings_peek_editor_settings (settings);
 
        if (!priv->use_gvfs_metadata)
        {
@@ -397,10 +398,8 @@ gedit_document_constructed (GObject *object)
        }
 
        /* Bind construct properties. */
-       g_settings_bind (priv->editor_settings,
-                        GEDIT_SETTINGS_ENSURE_TRAILING_NEWLINE,
-                        doc,
-                        "implicit-trailing-newline",
+       g_settings_bind (editor_settings, GEDIT_SETTINGS_ENSURE_TRAILING_NEWLINE,
+                        doc, "implicit-trailing-newline",
                         G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
 
        G_OBJECT_CLASS (gedit_document_parent_class)->constructed (object);
@@ -860,15 +859,15 @@ on_location_changed (GtkSourceFile *file,
 static void
 gedit_document_init (GeditDocument *doc)
 {
+       GeditDocumentPrivate *priv = gedit_document_get_instance_private (doc);
        GeditSettings *settings;
        GSettings *editor_settings;
-       GeditDocumentPrivate *priv;
 
        gedit_debug (DEBUG_DOCUMENT);
 
-       priv = gedit_document_get_instance_private (doc);
+       settings = _gedit_settings_get_singleton ();
+       editor_settings = _gedit_settings_peek_editor_settings (settings);
 
-       priv->editor_settings = g_settings_new ("org.gnome.gedit.preferences.editor");
        priv->untitled_number = get_untitled_number ();
        priv->content_type = get_default_content_type ();
        priv->language_set_by_user = FALSE;
@@ -885,26 +884,18 @@ gedit_document_init (GeditDocument *doc)
                                 doc,
                                 0);
 
-       g_settings_bind (priv->editor_settings,
-                        GEDIT_SETTINGS_MAX_UNDO_ACTIONS,
-                        doc,
-                        "max-undo-levels",
+       g_settings_bind (editor_settings, GEDIT_SETTINGS_MAX_UNDO_ACTIONS,
+                        doc, "max-undo-levels",
                         G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
 
-       g_settings_bind (priv->editor_settings,
-                        GEDIT_SETTINGS_SYNTAX_HIGHLIGHTING,
-                        doc,
-                        "highlight-syntax",
+       g_settings_bind (editor_settings, GEDIT_SETTINGS_SYNTAX_HIGHLIGHTING,
+                        doc, "highlight-syntax",
                         G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
 
-       g_settings_bind (priv->editor_settings,
-                        GEDIT_SETTINGS_BRACKET_MATCHING,
-                        doc,
-                        "highlight-matching-brackets",
+       g_settings_bind (editor_settings, GEDIT_SETTINGS_BRACKET_MATCHING,
+                        doc, "highlight-matching-brackets",
                         G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
 
-       settings = _gedit_settings_get_singleton ();
-       editor_settings = _gedit_settings_peek_editor_settings (settings);
        g_signal_connect_object (editor_settings,
                                 "changed::" GEDIT_SETTINGS_SCHEME,
                                 G_CALLBACK (editor_settings_scheme_changed_cb),
@@ -1712,10 +1703,15 @@ gedit_document_set_search_context (GeditDocument          *doc,
 
        if (search_context != NULL)
        {
+               GeditSettings *settings;
+               GSettings *editor_settings;
+
                g_object_ref (search_context);
 
-               g_settings_bind (priv->editor_settings,
-                                GEDIT_SETTINGS_SEARCH_HIGHLIGHTING,
+               settings = _gedit_settings_get_singleton ();
+               editor_settings = _gedit_settings_peek_editor_settings (settings);
+
+               g_settings_bind (editor_settings, GEDIT_SETTINGS_SEARCH_HIGHLIGHTING,
                                 search_context, "highlight",
                                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);