* Start X11 automatically on OS X if not running.
* Moved one import in osx/__init__.py. If that import fails, we still got the few functions defined we need, even if the rest of that file doesn't work due to missing deps.
This commit is contained in:
parent
8def8de5c7
commit
0551c9ddac
12
src/gajim.py
12
src/gajim.py
|
@ -142,8 +142,16 @@ try:
|
|||
import gtk
|
||||
except Warning, msg:
|
||||
if str(msg) == 'could not open display':
|
||||
print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
|
||||
sys.exit()
|
||||
if sys.platform == 'darwin':
|
||||
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()
|
||||
|
||||
if os.name == 'nt':
|
||||
|
|
|
@ -1,15 +1,12 @@
|
|||
import sys, commands
|
||||
from network_manager_listener import device_now_active, device_no_longer_active
|
||||
import nsapp
|
||||
|
||||
|
||||
if sys.platform != "darwin":
|
||||
raise ImportError("System platform is not OS/X")
|
||||
|
||||
if sys.platform != 'darwin':
|
||||
raise ImportError('System platform is not OS X')
|
||||
|
||||
net_device_active = True
|
||||
|
||||
|
||||
###
|
||||
### Utility functions
|
||||
###
|
||||
|
@ -21,6 +18,7 @@ def checkPID(pid, procname):
|
|||
return True
|
||||
return False
|
||||
|
||||
import nsapp
|
||||
|
||||
def init():
|
||||
nsapp.init()
|
||||
|
|
Loading…
Reference in New Issue