From 3ab616c7425afed0e4462f89d3bde1723ac471e5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 22 Nov 2013 09:18:55 +0100
Subject: Fix rowcount when list element contains bot only tr/li elements but
 also text nodes

---
 program/js/list.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/program/js/list.js b/program/js/list.js
index 4ae6c0c66..6f54dd77c 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -91,8 +91,7 @@ init: function()
     var r, len, rows = this.tbody.childNodes;
 
     for (r=0, len=rows.length; r<len; r++) {
-      this.init_row(rows[r]);
-      this.rowcount++;
+      this.rowcount += this.init_row(rows[r]) ? 1 : 0;
     }
 
     this.init_header();
@@ -148,6 +147,8 @@ init_row: function(row)
 
     this.row_init(this.rows[uid]);  // legacy support
     this.triggerEvent('initrow', this.rows[uid]);
+
+    return true;
   }
 },
 
-- 
cgit v1.2.3


From 78ef00f12def4d76cec708a5e436d83c75ee3c91 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 22 Nov 2013 09:21:36 +0100
Subject: Fix a bug where deleted filter was not removed from the list (because
 now list widget's 'rows' property is of type object not array)

---
 plugins/managesieve/Changelog      | 1 +
 plugins/managesieve/managesieve.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 115aec14f..cd8daf168 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -3,6 +3,7 @@
 - Fix bug where at least one additional address of vacation message was required (#1489345)
 - Fix so i;ascii-numeric comparator is not forced as default for :count and :value operators
 - Fix date/currentdate related form issues and comparators handling (#1489346)
+- Fix a bug where deleted filter was not removed from the list
 
 * version 7.0 [2013-09-09]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index fa13b7125..22a50ba4d 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -161,7 +161,7 @@ rcube_webmail.prototype.managesieve_rowid = function(id)
 {
   var i, rows = this.filters_list.rows;
 
-  for (i=0; i<rows.length; i++)
+  for (i in rows)
     if (rows[i] != null && rows[i].uid == id)
       return i;
 };
-- 
cgit v1.2.3


From aac4b452a3a538ecf6abdfcf100c7d9d33aadd1f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 22 Nov 2013 09:23:30 +0100
Subject: Bump version to 7.1

---
 plugins/managesieve/Changelog                            | 2 ++
 plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index cd8daf168..b7b9ecf68 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+* version 7.1 [2013-11-22]
+-----------------------------------------------------------
 - lib/Net Sieve.php moved to Roundcube /lib directory
 - Added managesieve_domains option to limit redirect destinations
 - Fix bug where at least one additional address of vacation message was required (#1489345)
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 6c9f8048a..e0f6ead9a 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -53,7 +53,7 @@ class rcube_sieve_engine
         "x-beenthere",
     );
 
-    const VERSION  = '7.0';
+    const VERSION  = '7.1';
     const PROGNAME = 'Roundcube (Managesieve)';
     const PORT     = 4190;
 
-- 
cgit v1.2.3