diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-11 06:44:47 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-11 19:34:13 +0200 |
| commit | d15854911034f7cce3c949aee2ec39f512890ae3 (patch) | |
| tree | 0ac3c06faf9ad403e375140638b2958aba62e361 /libmate-desktop/libmateui/mate-bg-crossfade.h | |
| parent | 6e90196244e02b7203c77de3568f8c4dcc8dc65a (diff) | |
| download | mate-desktop-d15854911034f7cce3c949aee2ec39f512890ae3.tar.bz2 mate-desktop-d15854911034f7cce3c949aee2ec39f512890ae3.tar.xz | |
[mate-bg] Proper update for GTK3 changes, simplify GTK2 compatability
Reverts: bc53751054ab "some ugly gtk3 porting", then:
1. use upstream commit below as a reference (GTK3)
2. simplify our GTK_VERSION_CHECK's, hopefully to make the code more readable,
and the GTK2 backwards-compatibility snippets easier to cleanup later.
--
Includes a renaming of all "pixmap" names in APIs to "surface":
http://git.gnome.org/browse/gnome-desktop/commit/?id=28f2b06f50e3f1adf19389c2c3a1f63872539fa9
https://bugzilla.gnome.org/show_bug.cgi?id=630724
Remove unnecessary, deprecated, GDK_DRAWABLE cast:
http://git.gnome.org/browse/gnome-desktop/commit/?id=260f6d2431088c5cd0ad1eb8d57f0ec994240f08
Diffstat (limited to 'libmate-desktop/libmateui/mate-bg-crossfade.h')
| -rw-r--r-- | libmate-desktop/libmateui/mate-bg-crossfade.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libmate-desktop/libmateui/mate-bg-crossfade.h b/libmate-desktop/libmateui/mate-bg-crossfade.h index 268f1c7..28c1e28 100644 --- a/libmate-desktop/libmateui/mate-bg-crossfade.h +++ b/libmate-desktop/libmateui/mate-bg-crossfade.h @@ -66,11 +66,15 @@ MateBGCrossfade *mate_bg_crossfade_new (int width, int height); #if GTK_CHECK_VERSION(3, 0, 0) - gboolean mate_bg_crossfade_set_start_pixmap(MateBGCrossfade* fade, cairo_surface_t* pixmap); - gboolean mate_bg_crossfade_set_end_pixmap(MateBGCrossfade* fade, cairo_surface_t* pixmap); +gboolean mate_bg_crossfade_set_start_surface (MateBGCrossfade *fade, + cairo_surface_t *surface); +gboolean mate_bg_crossfade_set_end_surface (MateBGCrossfade *fade, + cairo_surface_t *surface); #else - gboolean mate_bg_crossfade_set_start_pixmap(MateBGCrossfade* fade, GdkPixmap* pixmap); - gboolean mate_bg_crossfade_set_end_pixmap(MateBGCrossfade* fade, GdkPixmap* pixmap); +gboolean mate_bg_crossfade_set_start_pixmap (MateBGCrossfade *fade, + GdkPixmap *pixmap); +gboolean mate_bg_crossfade_set_end_pixmap (MateBGCrossfade *fade, + GdkPixmap *pixmap); #endif void mate_bg_crossfade_start (MateBGCrossfade *fade, |