[gedit] GeditSettings: minor code change, improve get_system_font()
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] GeditSettings: minor code change, improve get_system_font()
- Date: Tue, 24 Nov 2020 17:49:29 +0000 (UTC)
commit 878ceb98854e4dcbc0fb8b7adff959aea314d993
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Nov 24 18:25:03 2020 +0100
GeditSettings: minor code change, improve get_system_font()
gedit/gedit-preferences-dialog.c | 2 +-
gedit/gedit-settings.c | 4 ++--
gedit/gedit-settings.h | 3 ++-
gedit/gedit-view.c | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index ce6c0e2da..016baf189 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -434,7 +434,7 @@ setup_font_colors_page_font_section (GeditPreferencesDialog *dlg)
/* Get values */
settings = _gedit_settings_get_singleton ();
- system_font = gedit_settings_get_system_font (settings);
+ system_font = _gedit_settings_get_system_font (settings);
label = g_strdup_printf(_("_Use the system fixed width font (%s)"),
system_font);
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index bfbfbf938..ea7518cb6 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -295,11 +295,11 @@ _gedit_settings_peek_file_chooser_state_settings (GeditSettings *self)
}
gchar *
-gedit_settings_get_system_font (GeditSettings *self)
+_gedit_settings_get_system_font (GeditSettings *self)
{
g_return_val_if_fail (GEDIT_IS_SETTINGS (self), NULL);
- return g_settings_get_string (self->settings_interface, "monospace-font-name");
+ return g_settings_get_string (self->settings_interface, GEDIT_SETTINGS_SYSTEM_FONT);
}
static gboolean
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index 82a885319..7d8433f66 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -43,7 +43,8 @@ GSettings * _gedit_settings_peek_editor_settings (GeditSettings *self);
G_GNUC_INTERNAL
GSettings * _gedit_settings_peek_file_chooser_state_settings (GeditSettings *self);
-gchar * gedit_settings_get_system_font (GeditSettings *self);
+G_GNUC_INTERNAL
+gchar * _gedit_settings_get_system_font (GeditSettings *self);
GSList * gedit_settings_get_candidate_encodings (gboolean *default_candidates);
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 01f2b1183..b996cd44b 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -777,7 +777,7 @@ _gedit_view_set_font (GeditView *view,
gchar *system_font_str;
settings = _gedit_settings_get_singleton ();
- system_font_str = gedit_settings_get_system_font (settings);
+ system_font_str = _gedit_settings_get_system_font (settings);
tepl_utils_override_font (GTK_WIDGET (view), system_font_str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]