X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-runtime.c;h=de3fa1f9a96043a6c9996ac69c22c0f959a4a29b;hp=692b89dd5974f1d92495d75a2eb7000ee0695f56;hb=bb790bd8b50e81a1e965341d010864d6000c5b38;hpb=e5d4412a9f76a8ba843fc979f9439bd092095ea8 diff --git a/src/modest-runtime.c b/src/modest-runtime.c index 692b89d..de3fa1f 100644 --- a/src/modest-runtime.c +++ b/src/modest-runtime.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -44,11 +45,6 @@ #include #include -#if MODEST_PLATFORM_ID==2 /* maemo/hildon */ -#include -static gboolean init_hildon (void); -#endif /* MODEST_PLATFORM_ID==2 */ - static gboolean init_header_columns (ModestConf *conf, gboolean overwrite); static gboolean init_local_folders (void); static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr); @@ -56,13 +52,16 @@ 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 void init_default_settings (ModestConf *conf); + static ModestSingletons *_singletons = NULL; + /* * defaults for the column headers */ - typedef struct { ModestHeaderViewColumn col; guint width; @@ -95,7 +94,14 @@ static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = { {MODEST_HEADER_VIEW_COLUMN_ATTACH, 40}, {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,200}, }; - + +#ifdef MODEST_PLATFORM_MAEMO +static const TnyFolderType LOCAL_FOLDERS[] = { + TNY_FOLDER_TYPE_OUTBOX, + TNY_FOLDER_TYPE_DRAFTS, + TNY_FOLDER_TYPE_SENT +}; +#else static const TnyFolderType LOCAL_FOLDERS[] = { TNY_FOLDER_TYPE_OUTBOX, TNY_FOLDER_TYPE_DRAFTS, @@ -103,6 +109,8 @@ static const TnyFolderType LOCAL_FOLDERS[] = { TNY_FOLDER_TYPE_TRASH, TNY_FOLDER_TYPE_ARCHIVE }; +#endif /* MODEST_PLATFORM_MAEMO */ + gboolean @@ -128,14 +136,12 @@ modest_runtime_init (void) g_printerr ("modest: failed to initialize singletons\n"); return FALSE; } - -#if MODEST_PLATFORM_ID==2 - if (!init_hildon ()) { + + if (!modest_platform_init()) { modest_runtime_uninit (); - g_printerr ("modest: failed to initialize hildon\n"); + g_printerr ("modest: failed to run platform-specific initialization\n"); return FALSE; } -#endif /* MODEST_PLATFORM_ID==2 */ /* based on the debug settings, we decide whether to overwrite old settings */ reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS; @@ -145,6 +151,8 @@ modest_runtime_init (void) return FALSE; } + init_default_settings (modest_singletons_get_conf (my_singletons)); + if (!init_local_folders()) { modest_runtime_uninit (); g_printerr ("modest: failed to init local folders\n"); @@ -157,6 +165,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 @@ -187,8 +199,7 @@ modest_runtime_uninit (void) g_object_unref (G_OBJECT(_singletons)); _singletons = NULL; } - if (G_IS_OBJECT(_singletons)) - g_warning ("BUG: _singletons is still alive\n"); + modest_runtime_verify_object_death (_singletons, "_singletons"); return TRUE; } @@ -282,11 +293,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; @@ -521,26 +533,12 @@ init_debug_logging (void) static void init_i18n (void) { - bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR); + /* Setup gettext, to use our .po files: */ + /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */ + bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - -} - - -#if MODEST_PLATFORM_ID==2 -static gboolean -init_hildon (void) -{ - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to acquire osso context\n"); - return FALSE; - } } -#endif /* MODEST_PLATFORM_ID==2 */ /* @@ -553,34 +551,46 @@ init_stock_icons (void) static gboolean registered = FALSE; if (!registered) { + GtkIconTheme *current_theme; GdkPixbuf *pixbuf; GtkIconFactory *factory; gint i; static GtkStockItem items[] = { +#ifdef MODEST_PLATFORM_MAEMO + { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL }, + { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL }, + { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL }, +#endif /*MODEST_PLATFORM_MAEMO*/ { 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 [] = { +#ifdef MODEST_PLATFORM_MAEMO + MODEST_TOOLBAR_ICON_SPLIT_VIEW, + MODEST_TOOLBAR_ICON_SORT, + MODEST_TOOLBAR_ICON_REFRESH, +#endif /*MODEST_PLATFORM_MAEMO*/ 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 */ + MODEST_TOOLBAR_ICON_FORMAT_BULLETS, }; registered = TRUE; @@ -592,17 +602,26 @@ init_stock_icons (void) factory = gtk_icon_factory_new (); gtk_icon_factory_add_default (factory); + current_theme = gtk_icon_theme_get_default (); + /* Register icons to accompany stock items */ for (i = 0; i < G_N_ELEMENTS (items); i++) { - pixbuf = NULL; + +#ifdef MODEST_PLATFORM_MAEMO /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ + pixbuf = gtk_icon_theme_load_icon (current_theme, + items_names[i], + 26, + GTK_ICON_LOOKUP_NO_SVG, + NULL); +#else pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL); +#endif if (pixbuf != NULL) { GtkIconSet *icon_set; GdkPixbuf *transparent; transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff); - icon_set = gtk_icon_set_new_from_pixbuf (transparent); gtk_icon_factory_add (factory, items[i].stock_id, icon_set); gtk_icon_set_unref (icon_set); @@ -616,3 +635,58 @@ 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); +} + + +static void +init_default_settings (ModestConf *conf) +{ + if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_CONNECT_AT_STARTUP, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_CONNECT_AT_STARTUP, TRUE, NULL); + +}