Merge branch 'release-1.0' into missy for v1.0.3 v1.0.3

1 files changed, 5 insertions, 6 deletions

diff --git a/badwolf.c b/badwolf.c
index 184c4a3..5bac0a6 100644
--- a/badwolf.c
+++ b/badwolf.c
@@ -72,9 +72,6 @@ WebViewCb_close(WebKitWebView *webView, gpointer user_data)
 {
 	(void)webView;
 	struct Client *browser = (struct Client *)user_data;
-	GtkNotebook *notebook  = GTK_NOTEBOOK(browser->window->notebook);
-
-	gtk_notebook_remove_page(notebook, gtk_notebook_page_num(GTK_NOTEBOOK(notebook), browser->box));
 
 	gtk_widget_destroy(browser->box);
 
@@ -664,6 +661,8 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat
 	                                                settings,
 	                                                NULL));
 	gtk_widget_set_name(GTK_WIDGET(browser->webView), "browser__webView");
+	g_object_unref(web_context);
+	g_object_unref(settings);
 
 	gtk_box_pack_start(
 	    GTK_BOX(browser->toolbar), GTK_WIDGET(browser->back), FALSE, FALSE, BADWOLF_TOOLBAR_PADDING);
@@ -925,10 +924,10 @@ main(int argc, char *argv[])
 	gtk_window_set_role(GTK_WINDOW(window->main_window), "browser");
 	gtk_window_set_icon_name(GTK_WINDOW(window->main_window), "badwolf");
 
-	GtkCssProvider *css_provider_app = gtk_css_provider_new();
-	gchar *provider_path_app         = g_build_filename(DATADIR, "interface.css", NULL);
+	gchar *provider_path_app = g_build_filename(DATADIR, "interface.css", NULL);
 	if(access(provider_path_app, R_OK) == 0)
 	{
+		GtkCssProvider *css_provider_app = gtk_css_provider_new();
 		gtk_css_provider_load_from_path(css_provider_app, provider_path_app, NULL);
 		gtk_style_context_add_provider_for_screen(
 		    gtk_widget_get_screen(GTK_WIDGET(window->main_window)),
@@ -937,11 +936,11 @@ main(int argc, char *argv[])
 	}
 	g_free(provider_path_app);
 
-	GtkCssProvider *css_provider_user = gtk_css_provider_new();
 	gchar *provider_path_user =
 	    g_build_filename(g_get_user_data_dir(), "badwolf", "interface.css", NULL);
 	if(access(provider_path_user, R_OK) == 0)
 	{
+		GtkCssProvider *css_provider_user = gtk_css_provider_new();
 		gtk_css_provider_load_from_path(css_provider_user, provider_path_user, NULL);
 		gtk_style_context_add_provider_for_screen(
 		    gtk_widget_get_screen(GTK_WIDGET(window->main_window)),