Change borders in account view window

pmo-trunk-r7528

diff --git a/src/hildon2/modest-account-view-window.c b/src/hildon2/modest-account-view-window.c
index 682e506..96482cd 100644 (file)
--- a/src/hildon2/modest-account-view-window.c
+++ b/src/hildon2/modest-account-view-window.c
@@ -308,7 +308,6 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
 
        pannable = hildon_pannable_area_new ();
        g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL);
-       gtk_container_set_border_width (GTK_CONTAINER (pannable), MODEST_MARGIN_DEFAULT);
        gtk_widget_show (pannable);
        gtk_container_add (GTK_CONTAINER (pannable), 
                           GTK_WIDGET (priv->account_view));
@@ -317,7 +316,7 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
        g_signal_connect (G_OBJECT (priv->account_view), "row-activated",
                          G_CALLBACK (on_account_activated), self);
 
-       gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_HALF);
+       gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_DEFAULT);
 
 }
 

diff --git a/src/hildon2/modest-connection-specific-smtp-window.c b/src/hildon2/modest-connection-specific-smtp-window.c
index 7c8dd71..ca1833f 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-window.c
@@ -388,15 +388,9 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow
        //gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
 
        /* Introductory note: */
-       /* TODO: For some reason this label does not wrap. It is truncated. */
        GtkWidget *label = gtk_label_new(_("mcen_ia_optionalsmtp_note"));
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-       /* So that it is shown without being truncated: */
-       /* gtk_label_set_max_width_chars (GTK_LABEL (label), 20); */
-       /* The documentation for gtk_label_set_line_wrap() says that we must 
-        * call gtk_widget_set_size_request() with a hard-coded width, 
-        * though I wonder why gtk_label_set_max_width_chars() isn't enough. */
        gtk_widget_set_size_request (label, 600, -1);
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, MODEST_MARGIN_HALF);