diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2006-08-15 21:29:20 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2006-08-15 21:29:20 +0000 |
| commit | 8ab966398f67b7945f4d08ac1911beb0abd30657 (patch) | |
| tree | 642e88da0dff1914957095f2e87ff425ece2c31b /gtk/gtk_gui.c | |
| parent | fdbb855a9c38524d9c8feefd38bd3a78d95e1788 (diff) | |
| download | netsurf-8ab966398f67b7945f4d08ac1911beb0abd30657.tar.gz netsurf-8ab966398f67b7945f4d08ac1911beb0abd30657.tar.bz2 | |
Merge new glade nsgtk window code into trunk.
svn path=/trunk/netsurf/; revision=2853
Diffstat (limited to 'gtk/gtk_gui.c')
| -rw-r--r-- | gtk/gtk_gui.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 37fcea4e9..c6ade174f 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -30,6 +30,7 @@ #include "netsurf/gtk/gtk_options.h" #include "netsurf/gtk/gtk_completion.h" #include "netsurf/gtk/options.h" +#include "netsurf/gtk/gtk_throbber.h" #include "netsurf/render/box.h" #include "netsurf/render/form.h" #include "netsurf/render/html.h" @@ -113,6 +114,11 @@ void gui_init(int argc, char** argv) nsgtk_completion_init(); + nsgtk_throbber_initialise("./gtk/throbber.gif"); + + gladeWindows = glade_xml_new("./gtk/netsurf.glade", NULL, NULL); + wndChoices = glade_xml_get_widget(gladeWindows, "wndChoices"); + find_resource(buf, "Choices", "Choices"); LOG(("Using '%s' as Choices file", buf)); options_file_location = strdup(buf); |