X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgrits-test.c;h=5be869b6ccc03d635490ae880070278f4ae931c9;hb=e7490685f87d22ef6b348854c210cea233881c87;hp=2fef4aef0982ae77828054204582793afecd5aff;hpb=728d24822cd0836e97e4591f561a72f948dc45a7;p=grits

diff --git a/src/grits-test.c b/src/grits-test.c
index 2fef4ae..5be869b 100644
--- a/src/grits-test.c
+++ b/src/grits-test.c
@@ -17,7 +17,6 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkgl.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "grits.h"
@@ -31,13 +30,13 @@ GritsViewer  *viewer  = NULL;
  *************/
 static gboolean grits_shutdown(GtkWidget *window)
 {
+	static gboolean shutdown = FALSE;
+	if (shutdown) return TRUE;
+	shutdown = TRUE;
+
 	grits_plugins_free(plugins);
 	g_object_unref(prefs);
 	gtk_widget_destroy(window);
-
-	while (gtk_events_pending())
-		  gtk_main_iteration();
-
 	gtk_main_quit();
 	return TRUE;
 }
@@ -57,7 +56,8 @@ static void load_plugin(GritsPlugins *plugins, gchar *name,
 {
 	GritsPlugin *plugin = grits_plugins_load(plugins, name, viewer, prefs);
 	GtkWidget *config = grits_plugin_get_config(plugin);
-	gtk_notebook_append_page(notebook, config, gtk_label_new(name));
+	if (config)
+		gtk_notebook_append_page(notebook, config, gtk_label_new(name));
 }
 
 /***********
@@ -68,7 +68,6 @@ int main(int argc, char **argv)
 	g_thread_init(NULL);
 	gdk_threads_init();
 	gtk_init(&argc, &argv);
-	gtk_gl_init(&argc, &argv);
 
 	prefs   = grits_prefs_new(NULL, NULL);
 	plugins = grits_plugins_new(g_getenv("GRITS_PLUGIN_PATH"), prefs);
@@ -89,12 +88,12 @@ int main(int argc, char **argv)
 	/* Configurable stuff */
 	grits_viewer_set_offline(viewer, TRUE);
 	(void)load_plugin;
-	load_plugin(plugins, "elev",  viewer, prefs, GTK_NOTEBOOK(config));
 	load_plugin(plugins, "env",   viewer, prefs, GTK_NOTEBOOK(config));
-	//load_plugin(plugins, "map",   viewer, prefs, GTK_NOTEBOOK(config));
+	load_plugin(plugins, "elev",  viewer, prefs, GTK_NOTEBOOK(config));
 	load_plugin(plugins, "sat",   viewer, prefs, GTK_NOTEBOOK(config));
-	load_plugin(plugins, "test",  viewer, prefs, GTK_NOTEBOOK(config));
+	//load_plugin(plugins, "map",   viewer, prefs, GTK_NOTEBOOK(config));
 	//load_plugin(plugins, "radar", viewer, prefs, GTK_NOTEBOOK(config));
+	load_plugin(plugins, "test",  viewer, prefs, GTK_NOTEBOOK(config));
 
 	gtk_widget_show_all(config);
 	gtk_main();