From 60b75f60c19ed9438714643ec0429db5e03220d6 Mon Sep 17 00:00:00 2001 From: Sean Robinson Date: Sun, 19 Apr 2009 13:39:01 -0700 Subject: [PATCH] Revert "Use ' Multiple APs' string for bssid in radar_window if profile is a roamer" This reverts commit bbd989c7feea2af75cb9494ef4b1682cb4e5d1a8. Signed-off-by: Sean Robinson --- wifi-radar | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/wifi-radar b/wifi-radar index 44943ba..451b125 100755 --- a/wifi-radar +++ b/wifi-radar @@ -955,10 +955,7 @@ class radar_window: self.disconnect_button.hide() self.connect_button.show() - if profile['roaming']: - prow_iter = self.get_row_by_ap(profile['essid'], ' Multiple APs') - else: - prow_iter = self.get_row_by_ap(profile['essid'], profile['bssid']) + prow_iter = self.get_row_by_ap( profile['essid'], profile['bssid'] ) wep = None if prow_iter != None: # the AP is in the list of APs on the screen @@ -977,11 +974,7 @@ class radar_window: #print val, else: # the AP is not in the list of APs on the screen - if profile['roaming']: - ap_name = profile[ 'essid' ] + "\n" + ' Multiple APs' - else: - ap_name = profile[ 'essid' ] + "\n" + profile['bssid'] - self.pstore.append([ap_name, self.pixbuf_from_known(profile['known']), profile['known'], profile['available'], wep, self.pixbuf_from_signal(profile['signal']), profile['mode'], profile['protocol'], profile['channel']]) + self.pstore.append( [ profile[ 'essid' ] + "\n" + profile['bssid'], self.pixbuf_from_known( profile['known'] ), profile['known'], profile['available'], wep, self.pixbuf_from_signal( profile['signal'] ), profile['mode'], profile['protocol'], profile['channel'] ] ) #print "update_plist_items: new profile", profile[ 'essid' ], profile['bssid'] # Allow other Gtk threads to run gtk.gdk.threads_leave() @@ -1187,10 +1180,7 @@ class radar_window: ( store, selected_iter ) = self.plist.get_selection().get_selected() if not selected_iter: return row_start = str(self.pstore.get_value( selected_iter, 0 )).split("\n") - if row_start[1] == ' Multiple APs': - apname = make_section_name(row_start[0], '') - else: - apname = make_section_name(row_start[0], row_start[1]) + apname = make_section_name( row_start[0], row_start[1] ) profile = self.confFile.get_profile( apname ) if profile: profile_editor = profile_dialog( self, profile ) -- 2.11.4.GIT