diff options
author | Vincent Sanders <vince@kyllikki.org> | 2015-06-14 20:22:09 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-06-17 21:35:40 +0100 |
commit | 61fdc8fd6ffd24abf007598e33cde58fee2b9a83 (patch) | |
tree | 8953d92d97fabb6039dfcf082a6713a8757dbd19 | |
parent | 8ef292b9caf5cae2197493a87480723138f10344 (diff) | |
download | netsurf-61fdc8fd6ffd24abf007598e33cde58fee2b9a83.tar.gz netsurf-61fdc8fd6ffd24abf007598e33cde58fee2b9a83.tar.bz2 |
update default gtk window icon source to use resources
-rw-r--r-- | gtk/gui.c | 12 | ||||
-rw-r--r-- | gtk/res/netsurf.gresource.xml | 1 | ||||
-rw-r--r-- | gtk/resources.c | 1 |
3 files changed, 9 insertions, 5 deletions
@@ -79,7 +79,8 @@ char *themelist_file_location; char *nsgtk_config_home; /* exported global defined in gtk/gui.h */ -GdkPixbuf *favicon_pixbuf; /* favicon default pixbuf */ +GdkPixbuf *favicon_pixbuf; /** favicon default pixbuf */ +GdkPixbuf *win_default_icon_pixbuf; /** default window icon pixbuf */ GtkBuilder *warning_builder; @@ -281,10 +282,11 @@ static nserror nsgtk_init(int argc, char** argv, char **respath) gtk_builder_connect_signals(warning_builder, NULL); /* set default icon if its available */ - resource_filename = filepath_find(respath, "netsurf.xpm"); - if (resource_filename != NULL) { - gtk_window_set_default_icon_from_file(resource_filename, NULL); - free(resource_filename); + error = nsgdk_pixbuf_new_from_resname("netsurf.xpm", + &win_default_icon_pixbuf); + if (error == NSERROR_OK) { + LOG("Seting default window icon"); + gtk_window_set_default_icon(win_default_icon_pixbuf); } /* Search engine sources */ diff --git a/gtk/res/netsurf.gresource.xml b/gtk/res/netsurf.gresource.xml index fb384a86d..03e4be2f0 100644 --- a/gtk/res/netsurf.gresource.xml +++ b/gtk/res/netsurf.gresource.xml @@ -28,5 +28,6 @@ <file>tabcontents.gtk3.ui</file> <file>warning.gtk2.ui</file> <file>favicon.png</file> + <file>netsurf.xpm</file> </gresource> </gresources> diff --git a/gtk/resources.c b/gtk/resources.c index d4e8b2056..981131d33 100644 --- a/gtk/resources.c +++ b/gtk/resources.c @@ -73,6 +73,7 @@ static struct nsgtk_resource_s ui_resource[] = { static struct nsgtk_resource_s gen_resource[] = { { "favicon.png", 11, NSGTK_RESOURCE_FILE, NULL }, + { "netsurf.xpm", 11, NSGTK_RESOURCE_FILE, NULL }, { NULL, 0, NSGTK_RESOURCE_FILE, NULL }, }; |