misc

diff --git a/src/mapper.c b/src/mapper.c
index 291143ccec0efaa925c09ad5c64a7e04a01c3a0a..9d96ae9fb5a6598320fa3a9a8ff1d43481751bb0 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -207,41 +207,38 @@ if (NULL == (_rfcomm_req_proxy = dbus_g_proxy_new_for_name(dbus_conn, BTCOND_SER
 gint 
 main(gint argc, gchar * argv[])
 {
-       printf("%s()\n", __PRETTY_FUNCTION__);
-
-       /* Initialize localization. */
-       setlocale(LC_ALL, "");
-       bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
-       bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-       textdomain(GETTEXT_PACKAGE);
-
-       g_thread_init(NULL);
-       g_type_init();
-       if (mapper_osso_init()!=0)
-               return 1;
-       set_var_defaults();     
-#ifdef WITH_GST
-       gst_init(&argc, &argv);
-       speak_init(120,50);
+/* Initialize localization. */
+setlocale(LC_ALL, "");
+bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+textdomain(GETTEXT_PACKAGE);
+
+g_thread_init(NULL);
+g_type_init();
+if (mapper_osso_init()!=0)
+       return 1;
+set_var_defaults();    
+#if defined (WITH_GST) && defined (WITH_ESPEAK)
+gst_init(&argc, &argv);
+speak_init(120,50);
 #endif
-       gtk_init(&argc, &argv);
-       gconf_init(argc, argv, NULL);
-       gnome_vfs_init();
-       curl_global_init(CURL_GLOBAL_NOTHING);
-       timezone_init();
-       gpx_init();
-       mapper_init(argc, argv);
-       if (mapper_osso_cb_init()!=0)
-               return 1;
-       gtk_main();
-       mapper_destroy();
-#ifdef WITH_GST
-       speak_deinit();
+gtk_init(&argc, &argv);
+gconf_init(argc, argv, NULL);
+gnome_vfs_init();
+curl_global_init(CURL_GLOBAL_NOTHING);
+timezone_init();
+gpx_init();
+mapper_init(argc, argv);
+if (mapper_osso_cb_init()!=0)
+       return 1;
+gtk_main();
+mapper_destroy();
+#if defined (WITH_GST) && defined (WITH_ESPEAK)
+speak_deinit();
 #endif
-       gnome_vfs_shutdown();
+gnome_vfs_shutdown();
 #ifdef WITH_OSSO
-       osso_deinitialize(_osso);
+osso_deinitialize(_osso);
 #endif
-       vprintf("%s(): return\n", __PRETTY_FUNCTION__);
-       return 0;
+return 0;
 }