Fixes NB#112513, show the proper account title when opening folders window from notif...

[modest] / src / hildon2 / modest-hildon2-details-dialog.c

diff --git a/src/hildon2/modest-hildon2-details-dialog.c b/src/hildon2/modest-hildon2-details-dialog.c
index 52079c5..2bc983a 100644 (file)
--- a/src/hildon2/modest-hildon2-details-dialog.c
+++ b/src/hildon2/modest-hildon2-details-dialog.c
@@ -44,6 +44,7 @@
 #include <modest-text-utils.h>
 #include "modest-hildon2-details-dialog.h"
 #include <hildon/hildon-pannable-area.h>
+#include <modest-ui-constants.h>
 
 static void modest_hildon2_details_dialog_create_container_default (ModestDetailsDialog *self);
 
@@ -88,7 +89,8 @@ modest_hildon2_details_dialog_init (ModestHildon2DetailsDialog *self)
 
 GtkWidget*
 modest_hildon2_details_dialog_new_with_header (GtkWindow *parent, 
-                                              TnyHeader *header)
+                                              TnyHeader *header,
+                                              gboolean get_size)
 {
        ModestDetailsDialog *dialog;
 
@@ -100,7 +102,7 @@ modest_hildon2_details_dialog_new_with_header (GtkWindow *parent,
                                                        NULL));
 
        MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog);
-       MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header);
+       MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header, get_size);
 
        return GTK_WIDGET (dialog);
 }
@@ -130,18 +132,23 @@ modest_hildon2_details_dialog_create_container_default (ModestDetailsDialog *sel
 {
        ModestHildon2DetailsDialogPrivate *priv;
        GtkWidget *pannable;
+       GtkWidget *align;
 
        priv = MODEST_HILDON2_DETAILS_DIALOG_GET_PRIVATE (self);
 
-       gtk_window_set_default_size (GTK_WINDOW (self), 400, 220);
+       gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
 
        priv->props_table = gtk_table_new (0, 2, FALSE);
        gtk_table_set_col_spacings (GTK_TABLE (priv->props_table), 12);
        gtk_table_set_row_spacings (GTK_TABLE (priv->props_table), 1);
 
+       align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
+
        pannable = g_object_new (HILDON_TYPE_PANNABLE_AREA, "initial-hint", TRUE, NULL);
+       gtk_container_add (GTK_CONTAINER (align), priv->props_table);
        hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), 
-                                               GTK_WIDGET (priv->props_table));
+                                               GTK_WIDGET (align));
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), pannable);
 
        gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);