Merge lp:~darkxst/apturl/icons into lp:apturl

Proposed by Tim Lunn on 2015-03-27
Status: Merged
Merged at revision: 138
Proposed branch: lp:~darkxst/apturl/icons
Merge into: lp:apturl
Diff against target: 49 lines (+10/-3)
3 files modified
AptUrl/gtk/GtkUI.py (+2/-2)
data/apturl-gtk.ui (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~darkxst/apturl/icons
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2015-03-27 Pending
Review via email: mp+254357@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AptUrl/gtk/GtkUI.py'
2--- AptUrl/gtk/GtkUI.py 2013-10-08 18:26:36 +0000
3+++ AptUrl/gtk/GtkUI.py 2015-03-27 06:00:53 +0000
4@@ -51,7 +51,7 @@
5 buttons=buttons)
6 d.set_title("")
7 d.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, msg))
8- d.set_icon(Gtk.IconTheme.get_default().load_icon('deb', 16, False))
9+ d.set_icon(Gtk.IconTheme.get_default().load_icon('package-x-generic', 16, False))
10 d.set_keep_above(True)
11 d.realize()
12 d.get_window().set_functions(Gdk.WMFunction.MOVE)
13@@ -164,7 +164,7 @@
14 desc = "%s\n\n%s" % (summary, Helpers.format_description(description))
15 tbuf.set_text(desc)
16 description_text_view.set_buffer(tbuf)
17- dia.set_icon(Gtk.IconTheme.get_default().load_icon('deb', 16, False))
18+ dia.set_icon(Gtk.IconTheme.get_default().load_icon('package-x-generic', 16, False))
19
20 # check if another package manager is already running
21 # FIXME: just checking for the existance of the file is
22
23=== modified file 'data/apturl-gtk.ui'
24--- data/apturl-gtk.ui 2013-04-09 11:22:53 +0000
25+++ data/apturl-gtk.ui 2015-03-27 06:00:53 +0000
26@@ -19,7 +19,7 @@
27 <object class="GtkImage" id="dialog_image">
28 <property name="visible">True</property>
29 <property name="yalign">0</property>
30- <property name="stock">gtk-dialog-question</property>
31+ <property name="stock">dialog-question</property>
32 <property name="icon_size">6</property>
33 </object>
34 <packing>
35
36=== modified file 'debian/changelog'
37--- debian/changelog 2015-01-26 18:03:14 +0000
38+++ debian/changelog 2015-03-27 06:00:53 +0000
39@@ -1,3 +1,10 @@
40+apturl (0.5.2ubuntu6) UNRELEASED; urgency=medium
41+
42+ * Don't use legacy icon names, these are no longer available in
43+ dwaita-icon-theme. (LP: #1437150)
44+
45+ -- Tim Lunn <tim@feathertop.org> Fri, 27 Mar 2015 16:56:09 +1100
46+
47 apturl (0.5.2ubuntu5) vivid; urgency=medium
48
49 * Switch gnome-icon-theme to adwaita-icon-theme, which is its

Subscribers

People subscribed via source and target branches