From 30d1943a79b8012609cab9f71cc3a36a6ce4543e Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 26 Oct 2012 12:24:19 +0300 Subject: [PATCH] bitbake: hob/hig: Hob doesn't save properly proxy settings User introduced proxy settings were not saved when a proxy details input dialog was opened. The proxy settings were lost upon return, and restored from the previously stored one. Also: Code cleanup: details_cb() function duplicate definition removed Fixes [YOCTO #3240] (Bitbake rev: aa64b2e472f8a9713e3dc25647aa2cae474e2622) Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hig.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py index d030beda22..c28fa64ad7 100644 --- a/bitbake/lib/bb/ui/crumbs/hig.py +++ b/bitbake/lib/bb/ui/crumbs/hig.py @@ -381,22 +381,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): data += (key + ": " + self._get_sorted_value(self.configuration.extra_setting[key])) return hashlib.md5(data).hexdigest() - def details_cb(self, button, parent, protocol): - dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details", - user = self.configuration.proxies[protocol][1], - passwd = self.configuration.proxies[protocol][2], - parent = parent, - flags = gtk.DIALOG_MODAL - | gtk.DIALOG_DESTROY_WITH_PARENT - | gtk.DIALOG_NO_SEPARATOR) - dialog.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_OK) - response = dialog.run() - if response == gtk.RESPONSE_OK: - self.configuration.proxies[protocol][1] = dialog.user - self.configuration.proxies[protocol][2] = dialog.passwd - self.refresh_proxy_components() - dialog.destroy() - def gen_proxy_entry_widget(self, protocol, parent, need_button=True, line=0): label = gtk.Label(protocol.upper() + " proxy") self.proxy_table.attach(label, 0, 1, line, line+1, xpadding=24) @@ -826,6 +810,7 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): self.nb.set_current_page(page_id) def details_cb(self, button, parent, protocol): + self.save_proxy_data() dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details", user = self.configuration.proxies[protocol][1], passwd = self.configuration.proxies[protocol][2],