Show progress dialog, fix some warnings.

diff --git a/src/mapper.c b/src/mapper.c
index 00798cdff08b12772f0a6a418ba01ce057f3a893..a7d75d0b6dd3bc16b063ace1308d428821b8f60c 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -73,6 +73,7 @@
 #include "gps.h"
 #include "gps-conn.h"
 #include "map.h"
+#include "map-download.h"
 #include "route.h"
 #include "track.h"
 #include "ui-common.h"
@@ -275,12 +276,12 @@ mapper_hal_init(DBusGConnection *gdbc)
 DBusError error;
 DBusConnection *dbc=dbus_g_connection_get_connection(gdbc);
 
-g_return_if_fail(dbc);
+g_return_val_if_fail(dbc, FALSE);
 
 dbus_error_init(&error);
 
 ctx=libhal_ctx_new();
-g_return_if_fail(ctx);
+g_return_val_if_fail(ctx, FALSE);
 
 if (!libhal_ctx_set_dbus_connection(ctx, dbc)) {
        g_warning("HAL dbus connection failed");
@@ -480,6 +481,7 @@ if (!gtk_gl_init_check(&argc, &argv)) {
        g_warning("OpenGL init failed");
 }
 #endif
+
 if (mapper_osso_init()!=0)
        return 1;
 if (mapper_osso_cb_init()!=0)
@@ -487,6 +489,7 @@ if (mapper_osso_cb_init()!=0)
 
 init_progress=gtk_progress_bar_new();
 init_dialog=progress_dialog(NULL, "Mapper is loading...",init_progress);
+gtk_widget_show_all(init_dialog);
 g_idle_add((GSourceFunc)mapper_init, NULL);
 gtk_main();
 mapper_destroy();