mirror of
https://github.com/gryf/wicd.git
synced 2025-12-19 20:38:00 +01:00
Merged r295 of experimental-nacl
This commit is contained in:
@@ -91,13 +91,13 @@ class wrap_exceptions:
|
||||
#gobject.source_remove(redraw_tag)
|
||||
loop.quit()
|
||||
ui.stop()
|
||||
print "\n"+language['terminated']
|
||||
print >> sys.stderr, "\n"+language['terminated']
|
||||
#raise
|
||||
except DBusException:
|
||||
#gobject.source_remove(redraw_tag)
|
||||
loop.quit()
|
||||
ui.stop()
|
||||
print "\n"+language['dbus_fail']
|
||||
print >> sys.stderr,"\n"+language['dbus_fail']
|
||||
raise
|
||||
except :
|
||||
# Quit the loop
|
||||
@@ -106,7 +106,7 @@ class wrap_exceptions:
|
||||
# Zap the screen
|
||||
ui.stop()
|
||||
# Print out standard notification:
|
||||
print "\n" + language['exception']
|
||||
print >> sys.stderr, "\n" + language['exception']
|
||||
# Flush the buffer so that the notification is always above the
|
||||
# backtrace
|
||||
sys.stdout.flush()
|
||||
@@ -1026,7 +1026,7 @@ def setup_dbus(force=True):
|
||||
except DBusException:
|
||||
# I may need to be a little more verbose here.
|
||||
# Suggestions as to what should go here, please?
|
||||
print language['cannot_connect_to_daemon']
|
||||
print >> sys.stderr, language['cannot_connect_to_daemon']
|
||||
#raise
|
||||
# return False # <- Will need soon.
|
||||
bus = dbusmanager.get_bus()
|
||||
|
||||
Reference in New Issue
Block a user