copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Leopard's X11 is started automagically - we don't need this anymore.

Browse source
This commit is contained in:
js 2008-06-28 23:05:14 +00:00
parent 81dfec2b2a
commit 6b3414552a
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gajim.py
View file

@ -142,19 +142,8 @@ try:
import gtk import gtk
except Warning, msg: except Warning, msg:
if str(msg) == 'could not open display': if str(msg) == 'could not open display':
if sys.platform == 'darwin': print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
# It seems there is no way to open X11 without also sys.exit()
# 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()
warnings.resetwarnings() warnings.resetwarnings()
if os.name == 'nt': if os.name == 'nt':