gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-04 15:45:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug where be-ioctl scans always reported channels as 1.

Browse Source 
Tweak the UI a little bit.
Add debugging output when forced_disconnect gets enabled.
This commit is contained in:
Dan O'Reilly
2009-01-15 00:56:02 -05:00
parent 2978102ba4
commit 2358357f1d
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wicd/backends/be-ioctl.py
View File

@@ -316,7 +316,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
ap['hidden'] = False ap['hidden'] = False
if cell["channel"]: if cell["channel"]:
ap["channel"] = True ap["channel"] = cell["channel"]
else: else:
ap["channel"] = self._FreqToChannel(cell["frequency"]) ap["channel"] = self._FreqToChannel(cell["frequency"])

2
wicd/misc.py
View File

@@ -435,7 +435,7 @@ def get_language_list_gui():
language['use_static_ip'] = _('Use Static IPs') language['use_static_ip'] = _('Use Static IPs')
language['use_static_dns'] = _('Use Static DNS') language['use_static_dns'] = _('Use Static DNS')
language['use_encryption'] = _('Use Encryption') language['use_encryption'] = _('Use Encryption')
language['advanced_settings'] = _('Advanced Settings') language['advanced_settings'] = _('Properties')
language['wired_network'] = _('Wired Network') language['wired_network'] = _('Wired Network')
language['wired_network_instructions'] = _('To connect to a wired network,' language['wired_network_instructions'] = _('To connect to a wired network,'
' you must create a network profile. To create a network profile, type a' ' you must create a network profile. To create a network profile, type a'

15
wicd/netentry.py
View File

@@ -804,6 +804,7 @@ class WirelessNetworkEntry(NetworkEntry):
"essid")) "essid"))
self.lbl_strength = GreyLabel() self.lbl_strength = GreyLabel()
self.lbl_encryption = GreyLabel() self.lbl_encryption = GreyLabel()
self.lbl_channel = GreyLabel()
print "ESSID : " + self.essid print "ESSID : " + self.essid
self.chkbox_autoconnect = gtk.CheckButton(language['automatic_connect']) self.chkbox_autoconnect = gtk.CheckButton(language['automatic_connect'])
@@ -816,11 +817,13 @@ class WirelessNetworkEntry(NetworkEntry):
'encryption'), 'encryption'),
wireless.GetWirelessProperty(networkID, wireless.GetWirelessProperty(networkID,
'encryption_method')) 'encryption_method'))
self.set_channel(wireless.GetWirelessProperty(networkID, 'channel'))
self.name_label.set_use_markup(True) self.name_label.set_use_markup(True)
self.name_label.set_label("%s %s %s" % (self._escape(self.essid), self.name_label.set_label("%s %s %s %s" % (self._escape(self.essid),
self.lbl_strength.get_label(), self.lbl_strength.get_label(),
self.lbl_encryption.get_label() self.lbl_encryption.get_label(),
) self.lbl_channel.get_label(),
)
) )
# Add the wireless network specific parts to the NetworkEntry # Add the wireless network specific parts to the NetworkEntry
# VBox objects. # VBox objects.
@@ -927,6 +930,10 @@ class WirelessNetworkEntry(NetworkEntry):
self.lbl_encryption.set_label(language['secured']) self.lbl_encryption.set_label(language['secured'])
if not on: if not on:
self.lbl_encryption.set_label(language['unsecured']) self.lbl_encryption.set_label(language['unsecured'])
def set_channel(self, channel):
""" Set the channel value for the WirelessNetworkEntry. """
self.lbl_channel.set_label(language['channel'] + ' ' + str(channel))
def format_entry(self, networkid, label): def format_entry(self, networkid, label):
""" Helper method for fetching/formatting wireless properties. """ """ Helper method for fetching/formatting wireless properties. """

2
wicd/wicd-daemon.py
View File

@@ -91,6 +91,7 @@ class WicdDaemon(dbus.service.Object):
self.vpn_session = None self.vpn_session = None
self.gui_open = False self.gui_open = False
self.suspended = False self.suspended = False
self.debug_mode = False
self.connection_state = misc.NOT_CONNECTED self.connection_state = misc.NOT_CONNECTED
self.connection_info = [""] self.connection_info = [""]
self.auto_connecting = False self.auto_connecting = False
@@ -421,6 +422,7 @@ class WicdDaemon(dbus.service.Object):
started. started.
""" """
if self.debug_mode and value: print "Forced disconnect on"
self.forced_disconnect = bool(value) self.forced_disconnect = bool(value)
self.wireless_bus.SetForcedDisconnect(bool(value)) self.wireless_bus.SetForcedDisconnect(bool(value))
self.wired_bus.SetForcedDisconnect(bool(value)) self.wired_bus.SetForcedDisconnect(bool(value))