X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fsat.c;h=0d4f0cb26f0f20af02eab00664f54302b40e40c1;hb=eff89f2a1c780546bb9a0429ef0465cbece7fe56;hp=f19df1cdba7bc6e15239f35c4448b63f105da47a;hpb=80f10eefae0a443d3440dba2548a5184d62e7e9c;p=grits

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index f19df1c..0d4f0cb 100644
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 
 #include <time.h>
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 
@@ -220,14 +219,15 @@ static void grits_plugin_sat_dispose(GObject *gobject)
 	sat->aborted = TRUE;
 	/* Drop references */
 	if (sat->viewer) {
-		g_signal_handler_disconnect(sat->viewer, sat->sigid);
-		grits_viewer_remove(sat->viewer, sat->tiles);
+		GritsViewer *viewer = sat->viewer;
+		sat->viewer = NULL;
+		g_signal_handler_disconnect(viewer, sat->sigid);
+		grits_viewer_remove(viewer, GRITS_OBJECT(sat->tiles));
 		soup_session_abort(sat->wms->http->soup);
 		g_thread_pool_free(sat->threads, TRUE, TRUE);
 		while (gtk_events_pending())
 			gtk_main_iteration();
-		g_object_unref(sat->viewer);
-		sat->viewer = NULL;
+		g_object_unref(viewer);
 	}
 	G_OBJECT_CLASS(grits_plugin_sat_parent_class)->dispose(gobject);
 }