diff options
Diffstat (limited to 'src/jarabe/model/adhoc.py')
| -rw-r--r-- | src/jarabe/model/adhoc.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/jarabe/model/adhoc.py b/src/jarabe/model/adhoc.py index ad0c941..8842a5c 100644 --- a/src/jarabe/model/adhoc.py +++ b/src/jarabe/model/adhoc.py @@ -24,6 +24,7 @@ from jarabe.model.network import Settings from sugar.util import unique_id from jarabe.model.network import IP4Config + _NM_SERVICE = 'org.freedesktop.NetworkManager' _NM_IFACE = 'org.freedesktop.NetworkManager' _NM_PATH = '/org/freedesktop/NetworkManager' @@ -32,8 +33,9 @@ _NM_WIRELESS_IFACE = 'org.freedesktop.NetworkManager.Device.Wireless' _NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint' _NM_ACTIVE_CONN_IFACE = 'org.freedesktop.NetworkManager.Connection.Active' - _adhoc_manager_instance = None + + def get_adhoc_manager_instance(): global _adhoc_manager_instance if _adhoc_manager_instance is None: @@ -53,7 +55,7 @@ class AdHocManager(gobject.GObject): 'members-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT])), 'state-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, - ([gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT])) + ([gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT])), } _AUTOCONNECT_TIMEOUT = 30 @@ -82,7 +84,7 @@ class AdHocManager(gobject.GObject): ' only be called once.') self._device = device - props = dbus.Interface(device, 'org.freedesktop.DBus.Properties') + props = dbus.Interface(device, dbus.PROPERTIES_IFACE) self._device_state = props.Get(_NM_DEVICE_IFACE, 'State') self._bus.add_signal_receiver(self.__device_state_changed_cb, @@ -158,7 +160,7 @@ class AdHocManager(gobject.GObject): def __idle_check_cb(self): if self._device_state == network.DEVICE_STATE_DISCONNECTED: - logging.debug("Connect to Ad-hoc network due to inactivity.") + logging.debug('Connect to Ad-hoc network due to inactivity.') self._autoconnect_adhoc() return False @@ -186,7 +188,7 @@ class AdHocManager(gobject.GObject): self._connect(channel) def _connect(self, channel): - name = "Ad-hoc Network %d" % channel + name = 'Ad-hoc Network %d' % channel connection = network.find_connection_by_ssid(name) if connection is None: settings = Settings() |