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 <federico@novell.com>

Conflicts:

	modules/mail/e-mail-shell-sidebar.c

1 files changed, 9 insertions, 0 deletions

diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 1b55f0524f..30dd9d5e51 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -211,6 +211,14 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	requisition->width = MAX (requisition->width, ink_rect.width + border);
 }
 
+static void
+mail_shell_sidebar_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+{
+	GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
+	g_print ("EMailShellSidebar allocation: %dx%d\n", allocation->width, allocation->height);
+}
+
+
 static guint32
 mail_shell_sidebar_check_state (EShellSidebar *shell_sidebar)
 {
@@ -240,6 +248,7 @@ mail_shell_sidebar_class_init (EMailShellSidebarClass *class)
 
 	widget_class = GTK_WIDGET_CLASS (class);
 	widget_class->size_request = mail_shell_sidebar_size_request;
+	widget_class->size_allocate = mail_shell_sidebar_size_allocate;
 
 	shell_sidebar_class = E_SHELL_SIDEBAR_CLASS (class);
 	shell_sidebar_class->check_state = mail_shell_sidebar_check_state;