diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-06-13 11:31:23 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-06-17 21:35:40 +0100 |
| commit | 8ef292b9caf5cae2197493a87480723138f10344 (patch) | |
| tree | fa39583104ab806b81f382eb85bc9f5a05331dfd /gtk/preferences.c | |
| parent | 16fbb97dbb1688fd9b6f19546792b4173bc30bf1 (diff) | |
| download | netsurf-8ef292b9caf5cae2197493a87480723138f10344.tar.gz netsurf-8ef292b9caf5cae2197493a87480723138f10344.tar.bz2 | |
Change GTK UI builder handling to use resource API
GTK UI builder resources have till now been exclusively stored on disc
requiring netsurf to ship numerous additional resource files. This
requires going to disc every time a UI action is performed which can
become a lot of unwanted file handling.
GLib/GTK has moved towards GResource handling for such resources
instead. It now seems that migrating to this style of usage is
expected and indeed the only portable way to include pixbufs.
This introduces an API to hide the various implementation details of
how resources are handled from the rest of the codebase.
Diffstat (limited to 'gtk/preferences.c')
| -rw-r--r-- | gtk/preferences.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gtk/preferences.c b/gtk/preferences.c index 9ca8eb759..ba58bc905 100644 --- a/gtk/preferences.c +++ b/gtk/preferences.c @@ -34,6 +34,7 @@ #include "gtk/gui.h" #include "gtk/scaffolding.h" #include "gtk/theme.h" +#include "gtk/resources.h" #include "gtk/preferences.h" /* private prefs */ @@ -1039,9 +1040,9 @@ nsgtk_preferences_dialogPreferences_destroy(GtkDialog *dlg, struct ppref *priv) /* exported interface documented in gtk/preferences.h */ GtkWidget* nsgtk_preferences(struct browser_window *bw, GtkWindow *parent) { - GError *error = NULL; GtkBuilder *preferences_builder; struct ppref *priv = &ppref; + nserror res; priv->bw = bw; /* for setting "current" page */ @@ -1051,17 +1052,12 @@ GtkWidget* nsgtk_preferences(struct browser_window *bw, GtkWindow *parent) return GTK_WIDGET(priv->dialog); } - /* populate builder object */ - preferences_builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(preferences_builder, - glade_file_location->options, - &error)) { - g_warning("Couldn't load builder file: %s", error->message); - g_error_free(error); + res = nsgtk_builder_new_from_resname("options", &preferences_builder); + if (res != NSERROR_OK) { + LOG("Preferences UI builder init failed"); return NULL; } - priv->dialog = gtk_builder_get_object(preferences_builder, "dialogPreferences"); if (priv->dialog == NULL) { |