Mercurial > audlegacy

changeset 4661:e4e7999a21bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.)
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 27 Jun 2008 17:57:39 +0300
parents c0b6a5de9eb5
children 8a783f826316
files src/audacious/main.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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();