From 374f8c06dd04fa1324181f575f12971f5d46eb5f Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@conformal.com>
Date: Wed, 28 Nov 2012 11:48:04 -0600
Subject: [PATCH] add tor icon toggle for proxy

requested by many
---
 Makefile           |   2 ++
 dragonfly/Makefile |   2 ++
 freebsd/Makefile   |   2 ++
 linux/Makefile     |   2 ++
 netbsd/Makefile    |   2 ++
 settings.c         |   7 +++++--
 tordisabled.ico    | Bin 0 -> 1150 bytes
 torenabled.ico     | Bin 0 -> 1150 bytes
 xombrero.c         |  22 ++++++++++++++++++----
 xombrero.h         |   1 +
 10 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 tordisabled.ico
 create mode 100644 torenabled.ico

diff --git a/Makefile b/Makefile
index ff7a81c..6ef1886 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,8 @@ beforeinstall:
 	install -m 644 ${.CURDIR}/hsts-preload ${PREFIX}/share/xombrero
 	install -m 644 ${.CURDIR}/user-agent-headers ${PREFIX}/share/xombrero
 	install -m 644 ${.CURDIR}/http-accept-headers ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/torenabled.ico ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/tordisabled.ico ${PREFIX}/share/xombrero
 
 ${PROG} ${OBJS} beforedepend: javascript.h tooltip.h
 
diff --git a/dragonfly/Makefile b/dragonfly/Makefile
index f203f27..f438f1f 100644
--- a/dragonfly/Makefile
+++ b/dragonfly/Makefile
@@ -81,6 +81,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 clean:
 	rm -f xombrero *.o
diff --git a/freebsd/Makefile b/freebsd/Makefile
index f6f27a0..8723232 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -79,6 +79,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 clean:
 	rm -f xombrero *.o
diff --git a/linux/Makefile b/linux/Makefile
index d7ccf3b..3c9bcf5 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -73,6 +73,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/xombrero
diff --git a/netbsd/Makefile b/netbsd/Makefile
index dc9f564..7118caa 100644
--- a/netbsd/Makefile
+++ b/netbsd/Makefile
@@ -81,6 +81,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 clean:
 	rm -f xombrero *.o
diff --git a/settings.c b/settings.c
index 0fcc262..a43a117 100644
--- a/settings.c
+++ b/settings.c
@@ -3027,10 +3027,13 @@ setup_proxy(char *uri)
 				gtk_label_set_text(GTK_LABEL(t->sbe.proxy),
 				    "proxy");
 				gtk_widget_show(t->proxy_toggle);
-				button_set_stockid(t->proxy_toggle,
-				    GTK_STOCK_CONNECT);
+				button_set_file(t->proxy_toggle,
+				    "torenabled.ico");
 			}
 		}
+	} else {
+		TAILQ_FOREACH(t, &tabs, entry)
+			button_set_file(t->proxy_toggle, "tordisabled.ico");
 	}
 }
 
diff --git a/tordisabled.ico b/tordisabled.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5c3d7390c2a0f7937e3f17ed860f74f15fffd84a
GIT binary patch
literal 1150
zcwSwTX-HII6o%i)#%)FnY?MT%albQWR%+#hmSS4brZsBRShT3LQqo5IVi2tsR*F=F
zKN6F$KM|Ojv_KRTEe2AQQ9p{nf{5}uZ|6F9=+<|6hReC<IrH6n&Ig#}8Z`>?>p;y&
zAR2%oNJt|7`0$cvQ5HXc7l$GJMB;vS6!zS*VCC0vOja$JqS~<bOSHsbel{tP7w`;(
zn(^l1x@D`Go8{*G!r64jr!px)p<=etg-8~RO{W<>En4n>ZV@o}u_&{IySMD5s;YeP
zxR>5MFCEbirjK=UsU?fqh@soAi152poM3~0$%J1F4esN^Cm;C!O+VL9ujGTfPq=W(
zJSLBEa8*<;*Vzi0WwkSL^wr<uoYCEJf@(!qo7M7;sm>wZzuC(b*`@64ddz$!pW~Cq
zvD!Y9Tay-Za+sYqY`-MVpx_ct3%?Rjl|Hw41ydB2PGyL-rFA^A;|z=P$~hr1jkOu&
z+%?h5^oUp{AvQ;xPr?b|wQ$=51lbUNdGoeYbh&)PHFj2?<08)nPE#^@D1R+0owK+g
zBbWY8@}lru(B7q4>q!pc!a@+<aH`=NU1_8};U|}GI?G~lPJ8w+&yhg~A{4!UyMzJZ
zhgK`l*CNDN!V%I~vt}>jQwC|Z_R}-9l4b5<Rus&tGxUF-@J;9y9tGkW9=L+XAoR$L
z+zMJk-!f9ZYYetb%mmB^zg6FVz2FlPjWse6F?!kDMO-j#2}j^(pFDpd*mO5S|L>E+
zcwtDmZuIjI6JJ)kggF~4h@(e0!{mDvs39B^R3Q!i8Mq+G4G#z=&2L1NxuAY~ou$$(
zeo3pX`TP#u@7DL*fWPyn&0>#UqeDm;-X|G^<KC+wd*^*e)A}n&_}HQ6{6D`MA;Nk6
zU9_C1LJN{Uw`1jv52$VOVR?rS?w4(P?my?x@Le;6M)>DS>#d5gp*|G8ZHM>X9NgJ&
oHJ;yrNT53i*l+S<Tn?GC307dL5GN-#PGW~8=b*{&49G720Ap^)KL7v#

literal 0
HcwPel00001

diff --git a/torenabled.ico b/torenabled.ico
new file mode 100644
index 0000000000000000000000000000000000000000..48060b1ed06825aa9d58e3589ac208329567abc1
GIT binary patch
literal 1150
zcwU8)TS(JU9LK+*bIxsQc*9uRY}5YJbe8wYW?QB+G;QXMoJ2`U+DM~|nVEPAp}>L=
zp@#?rjUcEOA1dh~Bea(c#D}Q$5J5pIJ_OFb9g#5S?HoSm;d{>KaDJR0utUu7aEMip
zhCm=1fFux+NLKRA2FW$#B2sNcSp80@2i1^Ggd%9d0A;@<GH9UiKmR`lsG=Kd>uF85
z@MwM!O>ui^+#^wvMKKX!bm)>90hMVZR|6=Dv+caz(n_Dt$B&cKblcq2N9&oaGx3Bn
zof(LsMJrJ}JJ8>kpiVHyCvoPpm)=ib*_2nu@z?KJmQ}*|SUpciSlJkr&vccRr777S
ze?JwnRHu0J_qlmazn$XA3>RO#nxtK_GbMf>&uS0zlJPh*6<Q`hQSI+%L7^!xanbwZ
zCl_WH*j{suy;twCz*fanLlQ5VtJt>R&1Cg1;fH4W`xQVy6ha=hb@p&k)IaxYp4}Jj
zu)N|tbEPzP+0U`g<YcMYx?%mx<Upg4Bjo;rM?+j(TH^C}AK1{^$3o%sSG3cnH&YL_
zwAueHQ-By{2;_s!o)(UKzp=>aqT5==N=qTD9nPMu+|^nVgJKcfTX3j|jsv-@ayV&1
zur3XdZRh?Y4eH3+;&N6VJVM(hJ+l=y#Kcv)YMA4xCWbxrc-*{Y@A@-{Gcw2BD?Q3O
z3(<FMB=%)z({_$OVhO-)_ptm%$vlQm4Pdm{xSg}^j;Ze5czU@5PZ~z>tmzg;+t&5Y
rc7S8Sm>I~#n=S*!ZmQPq1G8bk7x`Ld1;0h^(*b|-1RX1I8Lsjd^Za98

literal 0
HcwPel00001

diff --git a/xombrero.c b/xombrero.c
index 7e3003a..97f458d 100644
--- a/xombrero.c
+++ b/xombrero.c
@@ -3325,14 +3325,12 @@ proxy_cmd(struct tab *t, struct karg *args)
 		}
 		if (http_proxy) {
 			setup_proxy(NULL);
+			button_set_file(t->proxy_toggle, "tordisabled.ico");
 			show_oops(t, "http proxy disabled");
-			button_set_stockid(t->proxy_toggle,
-			    GTK_STOCK_DISCONNECT);
 		} else {
 			setup_proxy(http_proxy_save);
+			button_set_file(t->proxy_toggle, "torenabled.ico");
 			show_oops(t, "http_proxy = %s", http_proxy);
-			button_set_stockid(t->proxy_toggle,
-			    GTK_STOCK_CONNECT);
 		}
 	}
 done:
@@ -7262,6 +7260,11 @@ create_toolbar(struct tab *t)
 	/* toggle proxy button */
 	t->proxy_toggle = create_button("Proxy-Toggle", proxy_uri ?
 	    GTK_STOCK_CONNECT : GTK_STOCK_DISCONNECT, 0);
+	/* override icons */
+	if (proxy_uri)
+		button_set_file(t->proxy_toggle, "torenabled.ico");
+	else
+		button_set_file(t->proxy_toggle, "tordisabled.ico");
 	gtk_widget_set_sensitive(t->proxy_toggle, TRUE);
 	g_signal_connect(G_OBJECT(t->proxy_toggle), "clicked",
 	    G_CALLBACK(proxy_toggle_cb), t);
@@ -8241,6 +8244,17 @@ create_button(char *name, char *stockid, int size)
 }
 
 void
+button_set_file(GtkWidget *button, char *filename)
+{
+	GtkWidget		*image;
+	char			file[PATH_MAX];
+
+	snprintf(file, sizeof file, "%s" PS "%s", resource_dir, filename);
+	image = gtk_image_new_from_file(file);
+	gtk_button_set_image(GTK_BUTTON(button), image);
+}
+
+void
 button_set_stockid(GtkWidget *button, char *stockid)
 {
 	GtkWidget		*image;
diff --git a/xombrero.h b/xombrero.h
index 1b36bf5..ce3b77c 100644
--- a/xombrero.h
+++ b/xombrero.h
@@ -418,6 +418,7 @@ void			set_status(struct tab *t, gchar *fmt, ...);
 
 void			load_webkit_string(struct tab *, const char *, gchar *, int);
 void			button_set_stockid(GtkWidget *, char *);
+void			button_set_file(GtkWidget *, char *);
 void			webview_progress_changed_cb(WebKitWebView *, GParamSpec *, struct tab *);
 
 /* cookies */
-- 
2.11.4.GIT