X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=42d536e033a18ffb53b9063f9bf47e970aabbdd6;hp=185dbd5c482456bc89d23ac14a041e79e2350a5a;hb=51575029ff4027f42ef6be374fd50b2cda5880b4;hpb=3d7174e3c4b8aa4daa36261a8e638b702fac5aba diff --git a/gfio.c b/gfio.c index 185dbd5c..42d536e0 100644 --- 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, 0); if (!ret) return 0; @@ -1677,14 +1677,19 @@ 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 (!g_thread_supported()) g_thread_init(NULL); +#endif + gdk_threads_init(); 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);