* Update several UI bits to use internal pointers instead of searching widgets.

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 77327c0..75854ed 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -5,6 +5,7 @@
 #include "modest-account-mgr.h"
 #include "modest-identity-mgr.h"
 #include "modest-ui.h"
+#include "modest-icon-factory.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -72,16 +73,16 @@ main (int argc, char *argv[])
                goto cleanup;
        }
 
+       gtk_init (&argc, &argv);
+
+       modest_icon_factory_init ();
+
        if (reinstall) {
                modest_conf_remove_key (modest_conf, MODEST_CONF_NAMESPACE, NULL);
                install_basic_conf_settings (modest_conf);
-               install_test_account (modest_conf);
                goto cleanup;
        }
 
-
-
-       gtk_init (&argc, &argv);
        modest_ui = MODEST_UI(modest_ui_new (modest_conf));
        if (!modest_ui) {
                g_warning ("failed to initialize ui");
@@ -92,15 +93,17 @@ main (int argc, char *argv[])
                gboolean ok;
                gtk_init (&argc, &argv);
 
-               if (mailto||cc||bcc||subject||body)
-                       ok = modest_ui_show_edit_window (modest_ui,
+               if (mailto||cc||bcc||subject||body) {
+#if 0
+                       ok = modest_ui_new_edit_window (modest_ui,
                                                         mailto,  /* to */
                                                         cc,      /* cc */
                                                         bcc,     /* bcc */
                                                         subject,    /* subject */
                                                         body,    /* body */
                                                         NULL);   /* attachments */
-               else
+#endif
+               } else
                        ok = modest_ui_show_main_window (modest_ui);
 
                if (!ok)
@@ -123,6 +126,8 @@ cleanup:
        if (modest_conf)
                g_object_unref (modest_conf);
 
+       modest_icon_factory_uninit ();
+
        return retval;
 }
 
@@ -177,7 +182,7 @@ install_test_account (ModestConf *conf)
                                                       NULL, "imap");
                modest_account_mgr_add_server_account (acc_mgr, "mytransport", "localhost", NULL,
                                                       NULL, "smtp");
-               
+
        }
        id_mgr = MODEST_IDENTITY_MGR(modest_identity_mgr_new (conf));
        if (modest_identity_mgr_identity_exists(id_mgr, "myidentity", NULL)) {
@@ -186,11 +191,11 @@ 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));
        g_object_unref (G_OBJECT(id_mgr));
 }