diff options
author | Vincent Sanders <vince@kyllikki.org> | 2019-08-15 23:02:04 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2019-08-15 23:02:04 +0100 |
commit | 01f3879b647e69684ef8cbcc53f44b2c9b7b5df8 (patch) | |
tree | 52d332866e4d87fd6dda1d7ebf133d1007683271 /frontends/gtk/window.c | |
parent | 44f3846727d35ab17be3f779caa4a33548cdc152 (diff) | |
download | netsurf-01f3879b647e69684ef8cbcc53f44b2c9b7b5df8.tar.gz netsurf-01f3879b647e69684ef8cbcc53f44b2c9b7b5df8.tar.bz2 |
Move favicon from url entry widget to notebook tab label
Diffstat (limited to 'frontends/gtk/window.c')
-rw-r--r-- | frontends/gtk/window.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c index e6581c7eb..766ae4173 100644 --- a/frontends/gtk/window.c +++ b/frontends/gtk/window.c @@ -35,6 +35,7 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/nsoption.h" +#include "utils/messages.h" #include "netsurf/content.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" @@ -136,11 +137,6 @@ struct nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g) return g->scaffold; } -GdkPixbuf *nsgtk_get_icon(struct gui_window *gw) -{ - return gw->icon; -} - struct browser_window *nsgtk_get_browser_window(struct gui_window *g) { return g->bw; @@ -720,8 +716,8 @@ static void window_destroy(GtkWidget *widget, gpointer data) */ static struct gui_window * gui_window_create(struct browser_window *bw, - struct gui_window *existing, - gui_window_create_flags flags) + struct gui_window *existing, + gui_window_create_flags flags) { struct gui_window *g; /* what is being created to return */ bool tempback; @@ -865,7 +861,7 @@ gui_window_create(struct browser_window *bw, tempback = true; break; } - nsgtk_tab_add(g, g->container, tempback); + nsgtk_tab_add(g, g->container, tempback, messages_get("NewTab"), g->icon); /* safe to drop the reference to the tab_builder as the container is * referenced by the notebook now. @@ -918,7 +914,8 @@ static void gui_window_destroy(struct gui_window *g) * \param gw gtk gui window to set favicon on. * \param icon A handle to the new favicon content. */ -static void gui_window_set_icon(struct gui_window *gw, struct hlcache_handle *icon) +static void +gui_window_set_icon(struct gui_window *gw, struct hlcache_handle *icon) { struct bitmap *icon_bitmap = NULL; @@ -942,7 +939,7 @@ static void gui_window_set_icon(struct gui_window *gw, struct hlcache_handle *ic gw->icon = favicon_pixbuf; } - nsgtk_scaffolding_set_icon(gw); + nsgtk_tab_set_icon(gw, gw->icon); } static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy) |