Switch map and sat plugins to using thread pools

[grits] / src / grits-test.c

diff --git a/src/grits-test.c b/src/grits-test.c
index 1890f817a94b0938b094f93fc4897a1ebecbab3e..67e299d887d4376f50d0aa85d5203317559ebfcf 100644 (file)
--- a/src/grits-test.c
+++ b/src/grits-test.c
@@ -31,13 +31,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;
 }
@@ -46,7 +46,7 @@ static gboolean on_delete(GtkWidget *widget, GdkEvent *event, gpointer data)
        return grits_shutdown(widget);
 }
 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
-               gpointer window)
+               gpointer _)
 {
        if (event->keyval == GDK_q)
                return grits_shutdown(widget);
@@ -57,7 +57,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));
 }
 
 /***********
@@ -88,12 +89,13 @@ int main(int argc, char **argv)
 
        /* Configurable stuff */
        grits_viewer_set_offline(viewer, TRUE);
-       load_plugin(plugins, "elev",  viewer, prefs, GTK_NOTEBOOK(config));
+       (void)load_plugin;
        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();