* add variadic function pa_tagstruct_get() and pa_tagstruct_put() for parsing/constru...

[pulseaudio] / polyp / client-conf-x11.c

diff --git a/polyp/client-conf-x11.c b/polyp/client-conf-x11.c
index f667bd784b2176eb742cf11d3a8e19b664c3a04f..4fd7574401ce0aa5786e3f225a18cfe92c140823 100644 (file)
--- a/polyp/client-conf-x11.c
+++ b/polyp/client-conf-x11.c
@@ -4,7 +4,7 @@
   This file is part of polypaudio.
 
   polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
+  it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
@@ -13,9 +13,9 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
   USA.
 ***/
 
@@ -35,7 +35,7 @@
 #include "xmalloc.h"
 #include "util.h"
 
-int pa_client_conf_from_x11(struct pa_client_conf *c, const char *dname) {
+int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     Display *d = NULL;
     int ret = -1;
     char t[1024];
@@ -48,11 +48,10 @@ int pa_client_conf_from_x11(struct pa_client_conf *c, const char *dname) {
         goto finish;
     }
 
-    if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) 
-        goto finish;
-
-    pa_xfree(c->default_server);
-    c->default_server = pa_xstrdup(t);
+    if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
+        pa_xfree(c->default_server);
+        c->default_server = pa_xstrdup(t);
+    }
 
     if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
         pa_xfree(c->default_sink);