X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=9bb9588872599f6e035736de0b8e127ebd512ff0;hp=498fc4d06015126ac3f9803c783158db27520559;hb=64333784e87e5ea5c6156078caacaca7ffbd6b5f;hpb=3e28a4f8349e678cb9d93d6fc3a913b15ffbd9b0 diff --git a/src/modest-main.c b/src/modest-main.c index 498fc4d..9bb9588 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -56,9 +56,9 @@ main (int argc, char *argv[]) g_thread_init (NULL); gdk_threads_init (); - gdk_threads_enter (); /* CHECKED */ + gdk_threads_enter (); - if (!gtk_init_check(&argc, &argv)) { + if (!gtk_init_check (&argc, &argv)) { g_printerr ("modest: failed to initialize gtk\n"); retval = 1; goto cleanup; @@ -79,7 +79,7 @@ main (int argc, char *argv[]) } /* 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, + * 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. @@ -87,12 +87,10 @@ main (int argc, char *argv[]) if (show_ui_without_top_application_method) gtk_widget_show_all (GTK_WIDGET(win)); - - gtk_main (); - retval = 0; + gtk_main (); cleanup: - gdk_threads_leave (); /* CHECKED */ + gdk_threads_leave (); if (!modest_init_uninit ()) { g_printerr ("modest: modest_init_uninit failed\n"); @@ -101,4 +99,3 @@ cleanup: return retval; } -