More fixes for accounts window in gtk

diff --git a/src/widgets/modest-accounts-window.c b/src/widgets/modest-accounts-window.c
index 61c0154..ee4456c 100644 (file)
--- a/src/widgets/modest-accounts-window.c
+++ b/src/widgets/modest-accounts-window.c
@@ -129,7 +129,12 @@ modest_accounts_window_get_type (void)
                        (GInstanceInitFunc) modest_accounts_window_instance_init,
                        NULL
                };
-               my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
+               my_type = g_type_register_static (
+#ifdef MODEST_TOOLKIT_HILDON2
+                                                 MODEST_TYPE_HILDON2_WINDOW,
+#else
+                                                 MODEST_TYPE_WINDOW,
+#endif
                                                  "ModestAccountsWindow",
                                                  &my_info, 0);
        }
@@ -266,8 +271,8 @@ modest_accounts_window_new_real (void)
 
        box_alignment = gtk_alignment_new (0, 0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (box_alignment), 
-                                  HILDON_MARGIN_HALF, 0,
-                                  HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
+                                  MODEST_MARGIN_HALF, 0,
+                                  MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
        priv->box = gtk_vbox_new (FALSE, 0);
 
        no_accounts_label = gtk_label_new (_("mcen_ia_noaccounts"));

diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h
index 7ced3a4..3534087 100644 (file)
--- a/src/widgets/modest-ui-constants.h
+++ b/src/widgets/modest-ui-constants.h
@@ -69,6 +69,7 @@
 #define MODEST_DIALOG_WINDOW_MIN_HEIGHT 172
 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642
 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172
+#define MODEST_EDITABLE_SIZE 0
 #endif
 #define MODEST_FOLDER_PATH_SEPARATOR " / "
 #define MODEST_FOLDER_DOT " · "