Merge branch 'icon' into master

* icon:
  A bit more tweaking to try to get the icon to work.
  Add new icon.

 Conflicts:
	rebuild

Flenser.desktop

@@ -4,7 +4,7 @@ Name=Flenser
 Comment=Fast and small graphical web browser
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
 Exec=flenser %U
-Icon=dillo
+Icon=flenser
 Terminal=false
 Type=Application
 Categories=Network;WebBrowser;

Makefile.am

@@ -7,12 +7,12 @@ EXTRA_DIST = README.md Doxyfile flenserrc install-dpi-local d_size.h
 sysconf_DATA = flenserrc
 
 desktopdir = $(datadir)/applications
-desktop_DATA = flenser.desktop
+desktop_DATA = Flenser.desktop
 
 appicon48dir = $(datadir)/icons/hicolor/48x48/apps/
-appicon48_DATA = icons/48x48/dillo.png
+appicon48_DATA = icons/48x48/flenser.png
 
 appicon128dir = $(datadir)/icons/hicolor/128x128/apps/
-appicon128_DATA = icons/128x128/dillo.png
+appicon128_DATA = icons/128x128/flenser.png
 
 EXTRA_DIST += $(desktop_DATA) $(appicon48_DATA) $(appicon128_DATA)

rebuild

@@ -8,5 +8,5 @@ pushd ..
 ./autogen.sh
 popd
 
-../configure --prefix=/opt/local --enable-ipv6 CXXFLAGS="-O0 -g"
+../configure --prefix=/usr --enable-ipv6 CXXFLAGS="-O0 -g"
 make -kj${count}