Merge branch 'release-1.1' into missy for 1.1.0 v1.1.0

1 files changed, 5 insertions, 1 deletions

diff --git a/badwolf.h b/badwolf.h
index 3d9b7f4..7919be8 100644
--- a/badwolf.h
+++ b/badwolf.h
@@ -2,6 +2,7 @@
 #define BADWOLF_H_INCLUDED
 
 #include <gtk/gtk.h>
+#include <inttypes.h> /* uint64_t */
 #include <webkit2/webkit2.h>
 
 extern const gchar *homepage;
@@ -13,6 +14,8 @@ struct Window
 	GtkWidget *notebook;
 	GtkWidget *new_tab;
 	GtkWidget *downloads_tab;
+	WebKitUserContentManager *content_manager;
+	WebKitUserContentFilterStore *content_store;
 };
 
 struct Client
@@ -26,6 +29,7 @@ struct Client
 	GtkWidget *auto_load_images;
 	GtkWidget *location;
 
+	uint64_t context_id;
 	WebKitWebView *webView;
 	struct Window *window;
 
@@ -37,7 +41,7 @@ struct Client
 GtkWidget *badwolf_new_tab_box(const gchar *title, struct Client *browser);
 void webView_tab_label_change(struct Client *browser, const gchar *title);
 struct Client *
-new_browser(struct Window *window, const gchar *target_url, WebKitWebView *related_web_view);
+new_browser(struct Window *window, const gchar *target_url, struct Client *old_browser);
 int badwolf_new_tab(GtkNotebook *notebook, struct Client *browser, bool auto_switch);
 gint badwolf_get_tab_position(GtkContainer *notebook, GtkWidget *child);
 #endif /* BADWOLF_H_INCLUDED */