Unity Greeter

Merge lp:~aacid/unity-greeter/cached_image_null_pixbuf into lp:unity-greeter

  1. cached_image_null_pixbuf
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Merged at revision: 562
Proposed branch: lp:~aacid/unity-greeter/cached_image_null_pixbuf
Merge into: lp:unity-greeter
Diff against target: 22 lines (+7/-4)
1 file modified
src/cached-image.vala (+7/-4)
To merge this branch: bzr merge lp:~aacid/unity-greeter/cached_image_null_pixbuf
Reviewer Review Type Date Requested Status
Unity Greeter Development Team Pending
Review via email: mp+122678@code.launchpad.net

Description of the change

Do not call get_cached_surface with null pixbufs

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/cached-image.vala'
2--- src/cached-image.vala 2012-08-16 02:05:58 +0000
3+++ src/cached-image.vala 2012-09-04 13:45:09 +0000
4@@ -45,11 +45,14 @@
5
6 public override bool draw (Cairo.Context c)
7 {
8- var cached_surface = get_cached_surface (c, pixbuf);
9- if (cached_surface != null)
10+ if (pixbuf != null)
11 {
12- c.set_source_surface (cached_surface, 0, 0);
13- c.paint ();
14+ var cached_surface = get_cached_surface (c, pixbuf);
15+ if (cached_surface != null)
16+ {
17+ c.set_source_surface (cached_surface, 0, 0);
18+ c.paint ();
19+ }
20 }
21 return false;
22 }

Subscribers

People subscribed via source and target branches