Update to 1.8.15nb10 using liferea-current.

9 files changed, 68 insertions, 223 deletions

diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index cba7e83ba45..1cb1c2f092f 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,37 +1,22 @@
-# $NetBSD: Makefile,v 1.130 2014/08/03 22:13:19 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2014/08/05 12:34:49 wiz Exp $
 
-DISTNAME=		liferea-1.4.28
-PKGREVISION=		42
+DISTNAME=		liferea-1.8.15
+PKGREVISION=		10
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://liferea.sourceforge.net/
 COMMENT=		Simple FeedReader clone for reading RSS/RDF feeds
 
 GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c99 c++
+CONFIGURE_ARGS+=	--disable-dbus
+USE_TOOLS+=		gmake pkg-config msgfmt perl intltool
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config msgfmt perl intltool
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.liferea
-PKG_OPTIONS_REQUIRED_GROUPS=	renderer
-PKG_OPTIONS_GROUP.renderer=	liferea-gtkhtml liferea-webkit
-PKG_SUGGESTED_OPTIONS=	liferea-gtkhtml
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=	gtkhtml webkit
-.if !empty(PKG_OPTIONS:Mliferea-gtkhtml)
-CONFIGURE_ARGS+=	--disable-gecko
-.include "../../www/libgtkhtml/buildlink3.mk"
-PLIST.gtkhtml=	yes
-.endif
-.if !empty(PKG_OPTIONS:Mliferea-webkit)
-CONFIGURE_ARGS+=	--disable-gecko
-.include "../../www/webkit1-gtk/buildlink3.mk"
-PLIST.webkit=	yes
-.endif
+USE_LANGUAGES+=		c++
+USE_LANGUAGES+=		c
 
 SHLIBTOOL_OVERRIDE=	# empty
 
@@ -41,14 +26,14 @@ GCONF_SCHEMAS=		liferea.schemas
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/liferea/PLIST b/www/liferea/PLIST
index 50b133330f2..34472bd1eb7 100644
--- a/www/liferea/PLIST
+++ b/www/liferea/PLIST
@@ -1,18 +1,20 @@
-@comment $NetBSD: PLIST,v 1.39 2012/02/09 20:19:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.40 2014/08/05 12:34:49 wiz Exp $
 bin/liferea
 bin/liferea-add-feed
-bin/liferea-bin
-${PLIST.gtkhtml}lib/liferea/liblihtmlg.la
-${PLIST.webkit}lib/liferea/liblihtmlw.la
-lib/liferea/liblinotiflibnotify.la
 man/man1/liferea.1
 man/pl/man1/liferea.1
 share/applications/liferea.desktop
 share/gconf/schemas/liferea.schemas
+share/icons/hicolor/16x16/apps/liferea.png
+share/icons/hicolor/22x22/apps/liferea.png
+share/icons/hicolor/24x24/apps/liferea.png
+share/icons/hicolor/32x32/apps/liferea.png
 share/icons/hicolor/48x48/apps/liferea.png
-share/liferea/bloglines_source.glade
+share/icons/hicolor/scalable/apps/liferea.svg
+share/liferea/auth.ui
 share/liferea/css/adblock.css
 share/liferea/css/liferea.css
+share/liferea/css/user.css
 share/liferea/doc/html/about_de.html
 share/liferea/doc/html/about_en.html
 share/liferea/doc/html/concepts_de.html
@@ -21,33 +23,33 @@ share/liferea/doc/html/enclosures_de.html
 share/liferea/doc/html/enclosures_en.html
 share/liferea/doc/html/faq_de.html
 share/liferea/doc/html/faq_en.html
-share/liferea/doc/html/faq_ja.html
 share/liferea/doc/html/folders_de.html
 share/liferea/doc/html/folders_en.html
+share/liferea/doc/html/greader_de.html
+share/liferea/doc/html/greader_en.html
 share/liferea/doc/html/headlines_de.html
 share/liferea/doc/html/headlines_en.html
 share/liferea/doc/html/help_feed_default.png
 share/liferea/doc/html/help_feed_error.png
-share/liferea/doc/html/help_feed_prop_adv_1.4.0.png
-share/liferea/doc/html/help_feed_prop_cache_1.4.0.png
-share/liferea/doc/html/help_feed_prop_downl_1.4.0.png
-share/liferea/doc/html/help_feed_prop_general_1.4.0.png
-share/liferea/doc/html/help_feed_prop_source_1.4.0.png
+share/liferea/doc/html/help_feed_prop_adv_1.6.0.png
+share/liferea/doc/html/help_feed_prop_cache_1.6.0.png
+share/liferea/doc/html/help_feed_prop_downl_1.6.0.png
+share/liferea/doc/html/help_feed_prop_general_1.6.0.png
+share/liferea/doc/html/help_feed_prop_source_1.6.0.png
 share/liferea/doc/html/help_folder.png
 share/liferea/doc/html/help_item_flag.png
 share/liferea/doc/html/help_item_unread.png
 share/liferea/doc/html/help_opml.png
-share/liferea/doc/html/help_prefs_browser_1.4.0.png
-share/liferea/doc/html/help_prefs_enclosures_1.4.0.png
-share/liferea/doc/html/help_prefs_feeds_1.4.0.png
-share/liferea/doc/html/help_prefs_folders_1.4.0.png
-share/liferea/doc/html/help_prefs_gui_1.4.0.png
-share/liferea/doc/html/help_prefs_headlines_1.4.0.png
-share/liferea/doc/html/help_prefs_proxy_1.4.0.png
-share/liferea/doc/html/help_search_1.4.0.png
-share/liferea/doc/html/help_source_add_1.4.0.png
-share/liferea/doc/html/help_subscribe_1.4.0.png
-share/liferea/doc/html/help_vfolder_1.4.0.png
+share/liferea/doc/html/help_prefs_browser_1.6.0.png
+share/liferea/doc/html/help_prefs_enclosures_1.6.0.png
+share/liferea/doc/html/help_prefs_feeds_1.6.0.png
+share/liferea/doc/html/help_prefs_folders_1.6.0.png
+share/liferea/doc/html/help_prefs_gui_1.6.0.png
+share/liferea/doc/html/help_prefs_headlines_1.6.0.png
+share/liferea/doc/html/help_prefs_proxy_1.6.0.png
+share/liferea/doc/html/help_search_1.6.0.png
+share/liferea/doc/html/help_subscribe_1.6.0.png
+share/liferea/doc/html/help_vfolder_1.6.0.png
 share/liferea/doc/html/newsbin_de.html
 share/liferea/doc/html/newsbin_en.html
 share/liferea/doc/html/preferences_de.html
@@ -55,40 +57,37 @@ share/liferea/doc/html/preferences_en.html
 share/liferea/doc/html/reference.css
 share/liferea/doc/html/reference_de.html
 share/liferea/doc/html/reference_en.html
-share/liferea/doc/html/reference_ja.html
-share/liferea/doc/html/reference_nl.html
 share/liferea/doc/html/searching_de.html
 share/liferea/doc/html/searching_en.html
 share/liferea/doc/html/subscriptions_de.html
 share/liferea/doc/html/subscriptions_en.html
 share/liferea/doc/html/topics_de.html
 share/liferea/doc/html/topics_en.html
-share/liferea/doc/html/topics_ja.html
 share/liferea/doc/html/updating_de.html
 share/liferea/doc/html/updating_en.html
 share/liferea/dtd/html.ent
-share/liferea/google_source.glade
-share/liferea/liferea.glade
-share/liferea/media/xspf_license.txt
-share/liferea/media/xspf_player_slim.swf
-share/liferea/node_source.glade
-share/liferea/opml/feedlist.opml
+share/liferea/google_source.ui
+share/liferea/liferea.ui
+share/liferea/new_subscription.ui
+share/liferea/node_source.ui
 share/liferea/opml/feedlist_bg.opml
 share/liferea/opml/feedlist_ca.opml
 share/liferea/opml/feedlist_de.opml
+share/liferea/opml/feedlist_en.opml
 share/liferea/opml/feedlist_es.opml
 share/liferea/opml/feedlist_eu.opml
 share/liferea/opml/feedlist_fr.opml
+share/liferea/opml/feedlist_gl.opml
+share/liferea/opml/feedlist_he.opml
+share/liferea/opml/feedlist_hu.opml
+share/liferea/opml/feedlist_it.opml
 share/liferea/opml/feedlist_nl.opml
 share/liferea/opml/feedlist_pl.opml
 share/liferea/opml/feedlist_pt.opml
 share/liferea/opml/feedlist_pt_BR.opml
-share/liferea/opml/feedlist_ru.opml
 share/liferea/opml/feedlist_sk.opml
 share/liferea/opml/feedlist_sv.opml
-share/liferea/opml/feedlist_tr.opml
-share/liferea/opml_source.glade
-share/liferea/pixmaps/arrow.png
+share/liferea/opml_source.ui
 share/liferea/pixmaps/attachment.png
 share/liferea/pixmaps/available.png
 share/liferea/pixmaps/available_offline.png
@@ -96,54 +95,56 @@ share/liferea/pixmaps/bookmark.png
 share/liferea/pixmaps/comments.png
 share/liferea/pixmaps/default.png
 share/liferea/pixmaps/directory.png
-share/liferea/pixmaps/edit.png
 share/liferea/pixmaps/empty.png
 share/liferea/pixmaps/empty_offline.png
-share/liferea/pixmaps/fl_bloglines.png
-share/liferea/pixmaps/fl_google.png
 share/liferea/pixmaps/fl_opml.png
 share/liferea/pixmaps/flag.png
 share/liferea/pixmaps/grayflag.png
-share/liferea/pixmaps/liferea.png
 share/liferea/pixmaps/newsbin.png
-share/liferea/pixmaps/ocs.png
-share/liferea/pixmaps/offline.png
-share/liferea/pixmaps/online.png
-share/liferea/pixmaps/read.xpm
-share/liferea/pixmaps/tag.png
-share/liferea/pixmaps/technorati.png
 share/liferea/pixmaps/unread.png
 share/liferea/pixmaps/vfolder.png
+share/liferea/simple_subscription.ui
+share/liferea/ttrss_source.ui
 share/liferea/xslt/feed.xml
-share/liferea/xslt/feed.xml.in
 share/liferea/xslt/folder.xml
-share/liferea/xslt/folder.xml.in
 share/liferea/xslt/i18n-filter.xslt
 share/liferea/xslt/item.xml
-share/liferea/xslt/item.xml.in
 share/liferea/xslt/newsbin.xml
-share/liferea/xslt/newsbin.xml.in
 share/liferea/xslt/source.xml
-share/liferea/xslt/source.xml.in
 share/liferea/xslt/vfolder.xml
-share/liferea/xslt/vfolder.xml.in
 share/locale/ar/LC_MESSAGES/liferea.mo
+share/locale/ast/LC_MESSAGES/liferea.mo
 share/locale/be@latin/LC_MESSAGES/liferea.mo
+share/locale/bg/LC_MESSAGES/liferea.mo
 share/locale/ca/LC_MESSAGES/liferea.mo
 share/locale/cs/LC_MESSAGES/liferea.mo
+share/locale/da/LC_MESSAGES/liferea.mo
 share/locale/de/LC_MESSAGES/liferea.mo
 share/locale/el/LC_MESSAGES/liferea.mo
 share/locale/es/LC_MESSAGES/liferea.mo
 share/locale/eu/LC_MESSAGES/liferea.mo
+share/locale/fi/LC_MESSAGES/liferea.mo
 share/locale/fr/LC_MESSAGES/liferea.mo
+share/locale/gl/LC_MESSAGES/liferea.mo
+share/locale/he/LC_MESSAGES/liferea.mo
 share/locale/hu/LC_MESSAGES/liferea.mo
 share/locale/it/LC_MESSAGES/liferea.mo
 share/locale/ja/LC_MESSAGES/liferea.mo
+share/locale/ko/LC_MESSAGES/liferea.mo
+share/locale/lt/LC_MESSAGES/liferea.mo
+share/locale/lv/LC_MESSAGES/liferea.mo
+share/locale/mk/LC_MESSAGES/liferea.mo
+share/locale/nl/LC_MESSAGES/liferea.mo
 share/locale/pl/LC_MESSAGES/liferea.mo
 share/locale/pt/LC_MESSAGES/liferea.mo
 share/locale/pt_BR/LC_MESSAGES/liferea.mo
+share/locale/ro/LC_MESSAGES/liferea.mo
 share/locale/ru/LC_MESSAGES/liferea.mo
 share/locale/sk/LC_MESSAGES/liferea.mo
 share/locale/sq/LC_MESSAGES/liferea.mo
 share/locale/sv/LC_MESSAGES/liferea.mo
 share/locale/tr/LC_MESSAGES/liferea.mo
+share/locale/uk/LC_MESSAGES/liferea.mo
+share/locale/vi/LC_MESSAGES/liferea.mo
+share/locale/zh_CN/LC_MESSAGES/liferea.mo
+share/locale/zh_TW/LC_MESSAGES/liferea.mo
diff --git a/www/liferea/distinfo b/www/liferea/distinfo
index 6782f008fb6..76bc8fc85b5 100644
--- a/www/liferea/distinfo
+++ b/www/liferea/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.60 2013/08/16 02:37:01 obache Exp $
+$NetBSD: distinfo,v 1.61 2014/08/05 12:34:49 wiz Exp $
 
-SHA1 (liferea-1.4.28.tar.gz) = 5c40c9a20eb94d5e0bc5e9b41af51389bc364daf
-RMD160 (liferea-1.4.28.tar.gz) = 044d0f771ea06c7d35fb70afc2ebe8d64bd96ef0
-Size (liferea-1.4.28.tar.gz) = 1697036 bytes
-SHA1 (patch-ae) = 91c32840150a33d2162301c17bd5c35edc6264ba
-SHA1 (patch-af) = 6376c278cc5fa1fd2f353e056d9e135fbf9e0bef
-SHA1 (patch-ag) = 49eaef5dd44397d5dda30d7b750cce3a26d5029d
-SHA1 (patch-src_feedlist.c) = 3c6e18f852726532686c54fc658fd0be961d9bdb
-SHA1 (patch-src_notification_notif__libnotify.c) = ada0c674a447011fd1e4b370fd53d2c3886f8494
-SHA1 (patch-src_rule.c) = b6de3509c604a570258b5ee04b5576c386751edd
+SHA1 (liferea-1.8.15.tar.bz2) = 9a86773996d61d03c03e9a5137a2c0a3e2539f4f
+RMD160 (liferea-1.8.15.tar.bz2) = 15651693e08c0b1a8d0455747db328af7771db38
+Size (liferea-1.8.15.tar.bz2) = 1369873 bytes
diff --git a/www/liferea/patches/patch-ae b/www/liferea/patches/patch-ae
deleted file mode 100644
index df0c97724a9..00000000000
--- a/www/liferea/patches/patch-ae
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2008/02/03 11:14:27 drochner Exp $
-
---- src/common.c.orig	2008-01-13 02:07:10.000000000 +0100
-+++ src/common.c
-@@ -273,9 +273,9 @@ gchar *dayofweek[] = { "Sun", "Mon", "Tu
- gchar *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
- 
- gchar *createRFC822Date(const time_t *time) {
--	struct tm *tm;
-+	struct tm *tm, tmbuf;
- 
--	tm = gmtime(time); /* No need to free because it is statically allocated */
-+	tm = gmtime_r(time, &tmbuf); /* No need to free because it is statically allocated */
- 	return g_strdup_printf("%s, %2d %s %4d %02d:%02d:%02d GMT", dayofweek[tm->tm_wday], tm->tm_mday,
- 					   months[tm->tm_mon], 1900 + tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec);
- }
-@@ -325,7 +325,7 @@ static time_t common_parse_rfc822_tz(cha
- 
- /* converts a RFC822 time string to a time_t value */
- time_t parseRFC822Date(gchar *date) {
--	struct tm	tm;
-+	struct tm	tm, t2buf;
- 	time_t		t, t2;
- 	char 		*oldlocale;
- 	char		*pos;
-@@ -373,7 +373,7 @@ time_t parseRFC822Date(gchar *date) {
- 			   correction. (Usually, there is no daylight savings
- 			   time since the input is GMT.) */
- 			t = t - common_parse_rfc822_tz(pos);
--			t2 = mktime(gmtime(&t));
-+			t2 = mktime(gmtime_r(&t, &t2buf));
- 			t = t - (t2 - t);
- 			return t;
- 		} else {
diff --git a/www/liferea/patches/patch-af b/www/liferea/patches/patch-af
deleted file mode 100644
index 230994809c8..00000000000
--- a/www/liferea/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.5 2009/02/16 17:34:17 drochner Exp $
-
---- src/ui/ui_itemlist.c.orig	2008-12-28 10:21:00.000000000 +0100
-+++ src/ui/ui_itemlist.c
-@@ -76,7 +76,7 @@ static gboolean ui_item_id_to_iter(gulon
- 
- /* sort function for the item list date column */
- static gint ui_itemlist_date_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) {
--	gulong	timea, timeb;
-+	gint64	timea, timeb;
- 	double	diff;
- 
- 	gtk_tree_model_get(model, a, IS_TIME, &timea, -1);
-@@ -129,7 +129,7 @@ GtkTreeStore * ui_itemlist_get_tree_stor
- 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(itemlist_treeview));
- 	if(!model) {
- 		itemstore = gtk_tree_store_new(IS_LEN,
--		                               G_TYPE_ULONG,	/* IS_TIME */
-+		                               G_TYPE_INT64,	/* IS_TIME */
- 		                               G_TYPE_STRING, 	/* IS_TIME_STR */
- 		                               G_TYPE_STRING,	/* IS_LABEL */
- 		                               GDK_TYPE_PIXBUF,	/* IS_STATEICON */
-@@ -434,7 +434,7 @@ ui_itemlist_add_item (itemPtr item) 
- 			state += 1;
- 
- 		gtk_tree_store_set (itemstore, iter,
--		                	       IS_TIME, item->time,
-+		                	       IS_TIME, (gint64)item->time,
- 		                	       IS_NR, item->id,
- 					       IS_PARENT, node,
- 		                               IS_FAVICON, node->icon,
diff --git a/www/liferea/patches/patch-ag b/www/liferea/patches/patch-ag
deleted file mode 100644
index 48164045de1..00000000000
--- a/www/liferea/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/02/16 17:34:17 drochner Exp $
-
---- configure.orig	2009-02-10 20:01:34.000000000 +0100
-+++ configure
-@@ -23343,6 +23343,7 @@ else
- fi
- 
- 
-+if false; then
- { $as_echo "$as_me:$LINENO: checking for 64bit platform" >&5
- $as_echo_n "checking for 64bit platform... " >&6; }
- case "$target" in
-@@ -23356,6 +23357,7 @@ $as_echo "yes -> disabling GtkHTML2" >&6
- $as_echo "no" >&6; }
-      ;;
- esac
-+fi
- 
- 
- { $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5
diff --git a/www/liferea/patches/patch-src_feedlist.c b/www/liferea/patches/patch-src_feedlist.c
deleted file mode 100644
index 196aa64c23e..00000000000
--- a/www/liferea/patches/patch-src_feedlist.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_feedlist.c,v 1.1 2013/03/02 17:53:07 joerg Exp $
-
---- src/feedlist.c.orig	2013-03-01 13:45:59.000000000 +0000
-+++ src/feedlist.c
-@@ -381,7 +381,7 @@ on_menu_allfeedsread (GtkWidget *widget,
-    problems. Use feedlist_schedule_save() instead! */
- static gboolean feedlist_schedule_save_cb(gpointer user_data) {
- 
--	g_return_if_fail(NULL != rootNode);
-+	g_return_val_if_fail(NULL != rootNode, FALSE);
- 
- 	/* step 1: request each node to save its state */
- 	feedlist_foreach(node_save);
diff --git a/www/liferea/patches/patch-src_notification_notif__libnotify.c b/www/liferea/patches/patch-src_notification_notif__libnotify.c
deleted file mode 100644
index 0e05aa74074..00000000000
--- a/www/liferea/patches/patch-src_notification_notif__libnotify.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_notification_notif__libnotify.c,v 1.1 2013/08/16 02:37:01 obache Exp $
-
-* for libnotify-0.7 API change
-
---- src/notification/notif_libnotify.c.orig	2007-09-19 18:38:29.000000000 +0000
-+++ src/notification/notif_libnotify.c
-@@ -147,7 +147,7 @@ static void notif_libnotify_callback_sho
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL);
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
-@@ -223,7 +223,7 @@ notif_libnotify_node_has_new_items (node
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/www/liferea/patches/patch-src_rule.c b/www/liferea/patches/patch-src_rule.c
deleted file mode 100644
index 57f530419dc..00000000000
--- a/www/liferea/patches/patch-src_rule.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_rule.c,v 1.1 2013/03/02 17:53:07 joerg Exp $
-
---- src/rule.c.orig	2013-03-01 13:47:26.000000000 +0000
-+++ src/rule.c
-@@ -299,7 +299,7 @@ rules_check_item (GSList *rules, itemPtr
- 	queryPtr	query;
- 	
- 	if (0 == g_slist_length (rules))
--		return;
-+		return FALSE;
- 	
- 	/* first try in memory checks (for "unread" and "important" search folder)... */
- 	if (1 == g_slist_length (rules)) {