tazweb rev 161 1.10
Allow IP v6 localhost address to bookmarks work; change "Bookmarks" icon; "cleanse pixmaps" action.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Nov 03 00:47:25 2014 +0200 (2014-11-03) |
parents | 580f9a788223 |
children | cc48c28dedad |
files | Makefile data/bookmarks.cgi src/main.c |
line diff
1.1 --- a/Makefile Wed Jul 16 20:44:42 2014 +0100 1.2 +++ b/Makefile Mon Nov 03 00:47:25 2014 +0200 1.3 @@ -5,7 +5,7 @@ 1.4 DESTDIR?= 1.5 1.6 PACKAGE=tazweb 1.7 -VERSION=1.8 1.8 +VERSION=1.10 1.9 LINGUAS?=fr pt_BR ru zh_CN zh_TW 1.10 1.11 CC?=gcc 1.12 @@ -46,11 +46,11 @@ 1.13 $(DESTDIR)$(PREFIX)/bin \ 1.14 $(DESTDIR)/var/www/cgi-bin \ 1.15 $(DESTDIR)$(PREFIX)/share/tazweb \ 1.16 - $(DESTDIR)$(PREFIX)/share/pixmaps \ 1.17 + $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps \ 1.18 $(DESTDIR)$(PREFIX)/share/applications 1.19 install -m 0755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin 1.20 cp -d doc/* $(DESTDIR)$(DOCDIR)/$(PACKAGE) 1.21 - install -m 0644 data/tazweb.png $(DESTDIR)$(PREFIX)/share/pixmaps 1.22 + install -m 0644 data/tazweb.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps 1.23 install -m 0644 data/tazweb.desktop $(DESTDIR)$(PREFIX)/share/applications 1.24 install -m 0644 data/bookmarks.txt $(DESTDIR)$(PREFIX)/share/tazweb 1.25 install -m 0755 data/bookmarks.cgi $(DESTDIR)/var/www/cgi-bin
2.1 --- a/data/bookmarks.cgi Wed Jul 16 20:44:42 2014 +0100 2.2 +++ b/data/bookmarks.cgi Mon Nov 03 00:47:25 2014 +0200 2.3 @@ -12,9 +12,10 @@ 2.4 bookmarks="$config/bookmarks.txt" 2.5 2.6 # Security check 2.7 -if [ "$REMOTE_ADDR" != "127.0.0.1" ]; then 2.8 - echo "Security exit" && exit 1 2.9 -fi 2.10 +case $REMOTE_ADDR in 2.11 + 127.0.0.1|\[::ffff:127.0.0.1\]) ;; 2.12 + *) header; echo "Security exit! Your IP: $REMOTE_ADDR"; exit 1 2.13 +esac 2.14 2.15 # HTML 5 header with built-in minimal CSS 2.16 html_header() {
3.1 --- a/src/main.c Wed Jul 16 20:44:42 2014 +0100 3.2 +++ b/src/main.c Mon Nov 03 00:47:25 2014 +0200 3.3 @@ -444,7 +444,7 @@ 3.4 G_CALLBACK(search_entry_cb), webview); 3.5 3.6 /* Bookmark button */ 3.7 - item = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE); 3.8 + item = gtk_tool_button_new_from_stock(GTK_STOCK_PROPERTIES); 3.9 g_signal_connect(G_OBJECT(item), "clicked", 3.10 G_CALLBACK(go_bookmarks_cb), webview); 3.11 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 3.12 @@ -465,8 +465,7 @@ 3.13 /* Default TazWeb window */ 3.14 window = gtk_window_new(GTK_WINDOW_TOPLEVEL); 3.15 gtk_window_set_default_size(GTK_WINDOW(window), 800, 600); 3.16 - gtk_window_set_icon(GTK_WINDOW(window), 3.17 - create_pixbuf("/usr/share/pixmaps/tazweb.png")); 3.18 + gtk_window_set_icon_name(GTK_WINDOW(window), "tazweb"); 3.19 gtk_widget_set_name(window, "TazWeb"); 3.20 gtk_window_set_wmclass(GTK_WINDOW(window), "tazweb", "TazWeb"); 3.21 g_signal_connect(window, "destroy", G_CALLBACK(destroy_cb), NULL);