Merge lp:~seb128/update-manager/correct-icon-theme into lp:update-manager

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 2670
Proposed branch: lp:~seb128/update-manager/correct-icon-theme
Merge into: lp:update-manager
Diff against target: 27 lines (+8/-1)
2 files modified
UpdateManager/UpdatesAvailable.py (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~seb128/update-manager/correct-icon-theme
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Review via email: mp+211904@code.launchpad.net

Commit message

* UpdateManager/UpdatesAvailable.py:
  - use the correct icon theme (lp: #1283554)

Description of the change

* UpdateManager/UpdatesAvailable.py:
  - use the correct icon theme (lp: #1283554)

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UpdateManager/UpdatesAvailable.py'
2--- UpdateManager/UpdatesAvailable.py 2014-01-16 11:58:05 +0000
3+++ UpdateManager/UpdatesAvailable.py 2014-03-20 10:56:06 +0000
4@@ -232,7 +232,7 @@
5 self.settings = Gio.Settings.new("com.ubuntu.update-manager")
6
7 # Special icon theme for looking up app-install-data icons
8- self.app_icons = Gtk.IconTheme()
9+ self.app_icons = Gtk.IconTheme.get_default()
10 self.app_icons.append_search_path(self.APP_INSTALL_ICONS_PATH)
11
12 # Create Unity launcher quicklist
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-03-17 16:38:18 +0000
16+++ debian/changelog 2014-03-20 10:56:06 +0000
17@@ -1,3 +1,10 @@
18+update-manager (1:0.196.9) UNRELEASED; urgency=medium
19+
20+ * UpdateManager/UpdatesAvailable.py:
21+ - use the correct icon theme (lp: #1283554)
22+
23+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 20 Mar 2014 11:50:11 +0100
24+
25 update-manager (1:0.196.8) trusty; urgency=medium
26
27 * source_update_manager.py: set response to None if the problem type is not

Subscribers

People subscribed via source and target branches

to status/vote changes: