# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1211374545 -10800
# Node ID 3789057a3f4f7399c1d25bb9e666bcf183b5024f
# Parent  744953f257fbabec31a5a06c682b5a71aca9f7ef# Parent  92952061147d84eeda2a556b6551f98dc7cae99c
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 744953f257fb -r 3789057a3f4f src/audacious/main.c
--- a/src/audacious/main.c	Wed May 21 13:58:45 2008 +0200
+++ b/src/audacious/main.c	Wed May 21 15:55:45 2008 +0300
@@ -314,7 +314,7 @@
         }
 }
 
-static gboolean
+static void
 handle_cmd_line_options()
 {
     gchar **filenames = options.filenames;
@@ -520,12 +520,6 @@
         if (options.activate)
             drct_activate();
     } /* !is_running */
-    
-#ifdef USE_DBUS
-    return is_running;
-#else
-    return FALSE;
-#endif
 }
 
 static void
@@ -672,8 +666,6 @@
 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);
@@ -723,10 +715,7 @@
 
     signal_handlers_init();
 
-#ifdef USE_DBUS
-    /* If we are using DBUS, handle options here */
-    cmd_line_handled = handle_cmd_line_options();
-#endif
+    handle_cmd_line_options();
 
     if (options.headless == FALSE)
     {
@@ -746,9 +735,6 @@
     plugin_system_init();
     playlist_system_init();
 
-    if (!cmd_line_handled)
-        handle_cmd_line_options();
-
 #ifdef USE_DBUS
     init_dbus();
 #endif