[balsa] Use Cyrus server's standard names for rights

[Peter Bloomfield <PeterB src gnome org>]

commit d1c1f720b85d3d4b74c464d3c8bcf1fe40f77fdc
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Feb 20 12:33:54 2010 -0500

    Use Cyrus server's standard names for rights
    
    	* src/folder-conf.c (folder_conf_imap_sub_node): use Cyrus
    	server's standard names for rights.

 ChangeLog         |    5 +++++
 src/folder-conf.c |   23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 87c8db1..64861fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Albrecht DreÃ?
+
+	* src/folder-conf.c (folder_conf_imap_sub_node): use Cyrus
+	server's standard names for rights.
+
 2010-02-19  Peter Bloomfield
 
 	* configure.in: option to configure GMime-2.4 or 2.6.
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 17e5139..c37f465 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -842,6 +842,9 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
             "lrs", N_("read-only"),
             "lrswipkxte", N_("read-write"),
             "lrswipkxtea", N_("admin"),
+            "lrsp", N_("post"),
+            "lrsip", N_("append"),
+            "lrxte", N_("delete"),
             NULL, N_("special") };
         GString *rights_str;
         gchar * rights;
@@ -871,8 +874,11 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
                      std_acls[n] && strcmp(std_acls[n], rights);
                      n += 2);
                 rights_str = g_string_new(_("mine: "));
-                g_string_append_printf(rights_str, "%s (%s)",
-                                       std_acls[n + 1], rights);
+                if (std_acls[n])
+                    rights_str = g_string_append(rights_str, std_acls[n + 1]);
+                else
+                    g_string_append_printf(rights_str, "%s (%s)",
+                                           std_acls[n + 1], rights);
 
                 /* acl's - only available if I have admin privileges */
                 if ((acls =
@@ -883,10 +889,15 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
                         for (n = 0;
                              std_acls[n] && strcmp(std_acls[n], acls[uid + 1]);
                              n += 2);
-                        g_string_append_printf(rights_str,
-                                               "\nuid '%s': %s (%s)",
-                                               acls[uid], std_acls[n + 1],
-                                               acls[uid + 1]);
+                        if (std_acls[n])
+                            g_string_append_printf(rights_str,
+                                                   "\nuid '%s': %s",
+                                                   acls[uid], std_acls[n + 1]);
+                        else
+                            g_string_append_printf(rights_str,
+                                                   "\nuid '%s': %s (%s)",
+                                                   acls[uid], std_acls[n + 1],
+                                                   acls[uid + 1]);
                     }
                     g_strfreev(acls);
                 }