From 61fdc8fd6ffd24abf007598e33cde58fee2b9a83 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 14 Jun 2015 20:22:09 +0100 Subject: update default gtk window icon source to use resources --- gtk/gui.c | 12 +++++++----- gtk/res/netsurf.gresource.xml | 1 + gtk/resources.c | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gtk/gui.c b/gtk/gui.c index eb7d2a2cd..90991dae9 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -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 @@ tabcontents.gtk3.ui warning.gtk2.ui favicon.png + netsurf.xpm 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 }, }; -- cgit v1.2.3