Commit f17b5982 authored by Oleksandr Shneyder's avatar Oleksandr Shneyder

Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension…

Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama extension if NX_XINERAMA_CONF not exists
parent 36ca6646
nx-libs (2:3.5.0.9-0) UNRELEASED; urgency=low nx-libs (2:3.5.0.9-0) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Continue development... * Continue development...
[ Oleksandr Shneyder ]
* Update patch: 202_nx-x11_enable-xinerama.full.patch disable Xinerama
extension if NX_XINERAMA_CONF not exists
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 23 Jan 2012 00:04:57 +0100 -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 23 Jan 2012 00:04:57 +0100
nx-libs (2:3.5.0.8-0) unstable; urgency=low nx-libs (2:3.5.0.8-0) unstable; urgency=low
......
...@@ -31,17 +31,24 @@ Last-Update: 2012-01-13 ...@@ -31,17 +31,24 @@ Last-Update: 2012-01-13
#define BuildDmxDevelTools NO #define BuildDmxDevelTools NO
--- a/nx-X11/lib/Xinerama/Xinerama.c --- a/nx-X11/lib/Xinerama/Xinerama.c
+++ b/nx-X11/lib/Xinerama/Xinerama.c +++ b/nx-X11/lib/Xinerama/Xinerama.c
@@ -249,6 +249,9 @@ @@ -249,6 +249,16 @@
xXineramaIsActiveReq *req; xXineramaIsActiveReq *req;
XExtDisplayInfo *info = find_display (dpy); XExtDisplayInfo *info = find_display (dpy);
+ +
+ FILE* fptr;
+ if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
+ fclose(fptr);
+ return True; + return True;
+ }
+ else {
+ return False;
+ }
+ +
if(!XextHasExtension(info)) if(!XextHasExtension(info))
return False; /* server doesn't even have the extension */ return False; /* server doesn't even have the extension */
@@ -279,39 +282,72 @@ @@ -279,39 +289,72 @@
xXineramaQueryScreensReq *req; xXineramaQueryScreensReq *req;
XineramaScreenInfo *scrnInfo = NULL; XineramaScreenInfo *scrnInfo = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment