Merge commit 'origin/master-tx'

[pulseaudio] / src / pulse / client-conf.h

diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index a532f0dfec5e1c98236999a43935d284f33a5ef9..699279aaba161a4e6efd62913a1c54571588a905 100644 (file)
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -1,11 +1,11 @@
 #ifndef fooclientconfhfoo
 #define fooclientconfhfoo
 
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
+  Copyright 2004-2006 Lennart Poettering
+
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
@@ -28,9 +28,9 @@
 
 typedef struct pa_client_conf {
     char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
-    int autospawn;
+    pa_bool_t autospawn, disable_shm;
     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
-    int cookie_valid; /* non-zero, when cookie is valid */
+    pa_bool_t cookie_valid; /* non-zero, when cookie is valid */
 } pa_client_conf;
 
 /* Create a new configuration data object and reset it to defaults */