From f23f8b27f1ab3f6b8a26f00cb1e442e5a809a71f Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Wed, 9 Apr 2008 11:37:49 +0300 Subject: [PATCH] Show progress dialog, fix some warnings. --- src/mapper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mapper.c b/src/mapper.c index 00798cd..a7d75d0 100644 --- 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(); -- 2.39.5