Remove separator in hildon2

diff --git a/src/widgets/modest-compact-mail-header-view.c b/src/widgets/modest-compact-mail-header-view.c
index 5837ad3..55d69f3 100644 (file)
--- a/src/widgets/modest-compact-mail-header-view.c
+++ b/src/widgets/modest-compact-mail-header-view.c
@@ -415,7 +415,7 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer
        gtk_box_pack_start (GTK_BOX (main_vbox), headers_date_hbox, FALSE, FALSE, 0);
 
        main_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_box_pack_start (GTK_BOX (main_vbox), headers_date_hbox, FALSE, FALSE, 0);
 
        main_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);

-       gtk_alignment_set_padding (GTK_ALIGNMENT (main_align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (main_align), 0, MODEST_MARGIN_HALF, MODEST_MARGIN_DOUBLE, 0);

        priv->event_box = gtk_event_box_new ();
        gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->event_box), TRUE);
        gtk_container_add (GTK_CONTAINER (main_align), main_vbox);
        priv->event_box = gtk_event_box_new ();
        gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->event_box), TRUE);
        gtk_container_add (GTK_CONTAINER (main_align), main_vbox);

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 72f0f66..994f926 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -1087,7 +1087,6 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
 {
        ModestGtkhtmlMsgViewPrivate *priv;
        GtkAdjustment *html_vadj;
 {
        ModestGtkhtmlMsgViewPrivate *priv;
        GtkAdjustment *html_vadj;

-       GtkWidget *separator;

 
        GTK_WIDGET_UNSET_FLAGS (obj, GTK_NO_WINDOW);
        gtk_widget_set_redraw_on_allocate (GTK_WIDGET (obj), TRUE);
 
        GTK_WIDGET_UNSET_FLAGS (obj, GTK_NO_WINDOW);
        gtk_widget_set_redraw_on_allocate (GTK_WIDGET (obj), TRUE);

@@ -1198,8 +1197,10 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
                g_free (att_label);
        }
 
                g_free (att_label);
        }
 

+#ifndef MODEST_TOOLKIT_HILDON2

        separator = gtk_hseparator_new ();
        gtk_box_pack_start (GTK_BOX(priv->headers_box), separator, FALSE, FALSE, 0);
        separator = gtk_hseparator_new ();
        gtk_box_pack_start (GTK_BOX(priv->headers_box), separator, FALSE, FALSE, 0);

+#endif

 
        gtk_widget_set_parent (priv->headers_box, GTK_WIDGET (obj));
 
 
        gtk_widget_set_parent (priv->headers_box, GTK_WIDGET (obj));