diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-12-26 20:20:19 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:05:41 +0100 |
| commit | b1b2cb896d0cbe4a210af4bf3b867cb89580c4c3 (patch) | |
| tree | 302886089bfb5a989af894e3e80840b29dfec485 /eel/eel-gdk-pixbuf-extensions.c | |
| parent | a781d9bffc37f71f4eeb68641f34095d92820507 (diff) | |
| download | caja-b1b2cb896d0cbe4a210af4bf3b867cb89580c4c3.tar.bz2 caja-b1b2cb896d0cbe4a210af4bf3b867cb89580c4c3.tar.xz | |
GTK3 eel-gdk-pixbuf: use GdkRGBA everywhere
taken from:
https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=020adaf
Diffstat (limited to 'eel/eel-gdk-pixbuf-extensions.c')
| -rw-r--r-- | eel/eel-gdk-pixbuf-extensions.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c index b4cd9394..bbbffc3a 100644 --- a/eel/eel-gdk-pixbuf-extensions.c +++ b/eel/eel-gdk-pixbuf-extensions.c @@ -1265,7 +1265,11 @@ eel_gdk_pixbuf_render (GdkPixbuf *pixbuf, guint saturation, guint brightness, guint lighten_value, +#if GTK_CHECK_VERSION(3,0,0) + GdkRGBA *color) +#else guint color) +#endif { GdkPixbuf *temp_pixbuf, *old_pixbuf; @@ -1277,19 +1281,27 @@ eel_gdk_pixbuf_render (GdkPixbuf *pixbuf, else if (render_mode == 2) { /* colorize icon */ +#if GTK_CHECK_VERSION(3,0,0) + temp_pixbuf = eel_create_colorized_pixbuf (pixbuf, color); +#else temp_pixbuf = eel_create_colorized_pixbuf (pixbuf, EEL_RGBA_COLOR_GET_R (color), EEL_RGBA_COLOR_GET_G (color), EEL_RGBA_COLOR_GET_B (color)); +#endif } else if (render_mode == 3) { /* monochromely colorize icon */ old_pixbuf = eel_create_darkened_pixbuf (pixbuf, 0, 255); +#if GTK_CHECK_VERSION(3,0,0) + temp_pixbuf = eel_create_colorized_pixbuf (old_pixbuf, color); +#else temp_pixbuf = eel_create_colorized_pixbuf (old_pixbuf, EEL_RGBA_COLOR_GET_R (color), EEL_RGBA_COLOR_GET_G (color), EEL_RGBA_COLOR_GET_B (color)); +#endif g_object_unref (old_pixbuf); } else |