diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gui.c | 21 | ||||
| -rw-r--r-- | gtk/hotlist.c | 36 | ||||
| -rw-r--r-- | gtk/scaffolding.c | 4 |
3 files changed, 29 insertions, 32 deletions
@@ -53,7 +53,7 @@ #include "desktop/save_complete.h" #include "desktop/save_pdf/pdf_plotters.h" #include "desktop/searchweb.h" -#include "desktop/sslcert.h" +#include "desktop/sslcert_viewer.h" #include "desktop/textinput.h" #include "desktop/tree.h" #include "css/utils.h" @@ -461,8 +461,6 @@ static void gui_init(int argc, char** argv, char **respath) if (nsgtk_hotlist_init(glade_file_location->hotlist) == false) die("Unable to initialise hotlist window.\n"); - sslcert_init(tree_content_icon_name); - /* If there is a url specified on the command line use it */ if (argc > 1) { addr = argv[1]; @@ -663,7 +661,6 @@ void gui_quit(void) nsgtk_cookies_destroy(); nsgtk_history_destroy(); nsgtk_hotlist_destroy(); - sslcert_cleanup(); free(print_options_file_location); free(search_engines_file_location); free(search_default_ico_location); @@ -787,20 +784,20 @@ void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, return; } - data = sslcert_create_session_data(num, url, cb, cbpw); - + sslcert_viewer_create_session_data(num, url, cb, cbpw, certs, + &data); + ssl_current_session = data; + window = GTK_WINDOW(gtk_builder_get_object(builder, "wndSSLProblem")); scrolled = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "SSLScrolled")); drawing_area = GTK_DRAWING_AREA(gtk_builder_get_object(builder, "SSLDrawingArea")); - ssl_window = nsgtk_treeview_create(sslcert_get_tree_flags(), - window, scrolled, drawing_area); + ssl_window = nsgtk_treeview_create(TREE_SSLCERT, window, scrolled, + drawing_area); if (ssl_window == NULL) return; - sslcert_load_tree(nsgtk_treeview_get_tree(ssl_window), certs, data); - accept = GTK_BUTTON(gtk_builder_get_object(builder, "sslaccept")); reject = GTK_BUTTON(gtk_builder_get_object(builder, "sslreject")); @@ -826,7 +823,7 @@ void nsgtk_ssl_accept(GtkButton *w, gpointer data) struct nsgtk_treeview *wnd = session[1]; struct sslcert_session_data *ssl_data = session[2]; - sslcert_accept(ssl_data); + sslcert_viewer_accept(ssl_data); nsgtk_treeview_destroy(wnd); g_object_unref(G_OBJECT(x)); @@ -840,7 +837,7 @@ void nsgtk_ssl_reject(GtkWidget *w, gpointer data) struct nsgtk_treeview *wnd = session[1]; struct sslcert_session_data *ssl_data = session[2]; - sslcert_reject(ssl_data); + sslcert_viewer_reject(ssl_data); nsgtk_treeview_destroy(wnd); g_object_unref(G_OBJECT(x)); diff --git a/gtk/hotlist.c b/gtk/hotlist.c index d249d3444..834699a1d 100644 --- a/gtk/hotlist.c +++ b/gtk/hotlist.c @@ -17,7 +17,7 @@ */ -#include "desktop/hotlist.h" +#include "desktop/hotlist_old.h" #include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/tree.h" @@ -121,7 +121,7 @@ bool nsgtk_hotlist_init(const char *glade_file_location) "hotlistDrawingArea")); - hotlist_window = nsgtk_treeview_create(hotlist_get_tree_flags(), window, + hotlist_window = nsgtk_treeview_create(hotlist_old_get_tree_flags(), window, scrolled, drawing_area); if (hotlist_window == NULL) @@ -133,7 +133,7 @@ bool nsgtk_hotlist_init(const char *glade_file_location) CONNECT(window, "delete_event", gtk_widget_hide_on_delete, NULL); CONNECT(window, "hide", nsgtk_tree_window_hide, hotlist_window); - hotlist_initialise(nsgtk_treeview_get_tree(hotlist_window), + hotlist_old_initialise(nsgtk_treeview_get_tree(hotlist_window), nsoption_charp(hotlist_path), tree_directory_icon_name); @@ -168,7 +168,7 @@ void nsgtk_hotlist_init_menu(void) void nsgtk_hotlist_destroy(void) { /* TODO: what about gladeFile? */ - hotlist_cleanup(nsoption_charp(hotlist_path)); + hotlist_old_cleanup(nsoption_charp(hotlist_path)); nsgtk_treeview_destroy(hotlist_window); } @@ -194,7 +194,7 @@ MENUHANDLER(export) gchar *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(save_dialog)); - hotlist_export(filename); + hotlist_old_export(filename); g_free(filename); } @@ -205,80 +205,80 @@ MENUHANDLER(export) MENUHANDLER(new_folder) { - hotlist_add_folder(true); + hotlist_old_add_folder(true); return TRUE; } MENUHANDLER(new_entry) { - hotlist_add_entry(true); + hotlist_old_add_entry(true); return TRUE; } /* edit menu */ MENUHANDLER(edit_selected) { - hotlist_edit_selected(); + hotlist_old_edit_selected(); return TRUE; } MENUHANDLER(delete_selected) { - hotlist_delete_selected(); + hotlist_old_delete_selected(); return TRUE; } MENUHANDLER(select_all) { - hotlist_select_all(); + hotlist_old_select_all(); return TRUE; } MENUHANDLER(clear_selection) { - hotlist_clear_selection(); + hotlist_old_clear_selection(); return TRUE; } /* view menu*/ MENUHANDLER(expand_all) { - hotlist_expand_all(); + hotlist_old_expand_all(); return TRUE; } MENUHANDLER(expand_directories) { - hotlist_expand_directories(); + hotlist_old_expand_directories(); return TRUE; } MENUHANDLER(expand_addresses) { - hotlist_expand_addresses(); + hotlist_old_expand_addresses(); return TRUE; } MENUHANDLER(collapse_all) { - hotlist_collapse_all(); + hotlist_old_collapse_all(); return TRUE; } MENUHANDLER(collapse_directories) { - hotlist_collapse_directories(); + hotlist_old_collapse_directories(); return TRUE; } MENUHANDLER(collapse_addresses) { - hotlist_collapse_addresses(); + hotlist_old_collapse_addresses(); return TRUE; } MENUHANDLER(launch) { - hotlist_launch_selected(true); + hotlist_old_launch_selected(true); return TRUE; } diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index c0736985c..d2aabafb4 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -34,7 +34,7 @@ #include "css/utils.h" #include "desktop/browser_private.h" #include "desktop/local_history.h" -#include "desktop/hotlist.h" +#include "desktop/hotlist_old.h" #include "desktop/gui.h" #include "desktop/netsurf.h" #include "utils/nsoption.h" @@ -1540,7 +1540,7 @@ MULTIHANDLER(addbookmarks) if (bw == NULL || bw->current_content == NULL || hlcache_handle_get_url(bw->current_content) == NULL) return TRUE; - hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content))); + hotlist_old_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content))); return TRUE; } |