1
0
mirror of https://github.com/gryf/wicd.git synced 2026-03-07 01:55:49 +01:00

Merged r298 of mainline 1.6.

This commit is contained in:
Andrew Psaltis
2009-02-16 10:39:19 -05:00

View File

@@ -403,8 +403,9 @@ class appGui(object):
return True return True
def _set_not_connecting_state(self): def _set_not_connecting_state(self):
if self.connecting and self.update_cb: if self.connecting:
gobject.source_remove(self.update_cb) if self.update_cb:
gobject.source_remove(self.update_cb)
self.update_cb = misc.timeout_add(2, self.update_statusbar) self.update_cb = misc.timeout_add(2, self.update_statusbar)
self.connecting = False self.connecting = False
if self.pulse_active: if self.pulse_active:
@@ -415,8 +416,9 @@ class appGui(object):
gobject.idle_add(self.status_bar.remove, 1, self.statusID) gobject.idle_add(self.status_bar.remove, 1, self.statusID)
def set_connecting_state(self, info): def set_connecting_state(self, info):
if not self.connecting and self.update_cb: if not self.connecting:
gobject.source_remove(self.update_cb) if self.update_cb:
gobject.source_remove(self.update_cb)
self.update_cb = misc.timeout_add(500, self.update_statusbar, self.update_cb = misc.timeout_add(500, self.update_statusbar,
milli=True) milli=True)
self.connecting = True self.connecting = True