From 4a1c3b9aba20635705cb5a76f11c793ad597a6d4 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 21 Apr 2008 08:41:29 +0000
Subject: ** Fix for bug #323402

2008-04-21  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #323402

	* em-folder-tree.c: (folder_tree_new):
	* evolution-mail.schemas.in: Be able to disable ellipsizing of folder
	names with hidden option /apps/evolution/mail/display/no_folder_dots.


svn path=/trunk/; revision=35395
---
 mail/ChangeLog                 |  8 ++++++++
 mail/em-folder-tree.c          |  3 ++-
 mail/evolution-mail.schemas.in | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index aa09e8976c..c90b054d0b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #323402
+
+	* em-folder-tree.c: (folder_tree_new):
+	* evolution-mail.schemas.in: Be able to disable ellipsizing of folder
+	names with hidden option /apps/evolution/mail/display/no_folder_dots.
+
 2008-04-20  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #334444
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index c350ac2049..4e94103d44 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -515,7 +515,8 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	gtk_tree_view_column_set_cell_data_func (column, renderer, render_pixbuf, NULL, NULL);
 
 	renderer = gtk_cell_renderer_text_new ();
-	g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+	if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/display/no_folder_dots", NULL))
+		g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
 	gtk_tree_view_column_set_cell_data_func (column, renderer, render_display_name, NULL, NULL);
 
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 2e6785fe6c..8259f67c64 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -225,6 +225,20 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/display/no_folder_dots</key>
+      <applyto>/apps/evolution/mail/display/no_folder_dots</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Disable or enable ellipsizing of folder names in folder tree</short>
+         <long>
+           Whether disable ellipsizing feature of folder names in folder tree.
+         </long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/apps/evolution/mail/display/magic_spacebar</key>
       <applyto>/apps/evolution/mail/display/magic_spacebar</applyto>
-- 
cgit v1.2.3