From 7245c36554efbdb90aca29840fff74661ddf540e Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Tue, 23 Mar 2010 14:25:40 +0530 Subject: Don't hardcode a width, but compute a suitable one We do this by measuring a template string, which contains a sample name for an email account. This is what normally gets displayed in the folder tree, so such a sample string should give a reasonable width. Signed-off-by: Federico Mena Quintero Conflicts: modules/mail/e-mail-shell-sidebar.c --- modules/mail/e-mail-shell-view.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'modules/mail/e-mail-shell-view.c') diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index aae451c14c..c3429859f7 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -933,21 +933,6 @@ mail_shell_view_update_actions (EShellView *shell_view) e_mail_shell_view_update_popup_labels (mail_shell_view); } -/* Vmethod implementation for EShellView::new_shell_sidebar. We create a mail - * folder tree for the mailer. - */ -static GtkWidget * -new_shell_sidebar (EShellView *shell_view) -{ - GtkWidget *sidebar; - PangoLayout *layout; - - sidebar = e_mail_shell_sidebar_new (shell_view); - gtk_widget_set_size_request (sidebar, 300, -1); - - return sidebar; -} - static void mail_shell_view_class_init (EMailShellViewClass *class, GTypeModule *type_module) @@ -972,7 +957,7 @@ mail_shell_view_class_init (EMailShellViewClass *class, shell_view_class->search_options = "/mail-search-options"; shell_view_class->search_rules = "searchtypes.xml"; shell_view_class->new_shell_content = e_mail_shell_content_new; - shell_view_class->new_shell_sidebar = new_shell_sidebar; + shell_view_class->new_shell_sidebar = e_mail_shell_sidebar_new; shell_view_class->toggled = mail_shell_view_toggled; shell_view_class->execute_search = mail_shell_view_execute_search; shell_view_class->update_actions = mail_shell_view_update_actions; -- cgit v1.2.3