* Commented the popup-menu
[modest] / src / modest-runtime.c
index a4fc46a..f071ce9 100644 (file)
@@ -56,13 +56,15 @@ static void     init_i18n (void);
 static void     init_stock_icons (void);
 static void     init_debug_g_type (void);
 static void     init_debug_logging (void);
+static void     init_test_accounts (ModestAccountMgr *acc_mgr);
+
 
 static ModestSingletons *_singletons = NULL;
 
+
 /*
  * defaults for the column headers
  */
-
 typedef struct {
        ModestHeaderViewColumn col;
        guint                  width;
@@ -144,7 +146,7 @@ modest_runtime_init (void)
                g_printerr ("modest: failed to init header columns\n");
                return FALSE;
        }
-
+       
        if (!init_local_folders()) {
                modest_runtime_uninit ();
                g_printerr ("modest: failed to init local folders\n");
@@ -157,6 +159,10 @@ modest_runtime_init (void)
                return FALSE;
        }
 
+       /* create the test accounts if the debug flag for that is set */
+       if (modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_TINY_TEST_ACCOUNTS)
+               init_test_accounts (modest_singletons_get_account_mgr (my_singletons)); 
+       
        /* don't initialize _singletons before all the other init stuff
         * is done; thus, using any of the singleton stuff before
         * runtime is fully init'ed  is avoided
@@ -183,14 +189,12 @@ modest_runtime_init_ui (gint argc, gchar** argv)
 gboolean
 modest_runtime_uninit (void)
 {
-       if (!_singletons) {
-               g_printerr ("modest: modest_runtime is not initialized\n");
-               return FALSE;
+       if (_singletons) {
+               g_object_unref (G_OBJECT(_singletons));
+               _singletons = NULL;
        }
+       modest_runtime_verify_object_death (_singletons, "_singletons");
        
-       g_object_unref (G_OBJECT(_singletons));
-       _singletons = NULL;
-
        return TRUE;
 }
 
@@ -235,6 +239,24 @@ modest_runtime_get_mail_operation_queue (void)
 
 
 
+TnyDevice*
+modest_runtime_get_device (void)
+{
+       g_return_val_if_fail (_singletons, NULL);
+       return modest_singletons_get_device (_singletons);
+}
+
+
+TnyPlatformFactory*
+modest_runtime_get_platform_factory  (void)
+{
+       g_return_val_if_fail (_singletons, NULL);
+       return modest_singletons_get_platform_factory (_singletons);
+}
+
+
+
+
 ModestTnySendQueue*
 modest_runtime_get_send_queue  (TnyTransportAccount *account)
 {
@@ -265,11 +287,12 @@ ModestRuntimeDebugFlags
 modest_runtime_get_debug_flags ()
 {
        static const GDebugKey debug_keys[] = {
-               { "abort-on-warning", MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING },
-               { "log-actions",      MODEST_RUNTIME_DEBUG_LOG_ACTIONS },
-               { "debug-objects",    MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS },
-               { "debug-signals",    MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS },
-               { "factory-settings", MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS }
+               { "abort-on-warning",   MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING },
+               { "log-actions",        MODEST_RUNTIME_DEBUG_LOG_ACTIONS },
+               { "debug-objects",      MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS },
+               { "debug-signals",      MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS },
+               { "factory-settings",   MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS},
+               { "tiny-test-accounts", MODEST_RUNTIME_DEBUG_TINY_TEST_ACCOUNTS}
        };
        const gchar *str;
        static ModestRuntimeDebugFlags debug_flags = -1;
@@ -447,7 +470,7 @@ init_default_account_maybe  (ModestAccountMgr *acc_mgr)
        gchar *default_account;
        gboolean retval = TRUE;
        
-       all_accounts = modest_account_mgr_account_names (acc_mgr, NULL);
+       all_accounts = modest_account_mgr_account_names (acc_mgr);
        if (all_accounts) { /* if there are any accounts, there should be a default one */
                default_account = 
                        modest_account_mgr_get_default_account (acc_mgr);
@@ -543,26 +566,26 @@ init_stock_icons (void)
                static GtkStockItem items[] = {
                        { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
                        { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
-                       { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },
+/*                     { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
                        { MODEST_STOCK_REPLY, "reply", 0, 0, NULL },
                        { MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL },
                        { MODEST_STOCK_FORWARD, "forward", 0, 0, NULL },
-                       { MODEST_STOCK_DELETE, "delete", 0, 0, NULL },
-                       { MODEST_STOCK_NEXT, "next", 0, 0, NULL },
-                       { MODEST_STOCK_PREV, "prev", 0, 0, NULL },
+                       { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, 
+/*                     { MODEST_STOCK_NEXT, "next", 0, 0, NULL }, */
+/*                     { MODEST_STOCK_PREV, "prev", 0, 0, NULL }, */
 /*                     { MODEST_STOCK_STOP, "stop", 0, 0, NULL } */
                };
       
                static gchar *items_names [] = {
                        MODEST_TOOLBAR_ICON_MAIL_SEND,
-                       MODEST_TOOLBAR_ICON_NEW_MAIL,           
-                       MODEST_TOOLBAR_ICON_SEND_RECEIVE,
+                       MODEST_TOOLBAR_ICON_NEW_MAIL,
+/*                     MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
                        MODEST_TOOLBAR_ICON_REPLY,      
                        MODEST_TOOLBAR_ICON_REPLY_ALL,
                        MODEST_TOOLBAR_ICON_FORWARD,
-                       MODEST_TOOLBAR_ICON_DELETE,
-                       MODEST_TOOLBAR_ICON_NEXT,
-                       MODEST_TOOLBAR_ICON_PREV,
+                       MODEST_TOOLBAR_ICON_DELETE, 
+/*                     MODEST_TOOLBAR_ICON_NEXT, */
+/*                     MODEST_TOOLBAR_ICON_PREV, */
 /*                     MODEST_TOOLBAR_ICON_STOP */
                };
 
@@ -599,3 +622,40 @@ init_stock_icons (void)
                g_object_unref (factory);
        }
 }
+
+
+static void
+init_test_accounts (ModestAccountMgr *acc_mgr)
+{
+       const gchar *imap_test = "TnyImapTest";
+       const gchar *pop_test  = "TnyPopTest";
+       const gchar *smtp_test = "TnySmtpTest";
+
+       if (!modest_account_mgr_account_exists (acc_mgr, imap_test, FALSE)) 
+               modest_account_mgr_add_server_account (acc_mgr,
+                                                      imap_test,
+                                                      "imap2.tinymail.org",
+                                                      "tnytest", "tnytest",
+                                                      MODEST_PROTOCOL_STORE_IMAP,
+                                                      MODEST_PROTOCOL_SECURITY_NONE,
+                                                      MODEST_PROTOCOL_AUTH_NONE);
+       if (!modest_account_mgr_account_exists (acc_mgr, pop_test, FALSE)) 
+               modest_account_mgr_add_server_account (acc_mgr,
+                                                      pop_test,
+                                                      "imap2.tinymail.org",
+                                                      "tnytest", "tnytest",
+                                                      MODEST_PROTOCOL_STORE_POP,
+                                                      MODEST_PROTOCOL_SECURITY_NONE,
+                                                      MODEST_PROTOCOL_AUTH_NONE);
+       if (!modest_account_mgr_account_exists (acc_mgr, smtp_test, FALSE)) 
+               modest_account_mgr_add_server_account (acc_mgr,
+                                                      smtp_test,
+                                                      "127.0.0.1",
+                                                      NULL,NULL,
+                                                      MODEST_PROTOCOL_TRANSPORT_SMTP,
+                                                      MODEST_PROTOCOL_SECURITY_NONE,
+                                                      MODEST_PROTOCOL_AUTH_NONE);
+       
+       modest_account_mgr_add_account (acc_mgr, imap_test, imap_test, smtp_test);
+       modest_account_mgr_add_account (acc_mgr,  pop_test, pop_test,  smtp_test);
+}