Improve shutdown code

[grits] / src / plugins / map.c

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 6c7379691bcda2cd07db0ac845b561d8998fe485..b1363e44a438f1e5a5d8ff608359432335ba3285 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -220,6 +220,7 @@ static void grits_plugin_map_init(GritsPluginMap *map)
        map->wms   = grits_wms_new(
                "http://labs.metacarta.com/wms/vmap0", "basic", "image/png",
                "osm/", "png", TILE_WIDTH, TILE_HEIGHT);
+       g_object_ref(map->tiles);
 }
 static void grits_plugin_map_dispose(GObject *gobject)
 {
@@ -228,6 +229,10 @@ static void grits_plugin_map_dispose(GObject *gobject)
        /* Drop references */
        if (map->viewer) {
                g_signal_handler_disconnect(map->viewer, map->sigid);
+               grits_viewer_remove(map->viewer, map->tiles);
+               soup_session_abort(map->wms->http->soup);
+               while (gtk_events_pending())
+                       gtk_main_iteration();
                g_object_unref(map->viewer);
                map->viewer = NULL;
        }