diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2014-06-03 18:46:31 +0300 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2014-06-03 18:46:31 +0300 |
| commit | a2013ae87a9c4a97e293964a0f3848d9425a65be (patch) | |
| tree | 351a2d5c6e3d3d6acc3577bffd8bb7e5bdcc0839 /src/core/iconcache.c | |
| parent | d9f01a0524b04897daf89899acbbf7ba10e21384 (diff) | |
| download | metacity-a2013ae87a9c4a97e293964a0f3848d9425a65be.tar.gz | |
Build with gtk+-3.0
Most changes are copied from mutter 3.4.0. So thanks to mutter
developers! They done all hard work.
This patch also removes unused functions.
Diffstat (limited to 'src/core/iconcache.c')
| -rw-r--r-- | src/core/iconcache.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/iconcache.c b/src/core/iconcache.c index 055164e2..70af354c 100644 --- a/src/core/iconcache.c +++ b/src/core/iconcache.c @@ -392,17 +392,15 @@ try_pixmap_and_mask (MetaDisplay *display, get_pixmap_geometry (display, src_pixmap, &w, &h, NULL); - unscaled = meta_gdk_pixbuf_get_from_pixmap (NULL, - src_pixmap, - 0, 0, 0, 0, + unscaled = meta_gdk_pixbuf_get_from_pixmap (src_pixmap, + 0, 0, w, h); if (unscaled && src_mask != None) { get_pixmap_geometry (display, src_mask, &w, &h, NULL); - mask = meta_gdk_pixbuf_get_from_pixmap (NULL, - src_mask, - 0, 0, 0, 0, + mask = meta_gdk_pixbuf_get_from_pixmap (src_mask, + 0, 0, w, h); } |