summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-05-10 10:22:10 +0100
committerVincent Sanders <vince@kyllikki.org>2014-05-10 10:22:10 +0100
commit16b11e7238dea2c74a713b6f601d5f506bdaadcf (patch)
treed23dab3fc90645ac976b001e09538dbff4017f5f /gtk
parent429d6e20f7989bb65736fb6f0058c33add7b0ac5 (diff)
downloadnetsurf-16b11e7238dea2c74a713b6f601d5f506bdaadcf.tar.gz
netsurf-16b11e7238dea2c74a713b6f601d5f506bdaadcf.tar.bz2
ensure operations tables are registered as early as possible.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gui.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gui.c b/gtk/gui.c
index 3535fb8a9..8e12b7bfd 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -1163,7 +1163,7 @@ int main(int argc, char** argv)
{
char *messages;
nserror ret;
- struct gui_table nsgtk_gui_table = {
+ struct netsurf_table nsgtk_table = {
.browser = &nsgtk_browser_table,
.window = nsgtk_window_table,
.clipboard = nsgtk_clipboard_table,
@@ -1172,6 +1172,11 @@ int main(int argc, char** argv)
.search = nsgtk_search_table,
};
+ ret = netsurf_register(&nsgtk_table);
+ if (ret != NSERROR_OK) {
+ die("NetSurf operation table failed registration");
+ }
+
/* build the common resource path list */
respaths = nsgtk_init_resource("${HOME}/.netsurf/:${NETSURFRES}:"GTK_RESPATH":./gtk/res");
@@ -1206,7 +1211,7 @@ int main(int argc, char** argv)
messages = filepath_find(respaths, "Messages");
/* core initialisation */
- ret = netsurf_init(messages, &nsgtk_gui_table);
+ ret = netsurf_init(messages);
free(messages);
if (ret != NSERROR_OK) {
fprintf(stderr, "NetSurf core failed to initialise (%s)\n",