[gedit] GeditApp: remove _gedit_app_get_settings()
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] GeditApp: remove _gedit_app_get_settings()
- Date: Tue, 24 Mar 2020 17:59:19 +0000 (UTC)
commit 3b68de5cb451dd47421386d974d33247a5b5878f
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 | 8 --------
gedit/gedit-preferences-dialog.c | 4 +---
gedit/gedit-view.c | 4 +---
4 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/gedit/gedit-app-private.h b/gedit/gedit-app-private.h
index 44cf65429..6e1278a3b 100644
--- a/gedit/gedit-app-private.h
+++ b/gedit/gedit-app-private.h
@@ -22,7 +22,6 @@
#define GEDIT_APP_PRIVATE_H
#include "gedit-app.h"
-#include "gedit-settings.h"
#include "gedit-menu-extension.h"
G_BEGIN_DECLS
@@ -35,8 +34,6 @@ GtkPrintSettings *_gedit_app_get_default_print_settings (GeditApp *app);
void _gedit_app_set_default_print_settings (GeditApp *app,
GtkPrintSettings *settings);
-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 e7ccfc878..50e3938ac 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -1584,14 +1584,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 ();
-}
-
GMenuModel *
_gedit_app_get_hamburger_menu (GeditApp *app)
{
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index 98c0099fb..e21fc5ff4 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
@@ -446,7 +444,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]