diff src/audacious/main.c @ 2733:cf080b11c3fa trunk

[svn] Implemented more of the stubs in audctrl; Added more methods to objects.xml with implementations in dbus.c. I'm still trying to get plugins working with libaudclient.

--- a/src/audacious/main.c	Fri May 11 08:59:22 2007 -0700
+++ b/src/audacious/main.c	Fri May 11 11:52:56 2007 -0700
@@ -897,7 +897,7 @@
 {
     gchar **filenames = options->filenames;
 #ifdef HAVE_DBUS
-    DBusGProxy *session = audacious_get_dbus_proxy();
+    // DBusGProxy *session = audacious_get_dbus_proxy();
 #endif
 
     if (options->version)
@@ -1143,6 +1143,10 @@
         exit(EXIT_SUCCESS);
     }
 
+#ifdef USE_DBUS
+    init_dbus();
+#endif
+
     plugin_system_init();
 
     /* Initialize the playlist system. */
@@ -1183,10 +1187,6 @@
     if (options.headless != 1)
         GDK_THREADS_LEAVE();
 
-#ifdef USE_DBUS
-    init_dbus();
-#endif
-
     handle_cmd_line_options(&options, FALSE);
 
     if (options.headless != 1)
@@ -1255,10 +1255,6 @@
 
         GDK_THREADS_LEAVE();
 
-#ifdef USE_DBUS
-        free_dbus();
-#endif
-
         g_cond_free(cond_scan);
         g_mutex_free(mutex_scan);
 
@@ -1278,10 +1274,6 @@
         g_timeout_add(10, aud_headless_iteration, NULL);
         g_main_loop_run(loop);
 
-#ifdef USE_DBUS
-        free_dbus();
-#endif
-
         return EXIT_SUCCESS;
     }
 }