Changeset 9858 for trunk/src/gajim.py

Show
Ignore:
Timestamp:
06/29/08 01:05:14 (5 months ago)
Author:
js
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/gajim.py

    r9855 r9858  
    143143except Warning, msg: 
    144144        if str(msg) == 'could not open display': 
    145                 if sys.platform == 'darwin': 
    146                         # It seems there is no way to open X11 without also 
    147                         # opening an xterm. Even Apple's open-x11 script 
    148                         # opens the application AND an xterm. 
    149                         os.system('/Applications/Utilities/X11.app/Contents/MacOS/X11 &') 
    150                         try: 
    151                                 import gtk 
    152                         except Warning, msg: 
    153                                 print >> sys.stderr, _('No X11 running and failed to start it! Quitting...') 
    154                                 sys.exit() 
    155                 else: 
    156                         print >> sys.stderr, _('Gajim needs X server to run. Quiting...') 
    157                         sys.exit() 
     145                print >> sys.stderr, _('Gajim needs X server to run. Quiting...') 
     146                sys.exit() 
    158147warnings.resetwarnings() 
    159148