X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2Fplugin-loader.c;h=296a58f658ce5f741fbc1e9a4bf4f8d7abc40f29;hb=fabc4f9b35b4d4e1bb3c3f67971e8e134889c453;hp=a502af6d9556000d1c33ba89d9a81faf658c8a5d;hpb=7c8f6a1f397d9be0127bf9a56e3bb0ff66d54d77;p=projects%2Fchimara%2Fchimara.git diff --git a/tests/plugin-loader.c b/tests/plugin-loader.c index a502af6..296a58f 100644 --- a/tests/plugin-loader.c +++ b/tests/plugin-loader.c @@ -17,7 +17,7 @@ * contributor may be used to endorse or promote products derived * from this software without specific prior written permission. * - * main.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS + * plugin-loader.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL Philip en Marijn OR ANY OTHER CONTRIBUTORS @@ -61,7 +61,6 @@ create_window(void) g_signal_connect(window, "delete-event", G_CALLBACK(quit), NULL); glk = chimara_glk_new(); g_object_ref(glk); - g_signal_connect(glk, "stopped", G_CALLBACK(gtk_main_quit), NULL); gtk_container_add(GTK_CONTAINER(window), glk); } @@ -89,8 +88,6 @@ main(int argc, char *argv[]) textdomain(GETTEXT_PACKAGE); #endif - if( !g_thread_supported() ) - g_thread_init(NULL); gdk_threads_init(); gtk_init(&argc, &argv); @@ -100,7 +97,7 @@ main(int argc, char *argv[]) if(argc < 2) g_error("Must provide a plugin\n"); - chimara_glk_set_resource_load_callback(CHIMARA_GLK(glk), (ChimaraResourceLoadFunc)resource_load, NULL); + chimara_glk_set_resource_load_callback(CHIMARA_GLK(glk), (ChimaraResourceLoadFunc)resource_load, NULL, NULL); if( !chimara_glk_run(CHIMARA_GLK(glk), argv[1], argc - 1, argv + 1, &error) ) g_error("Error starting Glk library: %s\n", error->message);