# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1214578659 -10800
# Node ID e4e7999a21bca33c455e4a0e6fcff9227a7b578f
# Parent  c0b6a5de9eb534c6a79813077057fcff8fd97074
Move D-Bus initialization before plugin system and playlist initialization.
(The other changes in this changeset are to remedy the problem arising from
the move, which resulted in annoying pause during startup due to D-Bus being
initialized when assumed not to be.)

diff -r c0b6a5de9eb5 -r e4e7999a21bc src/audacious/main.c
--- a/src/audacious/main.c	Sat Jun 21 08:26:23 2008 +0300
+++ b/src/audacious/main.c	Fri Jun 27 17:57:39 2008 +0300
@@ -320,7 +320,12 @@
     gchar **filenames = options.filenames;
 #ifdef USE_DBUS
     DBusGProxy *session = audacious_get_dbus_proxy();
-    gboolean is_running = audacious_remote_is_running(session);
+    gboolean is_running;
+
+    if (skip)
+      is_running = audacious_remote_is_running(session);
+    else
+      is_running = FALSE;
 #endif
 
     if (options.version)
@@ -726,14 +731,15 @@
         ui_manager_create_menus();
     }
 
+#ifdef USE_DBUS
+    init_dbus();
+#endif
+
     plugin_system_init();
     playlist_system_init();
 
     handle_cmd_line_options(FALSE);
 
-#ifdef USE_DBUS
-    init_dbus();
-#endif
 
     playlist_start_get_info_thread();