about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--whitelist.c48
-rw-r--r--xxxterm.c50
2 files changed, 48 insertions, 50 deletions
diff --git a/whitelist.c b/whitelist.c
index 3eba38c..4c85e5d 100644
--- a/whitelist.c
+++ b/whitelist.c
@@ -205,6 +205,54 @@ done:
 	return (0);
 }
 
+int
+wl_show(struct tab *t, struct karg *args, char *title, struct domain_list *wl)
+{
+	struct domain		*d;
+	char			*tmp, *body;
+
+	body = g_strdup("");
+
+	/* p list */
+	if (args->i & XT_WL_PERSISTENT) {
+		tmp = body;
+		body = g_strdup_printf("%s<h2>Persistent</h2>", body);
+		g_free(tmp);
+		RB_FOREACH(d, domain_list, wl) {
+			if (d->handy == 0)
+				continue;
+			tmp = body;
+			body = g_strdup_printf("%s%s<br/>", body, d->d);
+			g_free(tmp);
+		}
+	}
+
+	/* s list */
+	if (args->i & XT_WL_SESSION) {
+		tmp = body;
+		body = g_strdup_printf("%s<h2>Session</h2>", body);
+		g_free(tmp);
+		RB_FOREACH(d, domain_list, wl) {
+			if (d->handy == 1)
+				continue;
+			tmp = body;
+			body = g_strdup_printf("%s%s<br/>", body, d->d);
+			g_free(tmp);
+		}
+	}
+
+	tmp = get_html_page(title, body, "", 0);
+	g_free(body);
+	if (wl == &js_wl)
+		load_webkit_string(t, tmp, XT_URI_ABOUT_JSWL);
+	else if (wl == &c_wl)
+		load_webkit_string(t, tmp, XT_URI_ABOUT_COOKIEWL);
+	else
+		load_webkit_string(t, tmp, XT_URI_ABOUT_PLUGINWL);
+	g_free(tmp);
+	return (0);
+}
+
 void
 wl_add(char *str, struct domain_list *wl, int handy)
 {
diff --git a/xxxterm.c b/xxxterm.c
index b885e1c..039774d 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -214,8 +214,6 @@ TAILQ_HEAD(command_list, command_entry);
 
 GtkWidget *	create_button(char *, char *, int);
 
-void		startpage_add(const char *, ...);
-
 void		recalc_tabs(void);
 void		recolor_compact_tabs(void);
 void		set_current_tab(int page_num);
@@ -1966,54 +1964,6 @@ remove_cookie(int index)
 }
 
 int
-wl_show(struct tab *t, struct karg *args, char *title, struct domain_list *wl)
-{
-	struct domain		*d;
-	char			*tmp, *body;
-
-	body = g_strdup("");
-
-	/* p list */
-	if (args->i & XT_WL_PERSISTENT) {
-		tmp = body;
-		body = g_strdup_printf("%s<h2>Persistent</h2>", body);
-		g_free(tmp);
-		RB_FOREACH(d, domain_list, wl) {
-			if (d->handy == 0)
-				continue;
-			tmp = body;
-			body = g_strdup_printf("%s%s<br/>", body, d->d);
-			g_free(tmp);
-		}
-	}
-
-	/* s list */
-	if (args->i & XT_WL_SESSION) {
-		tmp = body;
-		body = g_strdup_printf("%s<h2>Session</h2>", body);
-		g_free(tmp);
-		RB_FOREACH(d, domain_list, wl) {
-			if (d->handy == 1)
-				continue;
-			tmp = body;
-			body = g_strdup_printf("%s%s<br/>", body, d->d);
-			g_free(tmp);
-		}
-	}
-
-	tmp = get_html_page(title, body, "", 0);
-	g_free(body);
-	if (wl == &js_wl)
-		load_webkit_string(t, tmp, XT_URI_ABOUT_JSWL);
-	else if (wl == &c_wl)
-		load_webkit_string(t, tmp, XT_URI_ABOUT_COOKIEWL);
-	else
-		load_webkit_string(t, tmp, XT_URI_ABOUT_PLUGINWL);
-	g_free(tmp);
-	return (0);
-}
-
-int
 toplevel_cmd(struct tab *t, struct karg *args)
 {
 	js_toggle_cb(t->js_toggle, t);