comparison src/audacious/main.c @ 2938:1cdfc508d758 trunk

Fix adding files when Audacious is running. A fix to start Audacious with a file will follow. Aditionally, some old, useless XMMS stuff was removed.

2937:d9a4d56b6081

    textdomain(PACKAGE_NAME);

    bmp_init_paths();
    bmp_make_user_dir();

    /* Check GTK version. Really, this is only needed for binary
     * distribution since configure already checks. */
    if (!GTK_CHECK_VERSION(2, 6, 0)) {
        g_printerr(_("Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
                     "Please use GTK+ %s or newer.\n"),
                   gtk_major_version, gtk_minor_version, gtk_micro_version,
                   "2.6.0");
        exit(EXIT_FAILURE);
    }

    g_set_application_name(_(application_name));

    cond_scan = g_cond_new();
    mutex_scan = g_mutex_new();

    g_option_context_add_group(context, gtk_get_option_group(TRUE));
    g_option_context_parse(context, &argc, &argv, &error);

    if (error != NULL)
    {
        g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"), argv[0], error->message, argv[0]);
        exit(EXIT_FAILURE);
    }

    if (!gtk_init_check_ok) {
        if (argc < 2) {

        handle_cmd_line_options(&options, TRUE);

        /* we could be running headless, so GTK probably wont matter */
        if (options.headless != 1)
          exit(EXIT_SUCCESS);
    }

    if (options.no_log == FALSE)
        bmp_setup_logger();

2938:1cdfc508d758

    textdomain(PACKAGE_NAME);

    bmp_init_paths();
    bmp_make_user_dir();

    g_set_application_name(_(application_name));

    cond_scan = g_cond_new();
    mutex_scan = g_mutex_new();

    g_option_context_add_group(context, gtk_get_option_group(TRUE));
    g_option_context_parse(context, &argc, &argv, &error);

    if (error != NULL)
    {
        g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"),
	  argv[0], error->message, argv[0]);
        exit(EXIT_FAILURE);
    }

    if (!gtk_init_check_ok) {
        if (argc < 2) {

        handle_cmd_line_options(&options, TRUE);

        /* we could be running headless, so GTK probably wont matter */
        if (options.headless != 1)
            exit(EXIT_SUCCESS);
    }

    if (options.no_log == FALSE)
        bmp_setup_logger();