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
=== modified file 'softwarecenter/ui/gtk3/panes/viewswitcher.py'
--- softwarecenter/ui/gtk3/panes/viewswitcher.py 2012-12-14 16:44:25 +0000
+++ softwarecenter/ui/gtk3/panes/viewswitcher.py 2015-10-14 09:40:10 +0000
@@ -213,7 +213,7 @@
213 def build_channel_list(self, popup, view_id):213 def build_channel_list(self, popup, view_id):
214 # clean up old signal handlers214 # clean up old signal handlers
215 for sig in self._handlers:215 for sig in self._handlers:
216 GLib.source_remove(sig)216 self.backend.disconnect(sig)
217217
218 if view_id == ViewPages.AVAILABLE:218 if view_id == ViewPages.AVAILABLE:
219 channels = self.channel_manager.channels219 channels = self.channel_manager.channels
220220
=== modified file 'softwarecenter/ui/gtk3/widgets/exhibits.py'
--- softwarecenter/ui/gtk3/widgets/exhibits.py 2012-12-14 16:44:25 +0000
+++ softwarecenter/ui/gtk3/widgets/exhibits.py 2015-10-14 09:40:10 +0000
@@ -432,6 +432,7 @@
432 else:432 else:
433 self.cursor += 1433 self.cursor += 1
434 self._render_exhibit_at_cursor()434 self._render_exhibit_at_cursor()
435 self._timeout = 0
435 return False436 return False
436437
437 def previous(self):438 def previous(self):
438439
=== modified file 'softwarecenter/ui/gtk3/widgets/searchaid.py'
--- softwarecenter/ui/gtk3/widgets/searchaid.py 2012-11-28 15:54:20 +0000
+++ softwarecenter/ui/gtk3/widgets/searchaid.py 2015-10-14 09:40:10 +0000
@@ -67,7 +67,7 @@
6767
68 def reset(self):68 def reset(self):
69 for label, handler in zip(self._labels, self._handlers):69 for label, handler in zip(self._labels, self._handlers):
70 GLib.source_remove(handler)70 label.disconnect(handler)
71 label.destroy()71 label.destroy()
7272
73 self._labels = []73 self._labels = []
7474
=== modified file 'softwarecenter/ui/gtk3/widgets/thumbnail.py'
--- softwarecenter/ui/gtk3/widgets/thumbnail.py 2012-12-14 16:44:25 +0000
+++ softwarecenter/ui/gtk3/widgets/thumbnail.py 2015-10-14 09:40:10 +0000
@@ -45,7 +45,7 @@
4545
46 def set_app_details(self, app_details):46 def set_app_details(self, app_details):
47 if self._sig > 0:47 if self._sig > 0:
48 GLib.source_remove(self._sig)48 self.app_details.disconnect(self._sig)
4949
50 self.app_details = app_details50 self.app_details = app_details
51 self.appname = app_details.display_name51 self.appname = app_details.display_name