Remove user_agent_roundrobin knob

ok marco@

4 files changed, 8 insertions, 17 deletions

diff --git a/settings.c b/settings.c
index a9b3517..cf6b59d 100644
--- a/settings.c
+++ b/settings.c
@@ -73,7 +73,6 @@ int		allow_volatile_cookies = 0;
 int		color_visited_uris = 1;
 int		save_global_history = 0; /* save global history to disk */
 struct user_agent	*user_agent = NULL;
-int		user_agent_roundrobin = 0; /* change user-agent after each request */
 int		save_rejected_cookies = 0;
 int		session_autosave = 0;
 int		guess_search = 0;
@@ -120,7 +119,6 @@ int		set_runtime_dir(struct settings *, char *);
 int		set_tab_style(struct settings *, char *);
 int		set_edit_mode(struct settings *, char *);
 int		set_work_dir(struct settings *, char *);
-int		set_ua_roundrobin(char *);
 int		set_auto_load_images(char *value);
 
 void		walk_mime_type(struct settings *, void (*)(struct settings *,
@@ -316,7 +314,6 @@ struct settings		rs[] = {
 	{ "window_maximize",		XT_S_INT, 0,		&window_maximize, NULL, NULL },
 	{ "work_dir",			XT_S_STR, 0, NULL, NULL,&s_work_dir },
 	{ "xterm_workaround",		XT_S_INT, 0,		&xterm_workaround, NULL, NULL },
-	{ "user_agent_roundrobin",	XT_S_INT, 0,		&user_agent_roundrobin, NULL, NULL, NULL, set_ua_roundrobin },
 	{ "auto_load_images",		XT_S_INT, 0, 		&auto_load_images, NULL, NULL, NULL, set_auto_load_images },
 
 	/* font settings */
@@ -997,6 +994,7 @@ add_ua(struct settings *s, char *value)
 
 	/* use the last added user agent */
 	user_agent = TAILQ_FIRST(&ua_list);
+	user_agent_count++;
 
 	return (0);
 }
@@ -1019,13 +1017,6 @@ walk_ua(struct settings *s,
 }
 
 int
-set_ua_roundrobin(char *value)
-{
-	user_agent_roundrobin = atoi(value);
-	return (0);
-}
-
-int
 set_auto_load_images(char *value)
 {
 	struct tab *t;
diff --git a/xxxterm.1 b/xxxterm.1
index b9a405f..71486c4 100644
--- a/xxxterm.1
+++ b/xxxterm.1
@@ -1245,9 +1245,8 @@ URL when using
 .It Cm user_agent
 Set to override the default
 .Nm
-user-agent string. May be specified several times for switching between user-agents.
-.It Cm user_agent_roundrobin
-If enabled, switches between specified user-agents for each new request.
+user-agent string. May be specified several times for switching between
+user-agents.
 .It Cm window_height
 Set the default height of the browser window.
 .It Cm window_width
diff --git a/xxxterm.c b/xxxterm.c
index c396e5e..3ea9c63 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -239,6 +239,7 @@ struct undo_tailq	undos;
 struct keybinding_list	kbl;
 struct sp_list		spl;
 struct user_agent_list	ua_list;
+int			user_agent_count = 0;
 struct command_list	chl;
 struct command_list	shl;
 struct command_entry	*history_at;
@@ -4114,7 +4115,7 @@ webview_npd_cb(WebKitWebView *wv, WebKitWebFrame *wf,
 		t->load_images = FALSE;
 	}
 
-	/* if this is an xtp url, we don't load anything else */
+	/* If this is an xtp url, we don't load anything else. */
 	if (parse_xtp_url(t, uri))
 		    return (TRUE);
 
@@ -4125,8 +4126,8 @@ webview_npd_cb(WebKitWebView *wv, WebKitWebFrame *wf,
 		return (TRUE); /* we made the decission */
 	}
 
-	/* change user agent */
-	if (user_agent_roundrobin ) {
+	/* Change user agent if more than one has been given. */
+	if (user_agent_count > 1) {
 		struct user_agent *ua;
 
 		if ((ua = TAILQ_NEXT(user_agent, entry)) == NULL)
diff --git a/xxxterm.h b/xxxterm.h
index b32d967..d30d986 100644
--- a/xxxterm.h
+++ b/xxxterm.h
@@ -544,7 +544,6 @@ extern int	allow_volatile_cookies;
 extern int	color_visited_uris;
 extern int	save_global_history;
 extern struct user_agent	*user_agent;
-extern int	user_agent_roundrobin;
 extern int	save_rejected_cookies;
 extern int	session_autosave;
 extern int	guess_search;
@@ -597,6 +596,7 @@ extern struct mime_type_list	mtl;
 extern struct keybinding_list	kbl;
 extern struct sp_list		spl;
 extern struct user_agent_list	ua_list;
+extern int			user_agent_count;
 
 extern PangoFontDescription	*cmd_font;
 extern PangoFontDescription	*oops_font;