From ba948de6b8f1db8c6c97c095830d4c3512405653 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 14 Jan 2020 15:11:54 -0300 Subject: [PATCH] Fixing application settings. --- src/include/pw3270.h | 4 ++-- src/include/pw3270/window.h | 3 +++ src/objects/application/actions/preferences.c | 4 ++-- src/objects/toolbar/settings.c | 7 +++++-- src/objects/window/window.c | 1 - 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/include/pw3270.h b/src/include/pw3270.h index 2000880..936a1b8 100644 --- a/src/include/pw3270.h +++ b/src/include/pw3270.h @@ -61,8 +61,8 @@ GtkWidget * widget; ///< @brief Settings widget. const gchar * label; ///< @brief Page lagel. const gchar * title; ///< @brief Page title. - void (*load)(Pw3270SettingsPage *, GtkApplication *, GSettings *); - void (*apply)(Pw3270SettingsPage *, GtkApplication *, GSettings *); + void (*load)(Pw3270SettingsPage *, GtkApplication *); + void (*apply)(Pw3270SettingsPage *, GtkApplication *); }; void gtk_file_chooser_set_pw3270_filters(GtkFileChooser *chooser); diff --git a/src/include/pw3270/window.h b/src/include/pw3270/window.h index 0db5e57..36a5681 100644 --- a/src/include/pw3270/window.h +++ b/src/include/pw3270/window.h @@ -79,6 +79,9 @@ /// @brief Set window sub-title (If enabled). void pw3270_window_set_subtitle(GtkWidget *window, const gchar *subtitle); + /// @brief Get window settings. + GSettings * pw3270_application_window_settings_new(void); + G_END_DECLS diff --git a/src/objects/application/actions/preferences.c b/src/objects/application/actions/preferences.c index 6c7eda1..b96f33c 100644 --- a/src/objects/application/actions/preferences.c +++ b/src/objects/application/actions/preferences.c @@ -57,7 +57,7 @@ for(page = settings->pages;page;page = page->next) { Pw3270SettingsPage * widget = (Pw3270SettingsPage *) page->data; if(widget->apply) { - widget->apply(widget,GTK_APPLICATION(settings->application),pw3270_application_get_settings(settings->application)); + widget->apply(widget,GTK_APPLICATION(settings->application)); } } @@ -172,7 +172,7 @@ for(page = settings->pages;page;page = page->next) { Pw3270SettingsPage * widget = (Pw3270SettingsPage *) page->data; if(widget->load) { - widget->load(widget,GTK_APPLICATION(settings->application),pw3270_application_get_settings(settings->application)); + widget->load(widget,GTK_APPLICATION(settings->application)); } } diff --git a/src/objects/toolbar/settings.c b/src/objects/toolbar/settings.c index 9316a27..4c78296 100644 --- a/src/objects/toolbar/settings.c +++ b/src/objects/toolbar/settings.c @@ -30,6 +30,7 @@ #include "private.h" #include #include + #include static const struct _comboboxes { const gchar * name; @@ -57,10 +58,11 @@ } ToolbarSettingsPage; - static void load(Pw3270SettingsPage *pg, GtkApplication *application, GSettings *settings) { + static void load(Pw3270SettingsPage *pg, GtkApplication *application) { size_t ix; ToolbarSettingsPage * page = (ToolbarSettingsPage *) pg; + g_autoptr(GSettings) settings = pw3270_application_window_settings_new(); debug("%s",__FUNCTION__); @@ -112,10 +114,11 @@ } - static void apply(Pw3270SettingsPage *pg, GtkApplication G_GNUC_UNUSED(*application), GSettings *settings) { + static void apply(Pw3270SettingsPage *pg, GtkApplication G_GNUC_UNUSED(*application)) { size_t ix; ToolbarSettingsPage * page = (ToolbarSettingsPage *) pg; + g_autoptr(GSettings) settings = pw3270_application_window_settings_new(); debug("%s",__FUNCTION__); diff --git a/src/objects/window/window.c b/src/objects/window/window.c index 69f9156..dff020f 100644 --- a/src/objects/window/window.c +++ b/src/objects/window/window.c @@ -35,7 +35,6 @@ static void get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); - static GSettings *pw3270_application_window_settings_new(void); G_DEFINE_TYPE(pw3270ApplicationWindow, pw3270ApplicationWindow, GTK_TYPE_APPLICATION_WINDOW); -- libgit2 0.21.2