=== modified file 'gwibber/configui.py' --- gwibber/configui.py 2009-03-10 13:03:17 +0000 +++ gwibber/configui.py 2009-04-21 20:37:01 +0000 @@ -65,12 +65,14 @@ lb.connect("clicked", lambda *a: gintegration.load_url(lb.get_uri())) except: pass + btn_delete = glade.get_widget("%s_btndelete" % acct["protocol"]) + if create: - glade.get_widget("%s_btndelete" % acct["protocol"]).props.label = gtk.STOCK_CANCEL - glade.get_widget("%s_btnclose" % acct["protocol"]).props.label = gtk.STOCK_OK - - glade.get_widget("%s_btndelete" % acct["protocol"]).connect("clicked", - lambda a: self.on_account_delete(acct, dialog, create = create)) + btn_delete.props.label = gtk.STOCK_CANCEL + btn_delete.connect("clicked", lambda a: dialog.destroy()) + glade.get_widget("%s_btnclose" % acct["protocol"]).props.label = gtk.STOCK_ADD + else: + btn_delete.connect("clicked", lambda a: self.on_account_delete(acct, dialog)) if acct["protocol"] == "facebook": glade.get_widget("btnAuthorize").connect("clicked", @@ -86,12 +88,8 @@ a["protocol"] = protocol self.show_properties_dialog(a, create=True) - def on_account_delete(self, acct, dialog = None, create = False): - if create: - msg = _("Are you sure you want to cancel the creation of this account?") - else: - msg = _("Are you sure you want to delete this account?") - + def on_account_delete(self, acct, dialog = None): + msg = _("Are you sure you want to delete this account?") d = gtk.MessageDialog(dialog, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, msg)