diff src/audacious/main.c @ 2709:47ea8eedd428 trunk

[svn] - drop controlsocket code. this probably does not compile yet.

--- a/src/audacious/main.c	Tue May 08 23:24:26 2007 -0700
+++ b/src/audacious/main.c	Wed May 09 14:03:11 2007 -0700
@@ -53,7 +53,6 @@
 #  include "dbus.h"
 #endif
 
-#include "controlsocket.h"
 #include "dnd.h"
 #include "effect.h"
 #include "ui_equalizer.h"
@@ -906,13 +905,6 @@
         exit(EXIT_SUCCESS);
     }
 
-    if (session == -1) {
-        if (!remote)
-            session = ctrlsocket_get_session_id();
-        else
-            session = 0;
-    }
-
     if (filenames != NULL)
     {
         gint pos = 0;
@@ -1143,7 +1135,7 @@
 
     bmp_config_load();
 
-    if (options.session != -1 || !ctrlsocket_setup()) {
+    if (options.session != -1) {
         handle_cmd_line_options(&options, TRUE);
         exit(EXIT_SUCCESS);
     }
@@ -1192,8 +1184,6 @@
     init_dbus();
 #endif
 
-    ctrlsocket_start();
-
     handle_cmd_line_options(&options, FALSE);
 
     if (options.headless != 1)