Andreas Krennmair:

	newsbeuter 0.8.1 release branch.

4 files changed, 26 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index de801845..c3d8a00b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Changes for newsbeuter:
 
-0.8:
+0.8 (2008-03-07):
 	implemented custom configurability of feed list and article list format
 	improved reload speed by checking the Last-Modified header
 	added special tags to rename feeds
diff --git a/Makefile b/Makefile
index f49d5b3e..45df6d2b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ prefix?=/usr/local
 mandir?=$(prefix)/share/man
 datadir?=$(prefix)/share
 localedir?=$(datadir)/locale
-docdir=?$(datadir)/doc/$(PACKAGE)
+docdir?=$(datadir)/doc/$(PACKAGE)
 
 # compiler
 CXX=c++
@@ -121,9 +121,9 @@ $(FILTERLIB_OUTPUT): $(FILTERLIB_OBJS)
 	$(AR) qc $@ $^
 	$(RANLIB) $@
 
-filter/Scanner.cpp filter/Parser.cpp: filter/filter.atg filter/Scanner.frame filter/Parser.frame
-	$(RM) filter/Scanner.cpp filter/Parser.cpp filter/Scanner.h filter/Parser.h
-	cococpp -frames filter $<
+#filter/Scanner.cpp filter/Parser.cpp: filter/filter.atg filter/Scanner.frame filter/Parser.frame
+#	$(RM) filter/Scanner.cpp filter/Parser.cpp filter/Scanner.h filter/Parser.h
+#	cococpp -frames filter $<
 
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -170,13 +170,13 @@ clean-libxmlrss:
 	$(RM) $(XMLRSSLIB_OUTPUT) $(XMLRSSLIB_OBJS)
 
 clean-libfilter:
-	$(RM) $(FILTERLIB_OUTPUT) $(FILTERLIB_OBJS) filter/Scanner.cpp filter/Scanner.h filter/Parser.cpp filter/Parser.h
+	$(RM) $(FILTERLIB_OUTPUT) $(FILTERLIB_OBJS) # filter/Scanner.cpp filter/Scanner.h filter/Parser.cpp filter/Parser.h
 
-clean-doc:
-	$(RM) -r doc/xhtml 
-	$(RM) doc/*.xml doc/*.1 doc/newsbeuter-cfgcmds.txt doc/podbeuter-cfgcmds.txt
+#clean-doc:
+#	$(RM) -r doc/xhtml 
+#	$(RM) doc/*.xml doc/*.1 doc/newsbeuter-cfgcmds.txt doc/podbeuter-cfgcmds.txt
 
-clean: clean-newsbeuter clean-podbeuter clean-libbeuter clean-libfilter clean-libext clean-doc clean-libxmlrss
+clean: clean-newsbeuter clean-podbeuter clean-libbeuter clean-libfilter clean-libext clean-libxmlrss
 	$(RM) $(STFLHDRS)
 
 distclean: clean clean-mo test-clean
@@ -201,6 +201,9 @@ install: install-mo
 	$(INSTALL) -m 644 doc/xhtml/* $(docdir) || true
 	$(MKDIR) $(docdir)/examples
 	$(INSTALL) -m 644 doc/example-config $(docdir)/examples/config || true
+	$(MKDIR) $(docdir)/contrib
+	$(INSTALL) -m 644 contrib/bookmark-delicious.sh $(docdir)/contrib/bookmark-delicious.sh || true
+	$(INSTALL) -m 644 contrib/fixwesnoth.xsl $(docdir)/contrib/fixwesnoth.xsl || true
 
 uninstall:
 	$(RM) $(prefix)/bin/$(NEWSBEUTER)
diff --git a/src/htmlrenderer.cpp b/src/htmlrenderer.cpp
index ed04132d..927eafa0 100644
--- a/src/htmlrenderer.cpp
+++ b/src/htmlrenderer.cpp
@@ -2,7 +2,9 @@
 #include <xmlpullparser.h>
 #include <utils.h>
 #include <sstream>
+#include <cstdio>
 #include <iostream>
+#include <cstring>
 #include <stdexcept>
 #include <logger.h>
 #include <libgen.h>
diff --git a/src/itemlist_formaction.cpp b/src/itemlist_formaction.cpp
index 0696fab8..47902120 100644
--- a/src/itemlist_formaction.cpp
+++ b/src/itemlist_formaction.cpp
@@ -199,8 +199,17 @@ void itemlist_formaction::process_operation(operation op, bool automatic, std::v
 				if (itemposname.length() > 0) {
 					v->set_status(_("Toggling read flag for article..."));
 					try {
-						visible_items[itempos].first->set_unread(!visible_items[itempos].first->unread());
-						v->set_status("");
+						if (automatic && args->size() > 0) {
+							if ((*args)[0] == "read") {
+								visible_items[itempos].first->set_unread(false);
+							} else if ((*args)[0] == "unread") {
+								visible_items[itempos].first->set_unread(true);
+							}
+							v->set_status("");
+						} else {
+							visible_items[itempos].first->set_unread(!visible_items[itempos].first->unread());
+							v->set_status("");
+						}
 					} catch (const dbexception& e) {
 						char buf[1024];
 						snprintf(buf, sizeof(buf), _("Error while toggling read flag: %s"), e.what());