Changeset 8919

Show
Ignore:
Timestamp:
10/21/07 11:40:09 (13 months ago)
Author:
asterix
Message:

fix check of presence of X server. Fixes #3481

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/gajim.py

    r8903 r8919  
    114114del profile 
    115115 
     116# PyGTK2.10+ only throws a warning 
     117import warnings 
     118warnings.filterwarnings('error', module='gtk') 
     119try: 
     120        import gtk 
     121except Warning, msg: 
     122        if str(msg) == 'could not open display': 
     123                print >> sys.stderr, _('Gajim needs X server to run. Quiting...') 
     124                sys.exit() 
     125warnings.resetwarnings() 
     126 
    116127import message_control 
    117128 
    … …  
    135146                pass 
    136147 
    137 try: 
    138         import gtk 
    139 except RuntimeError, msg: 
    140         if str(msg) == 'could not open display': 
    141                 print >> sys.stderr, _('Gajim needs X server to run. Quiting...') 
    142                 sys.exit() 
    143148pritext = '' 
    144149if gtk.pygtk_version < (2, 8, 0):