Make the whole stuff LGPL only

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

diff --git a/polyp/client-conf-x11.c b/polyp/client-conf-x11.c
index 54c3b06a838d86256dce40438a0a6c84eae14ea2..eb471033ea73718d767a4b313403ae999719e881 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,7 +13,7 @@
   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
   USA.
@@ -39,7 +39,10 @@ int pa_client_conf_from_x11(struct pa_client_conf *c, const char *dname) {
     Display *d = NULL;
     int ret = -1;
     char t[1024];
-            
+
+    if (!dname && !getenv("DISPLAY"))
+        goto finish;
+    
     if (!(d = XOpenDisplay(dname))) {
         pa_log(__FILE__": XOpenDisplay() failed\n");
         goto finish;