From 6b3414552a6a92fc907e840e9728a79d49695ac1 Mon Sep 17 00:00:00 2001
From: js <js-gajim@webkeks.org>
Date: Sat, 28 Jun 2008 23:05:14 +0000
Subject: [PATCH] Leopard's X11 is started automagically - we don't need this
anymore.
---
src/gajim.py | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/gajim.py b/src/gajim.py
index cf65931675..259c2085a0 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -142,19 +142,8 @@ try:
import gtk
except Warning, msg:
if str(msg) == 'could not open display':
- if sys.platform == 'darwin':
- # It seems there is no way to open X11 without also
- # opening an xterm. Even Apple's open-x11 script
- # opens the application AND an xterm.
- os.system('/Applications/Utilities/X11.app/Contents/MacOS/X11 &')
- try:
- import gtk
- except Warning, msg:
- print >> sys.stderr, _('No X11 running and failed to start it! Quitting...')
- sys.exit()
- else:
- print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
- sys.exit()
+ print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
+ sys.exit()
warnings.resetwarnings()
if os.name == 'nt':
--
GitLab