Merge lp:~mc-return/compiz/compiz.merge-fix1130941-no-icons-and-text-in-ccsm into lp:compiz/0.9.9

Proposed by MC Return on 2013-02-25
Status: Merged
Approved by: Sam Spilsbury on 2013-02-25
Approved revision: 3620
Merged at revision: 3620
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix1130941-no-icons-and-text-in-ccsm
Merge into: lp:compiz/0.9.9
Diff against target: 12 lines (+1/-1)
1 file modified
compizconfig/ccsm/ccm/ (+1/-1)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix1130941-no-icons-and-text-in-ccsm
Reviewer Review Type Date Requested Status
Sam Spilsbury 2013-02-25 Approve on 2013-02-25
PS Jenkins bot continuous-integration Pending
Review via email:

Commit message

Fixed missing icons and text in CCSM main screen.
Credits for this fix go to danilo, thanks a lot !

(LP: #1130941)

To post a comment you must log in.
Sam Spilsbury (smspillaz) wrote :

Thanks for that.

We should probably migrate from libsexy to gtk+ anyways.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/ccsm/ccm/'
2--- compizconfig/ccsm/ccm/ 2011-02-12 17:37:09 +0000
3+++ compizconfig/ccsm/ccm/ 2013-02-25 14:39:21 +0000
4@@ -187,7 +187,7 @@
5 if has_focus:
6 self.unset_flags (gtk.HAS_FOCUS)
8- ret = super (PrettyButton, self).do_expose_event (self, event)
9+ ret = gtk.Button.do_expose_event (self, event)
11 if has_focus:
12 self.set_flags (gtk.HAS_FOCUS)


People subscribed via source and target branches