From 61d7f177e77d4191a0c1d101d58faaacfa0ab787 Mon Sep 17 00:00:00 2001 From: Sean Robinson Date: Sun, 19 Apr 2009 13:39:00 -0700 Subject: [PATCH] Revert "Clean up radar_window.delete_profile()" This reverts commit 6576e826f8960ce9594d2c8662ae00ece9944c48. Signed-off-by: Sean Robinson --- wifi-radar | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/wifi-radar b/wifi-radar index cbaf300..46ebcef 100755 --- a/wifi-radar +++ b/wifi-radar @@ -1234,29 +1234,34 @@ class radar_window: # # nothing def delete_profile( self, widget, data=None ): - (store, selected_iter) = self.plist.get_selection().get_selected() + ( store, selected_iter ) = self.plist.get_selection().get_selected() if not selected_iter: return - (essid, bssid) = store.get_value(selected_iter, 0).split("\n") + ( essid, bssid ) = store.get_value( selected_iter, 0 ).split("\n") known = store.get_value( selected_iter, 1 ) if not known: return + dlg = gtk.MessageDialog( + self.window, + gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_YES_NO, + "Are you sure you want to delete the %s (%s) profile?" % (essid, bssid) ) res = dlg.run() dlg.destroy() del dlg - if res == gtk.RESPONSE_NO: - return + if res == gtk.RESPONSE_NO: return # Remove it - self.confFile.remove_section(apname) + apname = make_section_name( essid, bssid ) + self.confFile.remove_section( apname ) self.logger.debug(apname) - if apname in self.confFile.auto_profile_order: - self.confFile.auto_profile_order.remove(apname) - self.pstore.remove(selected_iter) + if apname in self.confFile.auto_profile_order: self.confFile.auto_profile_order.remove(apname) + self.pstore.remove( selected_iter ) # Let's save our current state self.update_auto_profile_order() try: self.confFile.write() except IOError, (error_number, error_str): if error_number == errno.ENOENT: - error_dlg = ErrorDialog(self.window, "Could not save configuration file:\n%s\n\n%s" % (self.confFile.filename, error_str)) + error_dlg = ErrorDialog( self.window, "Could not save configuration file:\n%s\n\n%s" % (self.confFile.filename, error_str) ) del error_dlg else: raise IOError(error_number, error_str) -- 2.11.4.GIT