summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2012-10-26 12:24:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:55:55 +0100
commit30d1943a79b8012609cab9f71cc3a36a6ce4543e (patch)
treeb8656ee22231dffbdadca18e34b67dc6098a6b7e /bitbake/lib
parent55cdbd516d0fd4ec7b3649e9d8a00cc2444c147e (diff)
downloadpoky-30d1943a79b8012609cab9f71cc3a36a6ce4543e.tar.gz
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 <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py17
1 files changed, 1 insertions, 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):
381 data += (key + ": " + self._get_sorted_value(self.configuration.extra_setting[key])) 381 data += (key + ": " + self._get_sorted_value(self.configuration.extra_setting[key]))
382 return hashlib.md5(data).hexdigest() 382 return hashlib.md5(data).hexdigest()
383 383
384 def details_cb(self, button, parent, protocol):
385 dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details",
386 user = self.configuration.proxies[protocol][1],
387 passwd = self.configuration.proxies[protocol][2],
388 parent = parent,
389 flags = gtk.DIALOG_MODAL
390 | gtk.DIALOG_DESTROY_WITH_PARENT
391 | gtk.DIALOG_NO_SEPARATOR)
392 dialog.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_OK)
393 response = dialog.run()
394 if response == gtk.RESPONSE_OK:
395 self.configuration.proxies[protocol][1] = dialog.user
396 self.configuration.proxies[protocol][2] = dialog.passwd
397 self.refresh_proxy_components()
398 dialog.destroy()
399
400 def gen_proxy_entry_widget(self, protocol, parent, need_button=True, line=0): 384 def gen_proxy_entry_widget(self, protocol, parent, need_button=True, line=0):
401 label = gtk.Label(protocol.upper() + " proxy") 385 label = gtk.Label(protocol.upper() + " proxy")
402 self.proxy_table.attach(label, 0, 1, line, line+1, xpadding=24) 386 self.proxy_table.attach(label, 0, 1, line, line+1, xpadding=24)
@@ -826,6 +810,7 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
826 self.nb.set_current_page(page_id) 810 self.nb.set_current_page(page_id)
827 811
828 def details_cb(self, button, parent, protocol): 812 def details_cb(self, button, parent, protocol):
813 self.save_proxy_data()
829 dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details", 814 dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details",
830 user = self.configuration.proxies[protocol][1], 815 user = self.configuration.proxies[protocol][1],
831 passwd = self.configuration.proxies[protocol][2], 816 passwd = self.configuration.proxies[protocol][2],