From 930a2c61d481d3f1d1d0cdb3dd8b03d5b6b87bd1 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 11 Jul 2007 13:34:57 +0000 Subject: [PATCH] 2007-07-11 Murray Cumming * src/modest-main.c: (main): Only show the UI at the start if the showui command line option was given. For instance, run-standalone src/modest showui Otherwise, we wait for the top_application D-Bus method to be sent by hildon-desktop when the application is selected from the menu. This allows us to run without a UI when osso-global-search uses our D-Bus methods. pmo-trunk-r2697 --- ChangeLog | 2 +- ChangeLog2 | 11 +++++++++++ src/modest-main.c | 18 +++++++++++++++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48f7a59..acb6b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1 @@ - please check the svn log instead +* please check the svn log instead diff --git a/ChangeLog2 b/ChangeLog2 index 37d4726..3c5d445 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,3 +1,14 @@ +2007-07-11 Murray Cumming + + * src/modest-main.c: (main): Only show the UI at the start if + the showui command line option was given. For instance, + run-standalone src/modest showui + Otherwise, we wait for the top_application D-Bus method to + be sent by hildon-desktop when the application is selected + from the menu. + This allows us to run without a UI when osso-global-search + uses our D-Bus methods. + 2007-07-11 Murray Cumming * src/dbus_api/modest-dbus-api.h: Added a define for a diff --git a/src/modest-main.c b/src/modest-main.c index 4adca14..3ed8076 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -34,10 +34,22 @@ #include #include #include +#include int main (int argc, char *argv[]) { + /* 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; @@ -61,14 +73,14 @@ main (int argc, char *argv[]) win = modest_main_window_new (); - /* TODO: Do not show this now. - * Only show it when we get the "top_application" D-Bus method. + /* 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. */ - gtk_widget_show_all (GTK_WIDGET(win)); + if (show_ui_without_top_application_method) + gtk_widget_show_all (GTK_WIDGET(win)); if (!win) { g_printerr ("modest: failed to create main window\n"); -- 1.7.9.5