diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2010-12-14 18:54:20 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2010-12-14 18:54:20 +0000 |
commit | f6b0a33fd286c190814fb9e6c835f27552ad3186 (patch) | |
tree | 23687b1a26c512e8bc735cd0720801c12d57c850 /gtk/gtk_gui.c | |
parent | b550f27f4b62cdf8ec91e416670f7fc4dc60f6e6 (diff) | |
download | netsurf-f6b0a33fd286c190814fb9e6c835f27552ad3186.tar.gz netsurf-f6b0a33fd286c190814fb9e6c835f27552ad3186.tar.bz2 |
make the history, download, hotlist and cookies initialisation actually use the generic glade file finding code instead of their own thing and erroring out.
svn path=/trunk/netsurf/; revision=11055
Diffstat (limited to 'gtk/gtk_gui.c')
-rw-r--r-- | gtk/gtk_gui.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 739462060..7eb9446ca 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -93,10 +93,13 @@ char *glade_warning_file_location; char *glade_login_file_location; char *glade_ssl_file_location; char *glade_toolbar_file_location; -char *glade_downloads_file_location; -char *glade_history_file_location; char *glade_options_file_location; +static char *glade_downloads_file_location; +static char *glade_history_file_location; +static char *glade_hotlist_file_location; +static char *glade_cookies_file_location; + static GtkWindow *nsgtk_warning_window; GtkWidget *widWarning; @@ -323,6 +326,8 @@ nsgtk_init_glade(char **respath) glade_downloads_file_location = nsgtk_new_glade(respath, "downloads", NULL); glade_history_file_location = nsgtk_new_glade(respath, "history", NULL); glade_options_file_location = nsgtk_new_glade(respath, "options", NULL); + glade_hotlist_file_location = nsgtk_new_glade(respath, "hotlist", NULL); + glade_cookies_file_location = nsgtk_new_glade(respath, "cookies", NULL); glade_warning_file_location = nsgtk_new_glade(respath, "warning", &gladeWarning); nsgtk_warning_window = GTK_WINDOW(glade_xml_get_widget(gladeWarning, "wndWarning")); @@ -492,14 +497,18 @@ static void gui_init(int argc, char** argv, char **respath) urldb_load(option_url_file); urldb_load_cookies(option_cookie_file); - if (nsgtk_history_init() == false) + if (nsgtk_history_init(glade_history_file_location) == false) die("Unable to initialise history window.\n"); - if (nsgtk_download_init() == false) + if (nsgtk_download_init(glade_downloads_file_location) == false) die("Unable to initialise download window.\n"); - nsgtk_cookies_init(); - nsgtk_hotlist_init(); + if (nsgtk_cookies_init(glade_cookies_file_location) == false) + die("Unable to initialise cookies window.\n"); + + if (nsgtk_hotlist_init(glade_hotlist_file_location) == false) + die("Unable to initialise hotlist window.\n"); + sslcert_init(tree_content_icon_name); if (option_homepage_url != NULL && option_homepage_url[0] != '\0') |