*************/
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;
}
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);
{
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));
}
/***********
/* 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();