From 4a01ef9e7a5864e8e6a098220dcc3a62ae80b13d Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 13 Aug 2013 13:48:53 +0100 Subject: Avoid sslcert_get_tree_flags. --- amiga/sslcert.c | 2 +- amiga/sslcert.h | 1 - amiga/tree.h | 1 - gtk/gui.c | 5 ++--- riscos/sslcert.c | 3 +-- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/amiga/sslcert.c b/amiga/sslcert.c index c07ed0b7d..3c83df138 100644 --- a/amiga/sslcert.c +++ b/amiga/sslcert.c @@ -32,7 +32,7 @@ void gui_cert_verify(nsurl *url, certs, &data); ssl_current_session = data; - ssl_window = ami_tree_create(sslcert_get_tree_flags(), data); + ssl_window = ami_tree_create(TREE_SSLCERT, data); if(!ssl_window) return; ami_tree_open(ssl_window, AMI_TREE_SSLCERT); diff --git a/amiga/sslcert.h b/amiga/sslcert.h index 10078d9bb..e308f6231 100644 --- a/amiga/sslcert.h +++ b/amiga/sslcert.h @@ -18,7 +18,6 @@ #ifndef AMIGA_SSLCERT_H #define AMIGA_SSLCERT_H -#include "desktop/sslcert.h" void ami_ssl_free(struct treeview_window *twin); #endif diff --git a/amiga/tree.h b/amiga/tree.h index 07fa6e305..5371b201f 100755 --- a/amiga/tree.h +++ b/amiga/tree.h @@ -24,7 +24,6 @@ #include "amiga/os3support.h" #include "amiga/gui.h" #include "desktop/tree.h" -#include "desktop/sslcert.h" /* defined in front end code */ extern const char tree_directory_icon_name[]; diff --git a/gtk/gui.c b/gtk/gui.c index 646bd33e9..6e187a1be 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -53,7 +53,6 @@ #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" @@ -793,8 +792,8 @@ void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, 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; diff --git a/riscos/sslcert.c b/riscos/sslcert.c index 9503ae946..4835817da 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -33,7 +33,6 @@ #include "content/fetch.h" #include "content/urldb.h" #include "desktop/browser.h" -#include "desktop/sslcert.h" #include "desktop/sslcert_viewer.h" #include "desktop/gui.h" #include "desktop/tree.h" @@ -152,7 +151,7 @@ void gui_cert_verify(nsurl *url, ssl_current_session = sslcert_window->data; sslcert_window->tv = ro_treeview_create(sslcert_window->pane, - NULL, NULL, sslcert_get_tree_flags()); + NULL, NULL, TREE_SSLCERT); if (sslcert_window->tv == NULL) { LOG(("Failed to allocate treeview")); free(sslcert_window); -- cgit v1.2.3