about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2012-11-28 12:12:58 -0600
committerMarco Peereboom <marco@conformal.com>2012-11-28 12:12:58 -0600
commitdc580c742862482f86e004711fe698a5ba35a370 (patch)
treed7affbfa26230e54dfe5616a1e32c193bc3b2466
parent374f8c06dd04fa1324181f575f12971f5d46eb5f (diff)
downloadxombrero-dc580c742862482f86e004711fe698a5ba35a370.tar.gz
fix icon apearing when http_proxy is set
-rw-r--r--xombrero.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xombrero.c b/xombrero.c
index 97f458d..a88c948 100644
--- a/xombrero.c
+++ b/xombrero.c
@@ -3317,12 +3317,12 @@ proxy_cmd(struct tab *t, struct karg *args)
 		else
 			show_oops(t, "proxy is currently disabled");
 	} else if (args->i & XT_PRXY_TOGGLE) {
-		TAILQ_FOREACH(tt, &tabs, entry)
-			gtk_widget_show(t->proxy_toggle);
 		if (http_proxy_save == NULL && http_proxy == NULL) {
 			show_oops(t, "can't toggle proxy");
 			goto done;
 		}
+		TAILQ_FOREACH(tt, &tabs, entry)
+			gtk_widget_show(t->proxy_toggle);
 		if (http_proxy) {
 			setup_proxy(NULL);
 			button_set_file(t->proxy_toggle, "tordisabled.ico");
@@ -7911,7 +7911,7 @@ create_new_tab(char *title, struct undo *u, int focus, int position)
 	}
 	if (!fancy_bar || (search_string == NULL || strlen(search_string) == 0))
 		gtk_widget_hide(t->search_entry);
-	if (!proxy_uri)
+	if (http_proxy == NULL && http_proxy_save == NULL)
 		gtk_widget_hide(t->proxy_toggle);
 
 	/* compact tab bar */