www

commit c6c5f6c2f788aa0d5c188a9fdb85334edf71eda4
parent 9d20e2a827011a11c1bd7b041f33e051017b8ade
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue, 31 Jan 2012 22:25:43 -0500

Try libX11.so.6, in case it's not symlinked to libX11.so

Diffstat:
M
chrome/content/zotero/xpcom/integration.js
 | 
32
++++++++++++++++++--------------

1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -339,21 +339,25 @@ Zotero.Integration = new function() {
 			if(_x11 === false) return;
 			if(!_x11) {
 				try {
-					var libName = ctypes.libraryName("X11");
+					_x11 = ctypes.open("libX11.so.6");
 				} catch(e) {
-					_x11 = false;
-					Zotero.debug("Integration: Could not get libX11 name; not activating");
-					Zotero.logError(e);
-					return;
-				}
-				
-				try {
-					_x11 = ctypes.open(libName);
-				} catch(e) {
-					_x11 = false;
-					Zotero.debug("Integration: Could not open "+libName+"; not activating");
-					Zotero.logError(e);
-					return;
+					try {
+						var libName = ctypes.libraryName("X11");
+					} catch(e) {
+						_x11 = false;
+						Zotero.debug("Integration: Could not get libX11 name; not activating");
+						Zotero.logError(e);
+						return;
+					}
+					
+					try {
+						_x11 = ctypes.open(libName);
+					} catch(e) {
+						_x11 = false;
+						Zotero.debug("Integration: Could not open "+libName+"; not activating");
+						Zotero.logError(e);
+						return;
+					}
 				}
 				
 				const Status = ctypes.int,