diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-12-31 00:00:54 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-12-31 00:00:54 +0000 |
commit | e0596793e1a1c34786586cb18ee4fc8652ef7c50 (patch) | |
tree | 3e51933e2ea15d3f0cbf235884f5a684efa1d7c8 /gtk/toolbar.c | |
parent | be20f89884da134b09a96f459bd47e4badb0af39 (diff) | |
download | netsurf-e0596793e1a1c34786586cb18ee4fc8652ef7c50.tar.gz netsurf-e0596793e1a1c34786586cb18ee4fc8652ef7c50.tar.bz2 |
load default favicon once
svn path=/trunk/netsurf/; revision=13357
Diffstat (limited to 'gtk/toolbar.c')
-rw-r--r-- | gtk/toolbar.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 3d2fe64cd..7fa2764df 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -704,10 +704,6 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, return GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET( theme->image[HISTORY_BUTTON]), "")); case URL_BAR_ITEM: { - char imagefile[strlen(res_dir_location) + SLEN("favicon.png") - + 1]; - sprintf(imagefile, "%sfavicon.png", res_dir_location); - GdkPixbuf *iconbuf = gdk_pixbuf_new_from_file(imagefile, NULL); GtkWidget *entry = nsgtk_entry_new(); GtkWidget *w = GTK_WIDGET(gtk_tool_item_new()); @@ -716,9 +712,9 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, return NULL; } - if (iconbuf != NULL) { - nsgtk_entry_set_icon_from_pixbuf(entry, GTK_ENTRY_ICON_PRIMARY, iconbuf); - } + nsgtk_entry_set_icon_from_pixbuf(entry, + GTK_ENTRY_ICON_PRIMARY, + favicon_pixbuf); gtk_container_add(GTK_CONTAINER(w), entry); gtk_tool_item_set_expand(GTK_TOOL_ITEM(w), TRUE); |