X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=8a9fa577e43383944ede91d16c2c3aba6fb3c2ab;hp=77327c0e56371d9ddc03f25fdba9711b8f95656d;hb=0f4599a851ee136d2621628af5410fef2beac1ed;hpb=5cf98f0ac9cf7c47935ae5339de689eb63e79cb7 diff --git a/src/modest-main.c b/src/modest-main.c index 77327c0..8a9fa57 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -1,196 +1,110 @@ -/* modest-main.c -- part of modest */ -#include - -#include "modest-conf.h" -#include "modest-account-mgr.h" -#include "modest-identity-mgr.h" -#include "modest-ui.h" +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ -#ifdef HAVE_CONFIG_H #include -#endif /*HAVE_CONFIG_H*/ -#include - -static void install_basic_conf_settings (ModestConf *conf); -static void install_test_account (ModestConf *conf); +#include +#include +#include +#include +#include +#include int main (int argc, char *argv[]) { - GOptionContext *context = NULL; - ModestConf *modest_conf = NULL; - ModestUI *modest_ui = NULL; - - GError *err = NULL; + /* Usually we don't show the application at first, + * because we wait for the top_application D-Bus method to + * be called. But that's annoying when starting from the + * command line.: */ + gboolean show_ui_without_top_application_method = FALSE; + if (argc >= 2) { + printf ("DEBUG: %s: argv[1]=%s\n", __FUNCTION__, argv[1]); + if (strcmp (argv[1], "showui") == 0) + show_ui_without_top_application_method = TRUE; + } + + ModestWindow *win; int retval = 0; + + if (!g_thread_supported()) + g_thread_init (NULL); - static gboolean update, debug, reinstall; - static gchar *mailto, *subject, *bcc, *cc, *body; - - static GOptionEntry options[] = { - { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, - "Run in debug mode" }, - { "update", 'u', 0, G_OPTION_ARG_NONE, &update, - "Send/receive all accounts and exit"}, - { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - "Start writing a new email to "}, - { "subject", 's', 0, G_OPTION_ARG_STRING, &subject, - "Subject for a new mail"}, - { "body", 'b', 0, G_OPTION_ARG_STRING, &body, - "Body for a new email"}, - { "cc", 0, 0, G_OPTION_ARG_STRING, &cc, - "CC-addresses for a new mail (comma-separated)"}, - { "bcc", 0, 0, G_OPTION_ARG_STRING, &bcc, - "BCC-adresses for a new mail (comma-separated)"}, - { "reinstall-factory-settings", 0, 0, G_OPTION_ARG_NONE, &reinstall, - "Delete all settings and start over (*DESTRUCTIVE*)" - }, - { NULL } - }; - - - g_type_init (); - - context = g_option_context_new (NULL); - g_option_context_add_main_entries (context, options, NULL); + gdk_threads_init (); + gdk_threads_enter (); - if (!g_option_context_parse (context, &argc, &argv, &err)) { - g_printerr ("modest: error in command line parameter(s): %s\n", - err ? err->message : ""); + if (!gtk_init_check(&argc, &argv)) { + g_printerr ("modest: failed to initialize gtk\n"); retval = 1; goto cleanup; } - if (debug) { - g_log_set_always_fatal (G_LOG_LEVEL_WARNING); - } - - modest_conf = MODEST_CONF(modest_conf_new()); - if (!modest_conf) { - g_warning ("failed to initialize config system"); - goto cleanup; - } - - if (reinstall) { - modest_conf_remove_key (modest_conf, MODEST_CONF_NAMESPACE, NULL); - install_basic_conf_settings (modest_conf); - install_test_account (modest_conf); + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; goto cleanup; } - - - gtk_init (&argc, &argv); - modest_ui = MODEST_UI(modest_ui_new (modest_conf)); - if (!modest_ui) { - g_warning ("failed to initialize ui"); + win = modest_main_window_new (); + + if (!win) { + g_printerr ("modest: failed to create main window\n"); + retval = 1; goto cleanup; } - - { - gboolean ok; - gtk_init (&argc, &argv); - - if (mailto||cc||bcc||subject||body) - ok = modest_ui_show_edit_window (modest_ui, - mailto, /* to */ - cc, /* cc */ - bcc, /* bcc */ - subject, /* subject */ - body, /* body */ - NULL); /* attachments */ - else - ok = modest_ui_show_main_window (modest_ui); - - if (!ok) - g_warning ("showing window failed"); - else - gtk_main(); - } - + + /* Usually, we only show the UI when we get the "top_application" D-Bus method. + * This allows modest to start via D-Bus activation to provide a service, + * without showing the UI. + * The UI will be shown later (or just after starting if no otehr D-Bus method was used), + * when we receive the "top_application" D-Bus method. + */ + if (show_ui_without_top_application_method) + gtk_widget_show_all (GTK_WIDGET(win)); + + modest_window_mgr_register_window (modest_runtime_get_window_mgr(), + win); + g_object_unref (win); + + gtk_main (); + retval = 0; cleanup: - if (err) - g_error_free (err); - - if (context) - g_option_context_free (context); + gdk_threads_leave (); - if (modest_ui) - g_object_unref (modest_ui); + if (!modest_init_uninit ()) { + g_printerr ("modest: modest_init_uninit failed\n"); + retval = 1; + } - if (modest_conf) - g_object_unref (modest_conf); + g_debug ("closing modest with retval %d", retval); return retval; } - - -static void -install_basic_conf_settings (ModestConf *conf) -{ - g_return_if_fail (conf); - - /* main window size */ - modest_conf_set_int (conf, MODEST_CONF_MAIN_WINDOW_WIDTH, - MODEST_CONF_MAIN_WINDOW_WIDTH_DEFAULT, NULL); - modest_conf_set_int (conf, MODEST_CONF_MAIN_WINDOW_HEIGHT, - MODEST_CONF_MAIN_WINDOW_HEIGHT_DEFAULT, NULL); - - /* edit window size */ - modest_conf_set_int (conf, MODEST_CONF_EDIT_WINDOW_WIDTH, - MODEST_CONF_EDIT_WINDOW_WIDTH_DEFAULT, NULL); - modest_conf_set_int (conf, MODEST_CONF_EDIT_WINDOW_HEIGHT, - MODEST_CONF_EDIT_WINDOW_HEIGHT_DEFAULT, NULL); - - g_print ("modest: returned to factory settings\n"); -} - - -static void -install_test_account (ModestConf *conf) -{ - ModestAccountMgr *acc_mgr; - ModestIdentityMgr *id_mgr; - const gchar *acc_name = "test"; - g_return_if_fail (conf); - - acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (conf)); - if (!acc_mgr) { - g_warning ("failed to instantiate account mgr"); - return; - } - - if (modest_account_mgr_account_exists (acc_mgr, acc_name, NULL)) { - if (!modest_account_mgr_remove_account(acc_mgr, acc_name, NULL)) { - g_warning ("could not delete existing account"); - } - } - - if (!modest_account_mgr_add_account (acc_mgr, acc_name, "mystore", "mytransport", NULL)) - g_warning ("failed to add test account"); - else - { - modest_account_mgr_add_server_account (acc_mgr, "mystore", "localhost", "djcb", - 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)) { - if (!modest_identity_mgr_remove_identity(id_mgr, "myidentity", NULL)) { - g_warning ("could not delete existing identity"); - } - } - if (!modest_identity_mgr_add_identity (id_mgr, - 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)); -}