X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgrits-test.c;h=1a9a4cc5bea7cb2b1107bfe314f0438799dc8c83;hb=bed3380cb43b0d9cfcb2da34fda9bb36258ae46d;hp=5be869b6ccc03d635490ae880070278f4ae931c9;hpb=07448c519e963bae1cfde4f1ff353478dd28136c;p=grits diff --git a/src/grits-test.c b/src/grits-test.c index 5be869b..1a9a4cc 100644 --- a/src/grits-test.c +++ b/src/grits-test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Andy Spencer + * Copyright (C) 2009-2011 Andy Spencer * * 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 @@ -47,7 +47,7 @@ static gboolean on_delete(GtkWidget *widget, GdkEvent *event, gpointer data) static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer _) { - if (event->keyval == GDK_q) + if (event->keyval == GDK_KEY_q) return grits_shutdown(widget); return FALSE; } @@ -65,7 +65,6 @@ static void load_plugin(GritsPlugins *plugins, gchar *name, ***********/ int main(int argc, char **argv) { - g_thread_init(NULL); gdk_threads_init(); gtk_init(&argc, &argv); @@ -79,6 +78,7 @@ int main(int argc, char **argv) GtkWidget *config = gtk_notebook_new(); g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL); g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL); + gtk_widget_set_size_request(GTK_WIDGET(viewer), 300, 300); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(config), GTK_POS_BOTTOM); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(viewer), TRUE, TRUE, 0); @@ -89,9 +89,10 @@ int main(int argc, char **argv) grits_viewer_set_offline(viewer, TRUE); (void)load_plugin; load_plugin(plugins, "env", 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, "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, "map", viewer, prefs, GTK_NOTEBOOK(config)); + //load_plugin(plugins, "alert", viewer, prefs, GTK_NOTEBOOK(config)); //load_plugin(plugins, "radar", viewer, prefs, GTK_NOTEBOOK(config)); load_plugin(plugins, "test", viewer, prefs, GTK_NOTEBOOK(config)); @@ -100,5 +101,10 @@ int main(int argc, char **argv) gdk_threads_leave(); gdk_display_close(gdk_display_get_default()); + + prefs = NULL; + plugins = NULL; + viewer = NULL; + window = vbox = config = NULL; return 0; }