Checkbox

Merge lp:~cr3/checkbox/827904 into lp:checkbox

  1. 827904
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1031
Proposed branch: lp:~cr3/checkbox/827904
Merge into: lp:checkbox
Diff against target: 46 lines (+7/-6)
2 files modified
checkbox_gtk/gtk_interface.py (+6/-5)
debian/changelog (+1/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/827904
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+74305@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Looks good, I tested it and it gets rid of the unwanted behavior while affecting nothing else. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox_gtk/gtk_interface.py'
2--- checkbox_gtk/gtk_interface.py 2011-09-05 16:49:42 +0000
3+++ checkbox_gtk/gtk_interface.py 2011-09-06 20:39:58 +0000
4@@ -109,7 +109,7 @@
5
6 # Set shorthand for notebook
7 self._notebook = self._get_widget("notebook_main")
8- self._handler_id = None
9+ self._handlers = {}
10
11 def _get_widget(self, name):
12 return self.widgets.get_object(name)
13@@ -153,7 +153,8 @@
14 self.show_url(anchor)
15
16 widget = self._get_widget(name)
17- widget.connect("anchor-clicked", clicked)
18+ if widget not in self._handlers:
19+ self._handlers[widget] = widget.connect("anchor-clicked", clicked)
20
21 buffer = Gtk.TextBuffer()
22 widget.set_buffer(buffer)
23@@ -518,9 +519,9 @@
24 if "command" in test:
25 self._set_sensitive("button_test", True)
26 button_test = self._get_widget("button_test")
27- if self._handler_id:
28- button_test.disconnect(self._handler_id)
29- self._handler_id = button_test.connect("clicked",
30+ if button_test in self._handlers:
31+ button_test.disconnect(self._handlers[button_test])
32+ self._handlers[button_test] = button_test.connect("clicked",
33 lambda w, t=test, r=runner: self._run_test(t, r))
34
35 self._set_text_view("text_view_comment", test.get("data", ""))
36
37=== modified file 'debian/changelog'
38--- debian/changelog 2011-09-06 10:24:15 +0000
39+++ debian/changelog 2011-09-06 20:39:58 +0000
40@@ -1,6 +1,6 @@
41 checkbox (0.12.7) oneiric; urgency=low
42
43- * Incremented version.
44+ * Only connecting hyper text widgets once (LP: #827904)
45
46 -- Daniel Manrique <daniel.manrique@canonical.com> Mon, 05 Sep 2011 13:15:44 -0400
47

Subscribers

People subscribed via source and target branches