Merge lp:~michael.rawson/lubuntu-software-center/fix-for-977868 into lp:lubuntu-software-center

Proposed by Michael Rawson
Status: Merged
Merged at revision: 141
Proposed branch: lp:~michael.rawson/lubuntu-software-center/fix-for-977868
Merge into: lp:lubuntu-software-center
Diff against target: 22 lines (+3/-2)
1 file modified
src/main.py (+3/-2)
To merge this branch: bzr merge lp:~michael.rawson/lubuntu-software-center/fix-for-977868
Reviewer Review Type Date Requested Status
Stephen Smally Pending
Review via email: mp+101345@code.launchpad.net

Description of the change

Prevents creation of default "deb" icons if control.controller.render_icons == False.

Second change prevents an error on opening the details of a package.

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 'src/main.py'
2--- src/main.py 2012-03-24 21:12:25 +0000
3+++ src/main.py 2012-04-10 09:22:18 +0000
4@@ -267,7 +267,7 @@
5 def define_icon(self, pkg):
6 '''Return the icon of the package'''
7 if control.controller.render_icons == False:
8- return "deb"
9+ return None
10 if pkg != None:
11 if self.theme.has_icon(pkg):
12 return pkg
13@@ -583,7 +583,8 @@
14 self.last_page_label = self.ui.categorie_label.get_text()
15 self.last_page_icon = self.ui.categorie_icon.get_icon_name()[0]
16 self.ui.search_pkg.set_sensitive(False)
17- self.ui.appsinfo.icon.set_from_icon_name(icon, 6)
18+ if(icon != None):
19+ self.ui.appsinfo.icon.set_from_icon_name(icon, 6)
20 self.ui.appsinfo.title.set_markup("<b><big>"+title.split("\n")[0]+"</big></b>")
21 self.ui.appsinfo.desc.set_text(title.split("\n")[-1])
22 description_formatted = description.replace("\n.", "\n")

Subscribers

People subscribed via source and target branches