Ubuntu Software Center

Merge lp:~seb128/software-center/source_is_removed into lp:software-center

  1. source_is_removed
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: dobey
Approved revision: 3327
Merged at revision: 3329
Proposed branch: lp:~seb128/software-center/source_is_removed
Merge into: lp:software-center
Diff against target: 50 lines (+4/-3)
4 files modified
softwarecenter/ui/gtk3/panes/viewswitcher.py (+1/-1)
softwarecenter/ui/gtk3/widgets/exhibits.py (+1/-0)
softwarecenter/ui/gtk3/widgets/searchaid.py (+1/-1)
softwarecenter/ui/gtk3/widgets/thumbnail.py (+1/-1)
To merge this branch: bzr merge lp:~seb128/software-center/source_is_removed
Reviewer Review Type Date Requested Status
dobey Approve
Review via email: mp+273569@code.launchpad.net

Commit message

Clear some source ID warnings

Description of the change

Clear some source ID warnings

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
lp:~seb128/software-center/source_is_removed updated
3328. By Sebastien Bacher

revert buggy change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/panes/viewswitcher.py'
2--- softwarecenter/ui/gtk3/panes/viewswitcher.py 2012-12-14 16:44:25 +0000
3+++ softwarecenter/ui/gtk3/panes/viewswitcher.py 2015-10-14 09:40:10 +0000
4@@ -213,7 +213,7 @@
5 def build_channel_list(self, popup, view_id):
6 # clean up old signal handlers
7 for sig in self._handlers:
8- GLib.source_remove(sig)
9+ self.backend.disconnect(sig)
10
11 if view_id == ViewPages.AVAILABLE:
12 channels = self.channel_manager.channels
13
14=== modified file 'softwarecenter/ui/gtk3/widgets/exhibits.py'
15--- softwarecenter/ui/gtk3/widgets/exhibits.py 2012-12-14 16:44:25 +0000
16+++ softwarecenter/ui/gtk3/widgets/exhibits.py 2015-10-14 09:40:10 +0000
17@@ -432,6 +432,7 @@
18 else:
19 self.cursor += 1
20 self._render_exhibit_at_cursor()
21+ self._timeout = 0
22 return False
23
24 def previous(self):
25
26=== modified file 'softwarecenter/ui/gtk3/widgets/searchaid.py'
27--- softwarecenter/ui/gtk3/widgets/searchaid.py 2012-11-28 15:54:20 +0000
28+++ softwarecenter/ui/gtk3/widgets/searchaid.py 2015-10-14 09:40:10 +0000
29@@ -67,7 +67,7 @@
30
31 def reset(self):
32 for label, handler in zip(self._labels, self._handlers):
33- GLib.source_remove(handler)
34+ label.disconnect(handler)
35 label.destroy()
36
37 self._labels = []
38
39=== modified file 'softwarecenter/ui/gtk3/widgets/thumbnail.py'
40--- softwarecenter/ui/gtk3/widgets/thumbnail.py 2012-12-14 16:44:25 +0000
41+++ softwarecenter/ui/gtk3/widgets/thumbnail.py 2015-10-14 09:40:10 +0000
42@@ -45,7 +45,7 @@
43
44 def set_app_details(self, app_details):
45 if self._sig > 0:
46- GLib.source_remove(self._sig)
47+ self.app_details.disconnect(self._sig)
48
49 self.app_details = app_details
50 self.appname = app_details.display_name