aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-04-26 16:15:39 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-04-26 16:15:39 +0800
commit243a8109575c26aecd9061163a5b813b357ec283 (patch)
tree6927c4271f7df9d6b0972749f69d98ba2295d3a5 /mail
parent57b27c587e386ae2c66a9088c2b1e46f4046b157 (diff)
downloadgsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.tar
gsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.tar.gz
gsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.tar.bz2
gsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.tar.lz
gsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.tar.xz
gsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.tar.zst
gsoc2013-evolution-243a8109575c26aecd9061163a5b813b357ec283.zip
Committing fix for 323402 from Vincent Noel
svn path=/trunk/; revision=31896
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/em-folder-tree.c9
-rw-r--r--mail/em-migrate.c1
-rw-r--r--mail/evolution-mail.schemas.in.in14
4 files changed, 33 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2c0a895ffc..9d41366902 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-26 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fixes bug #323402
+
+ * em-folder-tree.c: (folder_tree_new): Code for Ellipsizing folder
+ tree. (Patch from Vincent Noel)
+ * em-migrate.c: Adding side_bar_search to
+ * evolution-mail.schemas.in.in: Adding a schema for enabling/disabling
+ side bar search. (Patch from Rakesh)
+
2006-04-24 Srinivasa Ragavan <sragavan@novell.com>
* mail-session.c: (get_password): Ask passphrase if the user is
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index a85c98bd39..465642935c 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -475,6 +475,11 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkWidget *tree;
+ gboolean side_bar_search;
+ GConfClient *gconf;
+
+ gconf = mail_config_get_gconf_client ();
+ side_bar_search = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/side_bar_search", NULL);
tree = gtk_tree_view_new_with_model ((GtkTreeModel *) model);
GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
@@ -487,6 +492,7 @@ 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);
gtk_tree_view_column_pack_start (column, renderer, TRUE);
gtk_tree_view_column_set_cell_data_func (column, renderer, render_display_name, NULL, NULL);
@@ -496,7 +502,8 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
gtk_tree_view_set_headers_visible ((GtkTreeView *) tree, FALSE);
gtk_tree_view_set_search_column((GtkTreeView *)tree, COL_STRING_DISPLAY_NAME);
-
+ gtk_tree_view_set_enable_search((GtkTreeView *)tree, side_bar_search);
+
return (GtkTreeView *) tree;
}
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 86524b153c..723561ec21 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -933,6 +933,7 @@ static e_gconf_map_t mail_accounts_map[] = {
static e_gconf_map_t mail_display_map[] = {
/* /Mail/Display */
+ { "side_bar_search", "mail/display/side_bar_search", E_GCONF_MAP_BOOL },
{ "thread_list", "mail/display/thread_list", E_GCONF_MAP_BOOL },
{ "thread_subject", "mail/display/thread_subject", E_GCONF_MAP_BOOL },
{ "hide_deleted", "mail/display/show_deleted", E_GCONF_MAP_BOOLNOT },
diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in
index 0c0d3f3bf4..dfc5416c70 100644
--- a/mail/evolution-mail.schemas.in.in
+++ b/mail/evolution-mail.schemas.in.in
@@ -170,6 +170,20 @@
<!-- Display Settings -->
<schema>
+ <key>/schemas/apps/evolution/mail/display/side_bar_search</key>
+ <applyto>/apps/evolution/mail/display/side_bar_search</applyto>
+ <owner>evolution-mail</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Enable or disable type ahead search feature</short>
+ <long>
+ Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/evolution/mail/display/mark_citations</key>
<applyto>/apps/evolution/mail/display/mark_citations</applyto>
<owner>evolution-mail</owner>