[gedit/zbrown/deteplification-src: 232/633] GeditApp: remove _gedit_app_get_settings()

[Zander Brown <zbrown src gnome org>]

commit c9094356ae3ced7f7b0a8624d61b5aa5ef485cb3
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Mar 24 18:45:46 2020 +0100

    GeditApp: remove _gedit_app_get_settings()
    
    Since GeditSettings is now a singleton.

 gedit/gedit-app-private.h        | 3 ---
 gedit/gedit-app.c                | 7 -------
 gedit/gedit-preferences-dialog.c | 4 +---
 gedit/gedit-view.c               | 4 +---
 4 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/gedit/gedit-app-private.h b/gedit/gedit-app-private.h
index 1325191b9..e9c58cc27 100644
--- a/gedit/gedit-app-private.h
+++ b/gedit/gedit-app-private.h
@@ -23,7 +23,6 @@
 
 #include "gedit-app.h"
 #include "gedit-metadata-manager.h"
-#include "gedit-settings.h"
 #include "gedit-menu-extension.h"
 
 G_BEGIN_DECLS
@@ -38,8 +37,6 @@ void                   _gedit_app_set_default_print_settings  (GeditApp         *app,
 
 GeditMetadataManager   *_gedit_app_get_metadata_manager        (GeditApp  *app);
 
-GeditSettings          *_gedit_app_get_settings                (GeditApp  *app);
-
 GMenuModel             *_gedit_app_get_hamburger_menu          (GeditApp  *app);
 
 GMenuModel             *_gedit_app_get_notebook_menu           (GeditApp  *app);
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 4da4301e4..ae3f35a53 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -1596,13 +1596,6 @@ _gedit_app_set_default_print_settings (GeditApp         *app,
        priv->print_settings = g_object_ref (settings);
 }
 
-GeditSettings *
-_gedit_app_get_settings (GeditApp *app)
-{
-       g_return_val_if_fail (GEDIT_IS_APP (app), NULL);
-
-       return _gedit_settings_get_singleton ();
-}
 
 GeditMetadataManager *
 _gedit_app_get_metadata_manager (GeditApp *app)
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index aca126765..95cc98e4d 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -39,8 +39,6 @@
 #include "gedit-settings.h"
 #include "gedit-utils.h"
 #include "gedit-file-chooser-dialog.h"
-#include "gedit-app.h"
-#include "gedit-app-private.h"
 
 /*
  * gedit-preferences dialog is a singleton since we don't
@@ -453,7 +451,7 @@ setup_font_colors_page_font_section (GeditPreferencesDialog *dlg)
                         _("Click on this button to select the font to be used by the editor"));
 
        /* Get values */
-       settings = _gedit_app_get_settings (GEDIT_APP (g_application_get_default ()));
+       settings = _gedit_settings_get_singleton ();
        system_font = gedit_settings_get_system_font (settings);
 
        label = g_strdup_printf(_("_Use the system fixed width font (%s)"),
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 9ff201164..8a1cee7b2 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -31,8 +31,6 @@
 #include "gedit-pango.h"
 #include "gedit-utils.h"
 #include "gedit-settings.h"
-#include "gedit-app.h"
-#include "gedit-app-private.h"
 
 #define GEDIT_VIEW_SCROLL_MARGIN 0.02
 
@@ -1006,7 +1004,7 @@ gedit_view_set_font (GeditView   *view,
                GeditSettings *settings;
                gchar *font;
 
-               settings = _gedit_app_get_settings (GEDIT_APP (g_application_get_default ()));
+               settings = _gedit_settings_get_singleton ();
                font = gedit_settings_get_system_font (settings);
 
                view->priv->font_desc = pango_font_description_from_string (font);