# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1414968445 -7200
# Node ID e40064ab71b44751ea8cd4baa5eaf9072c7115e9
# Parent  580f9a78822393c263d938d7b9df9c7c1bed6fc8
Allow IP v6 localhost address to bookmarks work; change "Bookmarks" icon; "cleanse pixmaps" action.

diff -r 580f9a788223 -r e40064ab71b4 Makefile
--- a/Makefile	Wed Jul 16 20:44:42 2014 +0100
+++ b/Makefile	Mon Nov 03 00:47:25 2014 +0200
@@ -5,7 +5,7 @@
 DESTDIR?=
 
 PACKAGE=tazweb
-VERSION=1.8
+VERSION=1.10
 LINGUAS?=fr pt_BR ru zh_CN zh_TW
 
 CC?=gcc
@@ -46,11 +46,11 @@
 		$(DESTDIR)$(PREFIX)/bin \
 		$(DESTDIR)/var/www/cgi-bin \
 		$(DESTDIR)$(PREFIX)/share/tazweb \
-		$(DESTDIR)$(PREFIX)/share/pixmaps \
+		$(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps \
 		$(DESTDIR)$(PREFIX)/share/applications
 	install -m 0755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin
 	cp -d doc/* $(DESTDIR)$(DOCDIR)/$(PACKAGE)
-	install -m 0644 data/tazweb.png $(DESTDIR)$(PREFIX)/share/pixmaps
+	install -m 0644 data/tazweb.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
 	install -m 0644 data/tazweb.desktop $(DESTDIR)$(PREFIX)/share/applications
 	install -m 0644 data/bookmarks.txt $(DESTDIR)$(PREFIX)/share/tazweb
 	install -m 0755 data/bookmarks.cgi $(DESTDIR)/var/www/cgi-bin
diff -r 580f9a788223 -r e40064ab71b4 data/bookmarks.cgi
--- a/data/bookmarks.cgi	Wed Jul 16 20:44:42 2014 +0100
+++ b/data/bookmarks.cgi	Mon Nov 03 00:47:25 2014 +0200
@@ -12,9 +12,10 @@
 bookmarks="$config/bookmarks.txt"
 
 # Security check
-if [ "$REMOTE_ADDR" != "127.0.0.1" ]; then
-	echo "Security exit" && exit 1
-fi
+case $REMOTE_ADDR in
+	127.0.0.1|\[::ffff:127.0.0.1\]) ;;
+	*) header; echo "Security exit! Your IP: $REMOTE_ADDR"; exit 1
+esac
 
 # HTML 5 header with built-in minimal CSS
 html_header() {
diff -r 580f9a788223 -r e40064ab71b4 src/main.c
--- a/src/main.c	Wed Jul 16 20:44:42 2014 +0100
+++ b/src/main.c	Mon Nov 03 00:47:25 2014 +0200
@@ -444,7 +444,7 @@
 			G_CALLBACK(search_entry_cb), webview);
 	
 	/* Bookmark button */
-	item = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE);
+	item = gtk_tool_button_new_from_stock(GTK_STOCK_PROPERTIES);
 	g_signal_connect(G_OBJECT(item), "clicked",
 			G_CALLBACK(go_bookmarks_cb), webview);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
@@ -465,8 +465,7 @@
 	/* Default TazWeb window */
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
-	gtk_window_set_icon(GTK_WINDOW(window),
-			create_pixbuf("/usr/share/pixmaps/tazweb.png"));
+	gtk_window_set_icon_name(GTK_WINDOW(window), "tazweb");
 	gtk_widget_set_name(window, "TazWeb");
 	gtk_window_set_wmclass(GTK_WINDOW(window), "tazweb", "TazWeb");
 	g_signal_connect(window, "destroy", G_CALLBACK(destroy_cb), NULL);