From 5217368a0a493d44ea76dafdc74c10cf19b9a266 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@test90-7.test90.kolabsys.com>
Date: Fri, 11 Nov 2011 16:54:29 +0100
Subject: [PATCH] Fix bug where created/renamed folder could be inserted after
 another folder row but before its groups rows

---
 plugins/kolab_addressbook/kolab_addressbook.js  | 9 +++++++--
 plugins/kolab_addressbook/kolab_addressbook.php | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.js b/plugins/kolab_addressbook/kolab_addressbook.js
index 638dfcaa..5b0032b8 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.js
+++ b/plugins/kolab_addressbook/kolab_addressbook.js
@@ -154,7 +154,12 @@ rcube_webmail.prototype.book_update = function(data, old)
         name = folders[n-1];
         for (n in sources)
             if (sources[n].realname && sources[n].realname == name) {
-                row.insertAfter('#rcmli'+n);
+                // folder row found
+                n = $('#rcmli'+n);
+                // skip groups
+                while (n.next().hasClass('contactgroup'))
+                    n = n.next();
+                row.insertAfter(n);
                 break;
             }
     }
@@ -169,7 +174,7 @@ rcube_webmail.prototype.book_update = function(data, old)
         // remove old row (just after the new row has been inserted)
         refrow.remove();
 
-	// update groups
+        // update groups
         for (n in groups) {
             if (groups[n].source == old) {
                 // update existing row
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index 576e76cc..13cff3de 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Kolab address book 0.5
+ * Kolab address book 0.6
  *
  * Sample plugin to add a new address book source with data from Kolab storage
  * It provides also a possibilities to manage contact folders