comparison src/audacious/main.c @ 4575:92952061147d

Fix the initialization after messing it up myself - commandline argument handling was happening twice.

4573:11f7874f3a95

                       (*argv)[0], error->message, (*argv)[0]);
            exit(EXIT_FAILURE);
        }
}

static gboolean
handle_cmd_line_options()
{
    gchar **filenames = options.filenames;
#ifdef USE_DBUS
    DBusGProxy *session = audacious_get_dbus_proxy();

            drct_main_win_toggle(TRUE);

        if (options.activate)
            drct_activate();
    } /* !is_running */
    
#ifdef USE_DBUS
    return is_running;
#else
    return FALSE;
#endif
}

static void
aud_setup_logger(void)
{

}

gint
main(gint argc, gchar ** argv)
{
    gboolean cmd_line_handled = FALSE;
    
    /* glib-2.13.0 requires g_thread_init() to be called before all
       other GLib functions */
    g_thread_init(NULL);
    if (!g_thread_supported()) {
        g_printerr(_("Sorry, threads aren't supported on your platform.\n"));

    aud_config_load();

    signal_handlers_init();

#ifdef USE_DBUS
    /* If we are using DBUS, handle options here */
    cmd_line_handled = handle_cmd_line_options();
#endif

    if (options.headless == FALSE)
    {
        ui_main_check_theme_engine();

        ui_manager_create_menus();
    }

    plugin_system_init();
    playlist_system_init();

    if (!cmd_line_handled)
        handle_cmd_line_options();

#ifdef USE_DBUS
    init_dbus();
#endif

4575:92952061147d

                       (*argv)[0], error->message, (*argv)[0]);
            exit(EXIT_FAILURE);
        }
}

static void
handle_cmd_line_options()
{
    gchar **filenames = options.filenames;
#ifdef USE_DBUS
    DBusGProxy *session = audacious_get_dbus_proxy();

            drct_main_win_toggle(TRUE);

        if (options.activate)
            drct_activate();
    } /* !is_running */
}

static void
aud_setup_logger(void)
{

}

gint
main(gint argc, gchar ** argv)
{
    /* glib-2.13.0 requires g_thread_init() to be called before all
       other GLib functions */
    g_thread_init(NULL);
    if (!g_thread_supported()) {
        g_printerr(_("Sorry, threads aren't supported on your platform.\n"));

    aud_config_load();

    signal_handlers_init();

    handle_cmd_line_options();

    if (options.headless == FALSE)
    {
        ui_main_check_theme_engine();

        ui_manager_create_menus();
    }

    plugin_system_init();
    playlist_system_init();

#ifdef USE_DBUS
    init_dbus();
#endif