From c8d819a5adbe32e14d7f03a252bca6f7df01d795 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Tue, 16 Jun 2009 19:03:22 +0300
Subject: dbus-protocol: Connection handling for local connections.

---
 src/daemon/daemon-conf.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/daemon/daemon-conf.h')

diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h
index 98db8641..c4f78cbe 100644
--- a/src/daemon/daemon-conf.h
+++ b/src/daemon/daemon-conf.h
@@ -28,6 +28,7 @@
 
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/core.h>
 #include <pulsecore/core-util.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
@@ -48,13 +49,6 @@ typedef enum pa_daemon_conf_cmd {
     PA_CMD_CLEANUP_SHM
 } pa_daemon_conf_cmd_t;
 
-typedef enum pa_daemon_conf_server_type {
-    PA_SERVER_TYPE_UNSET,
-    PA_SERVER_TYPE_USER,
-    PA_SERVER_TYPE_SYSTEM,
-    PA_SERVER_TYPE_NONE
-} pa_daemon_conf_server_type_t;
-
 #ifdef HAVE_SYS_RESOURCE_H
 typedef struct pa_rlimit {
     rlim_t value;
@@ -81,7 +75,7 @@ typedef struct pa_daemon_conf {
         log_meta,
         log_time,
         flat_volumes;
-    pa_daemon_conf_server_type_t local_server_type;
+    pa_server_type_t local_server_type;
     int exit_idle_time,
         scache_idle_time,
         auto_log_target,
-- 
cgit