Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-toolkit-utils.c

diff --git a/src/widgets/modest-toolkit-utils.c b/src/widgets/modest-toolkit-utils.c
index c67338d..1ffbf3b 100644 (file)
--- a/src/widgets/modest-toolkit-utils.c
+++ b/src/widgets/modest-toolkit-utils.c
@@ -40,6 +40,9 @@
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon.h>
 #endif
+#ifdef MODEST_TOOLKIT_GTK
+#include <modest-gtk-window-mgr.h>
+#endif
 
 /* Label child of a captioned */
 #define CAPTIONED_LABEL_CHILD "captioned-label"
@@ -188,7 +191,11 @@ modest_toolkit_utils_create_vcaptioned_with_size_type    (GtkSizeGroup *size_gro
                label = gtk_label_new (title);
        }
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+#ifdef MODEST_TOOLKIT_HILDON2
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+#else
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), MODEST_MARGIN_HALF, 0, 0, 0);
+#endif
 
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
 #ifdef MAEMO_CHANGES
@@ -330,10 +337,12 @@ modest_toolkit_utils_create_group_box (const gchar *label_text, GtkWidget *conte
        return box;
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean match_all (TnyList *list, GObject *item, gpointer match_data)
 {
        return TRUE;
 }
+#endif
 
 gboolean
 modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs)
@@ -433,4 +442,3 @@ modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, g
        return FALSE;
 #endif
 }
-