Silence compiler warnings

[fio.git] / gfio.c

diff --git a/gfio.c b/gfio.c
index 65302e6075a01daad0b794417909e0e213b4f66a..ce180911db343ae8b7b94054262f53ae023523a1 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -444,12 +444,12 @@ static int send_job_file(struct gui_entry *ge)
        while (!flist_empty(&gc->o_list)) {
                struct gfio_client_options *gco;
 
-               gco = flist_entry(gc->o_list.next, struct gfio_client_options, list);
+               gco = flist_first_entry(&gc->o_list, struct gfio_client_options, list);
                flist_del(&gco->list);
                free(gco);
        }
 
-       ret = fio_client_send_ini(gc->client, ge->job_file);
+       ret = fio_client_send_ini(gc->client, ge->job_file, false);
        if (!ret)
                return 0;
 
@@ -459,10 +459,12 @@ static int send_job_file(struct gui_entry *ge)
 
 static void *server_thread(void *arg)
 {
+       fio_server_create_sk_key();
        is_backend = 1;
        gfio_server_running = 1;
        fio_start_server(NULL);
        gfio_server_running = 0;
+       fio_server_destroy_sk_key();
        return NULL;
 }
 
@@ -1677,7 +1679,7 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
         * Without it, the update that happens in gfio_update_thread_status
         * doesn't really happen in a timely fashion, you need expose events
         */
-#if !GTK_CHECK_VERSION(2, 24, 0)
+#if !GLIB_CHECK_VERSION(2, 31, 0)
        if (!g_thread_supported())
                g_thread_init(NULL);
 #endif
@@ -1687,7 +1689,9 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
        gtk_init(argc, argv);
        settings = gtk_settings_get_default();
        gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "gfio setting");
+#if !GLIB_CHECK_VERSION(2, 36, 0)
        g_type_init();
+#endif
        gdk_color_parse("#fffff4", &gfio_color_lightyellow);
        gdk_color_parse("white", &gfio_color_white);