comparison gui/dialog/dialog.c @ 35629:365dc9336f0d

Pass parameter instead of using global variable.

35628:df90b5c825f7

    gtk_main_iteration_do(FALSE);

    return (pixbuf != NULL);
}

void gtkInit(void)
{
    int argc = 0;
    char *arg[3], **argv = arg;
    GtkIconTheme *theme;
    GdkPixmap *gdkIcon;

    mp_msg(MSGT_GPLAYER, MSGL_V, "GTK init.\n");

    arg[argc++] = GMPlayer;

    if (mDisplayName) {            // MPlayer option '-display' was given
        arg[argc++] = "--display"; // Pass corresponding command line arguments to GTK,
        arg[argc++] = mDisplayName; // to open the requested display for the GUI, too.
    }

#ifdef CONFIG_GTK2
    gtk_disable_setlocale();
#endif

35629:365dc9336f0d

    gtk_main_iteration_do(FALSE);

    return (pixbuf != NULL);
}

void gtkInit(char *display_name)
{
    int argc = 0;
    char *arg[3], **argv = arg;
    GtkIconTheme *theme;
    GdkPixmap *gdkIcon;

    mp_msg(MSGT_GPLAYER, MSGL_V, "GTK init.\n");

    arg[argc++] = GMPlayer;

    if (display_name) {            // MPlayer option '-display' was given
        arg[argc++] = "--display"; // Pass corresponding command line arguments to GTK,
        arg[argc++] = display_name; // to open the requested display for the GUI, too.
    }

#ifdef CONFIG_GTK2
    gtk_disable_setlocale();
#endif