* added primitive sanity checks for page 2 of account wizard

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 77327c0..5f97692 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -82,18 +82,21 @@ main (int argc, char *argv[])
 
 
        gtk_init (&argc, &argv);
+
+       modest_icon_factory_init ();
+       
        modest_ui = MODEST_UI(modest_ui_new (modest_conf));
        if (!modest_ui) {
                g_warning ("failed to initialize ui");
                goto cleanup;
        }
-
+       
        {
                gboolean ok;
                gtk_init (&argc, &argv);
 
                if (mailto||cc||bcc||subject||body)
-                       ok = modest_ui_show_edit_window (modest_ui,
+                       ok = modest_ui_new_edit_window (modest_ui,
                                                         mailto,  /* to */
                                                         cc,      /* cc */
                                                         bcc,     /* bcc */
@@ -123,6 +126,8 @@ cleanup:
        if (modest_conf)
                g_object_unref (modest_conf);
 
+       modest_icon_factory_uninit ();
+
        return retval;
 }
 
@@ -186,9 +191,9 @@ install_test_account (ModestConf *conf)
                }
        }
        if (!modest_identity_mgr_add_identity (id_mgr,
-                                                                                  MODEST_IDENTITY_DEFAULT_IDENTITY,
-                                                                                  "user@localhost",
-                                                                                  "", "", FALSE, NULL, FALSE ))
+                                              MODEST_IDENTITY_DEFAULT_IDENTITY,
+                                              "user@localhost",
+                                              "", "", FALSE, NULL, FALSE ))
                g_warning ("failed to add test identity");
        
        g_object_unref (G_OBJECT(acc_mgr));