[Xfce4-commits] <postler:master> Always decode folder name for display

[Christian Dywan]

Updating branch refs/heads/master
         to 98f99e882b0d9306da1247c5b3ea4c625132ff24 (commit)
       from 9b8ba8409ac1d4a28d2becf5d5501f188a39b343 (commit)

commit 98f99e882b0d9306da1247c5b3ea4c625132ff24
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Jan 22 01:24:10 2011 +0100

    Always decode folder name for display

 postler/postler-folders.vala |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index e64385f..a457f00 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -311,10 +311,11 @@ public class Postler.Folders : Gtk.TreeView {
                         need_update = true;
                     }
 
+                    string display_name = folder.label ?? decode_foldername (folder_name);
                     store.insert_with_values (out folder_iter,
                         folder.localized != null ? account_iter : parent_iter, -1,
                         Columns.ICON, folder.stock_id ?? Gtk.STOCK_DIRECTORY,
-                        Columns.NAME, folder.label ?? decode_foldername (folder_name),
+                        Columns.NAME, display_name,
                         Columns.ELLIPSIZE, Pango.EllipsizeMode.MIDDLE,
                         Columns.LOCATION, account_info.path + "/" + name,
                         Columns.INFO, account_info,
@@ -325,9 +326,9 @@ public class Postler.Folders : Gtk.TreeView {
                     monitor = msg_dir.monitor_directory (0, null);
                     string path = store.get_string_from_iter (folder_iter);
                     monitor.changed.connect ((monitor, file, other, event) => {
-                        unread_monitor_changed (msg_dir, path, folder.label ?? folder_name);
+                        unread_monitor_changed (msg_dir, path, display_name);
                     });
-                    unread_monitor_changed (msg_dir, path, folder.label ?? folder_name);
+                    unread_monitor_changed (msg_dir, path, display_name);
                     store.set (folder_iter, Columns.UNREAD_MONITOR, monitor);
                 }