diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-16 05:08:48 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-16 05:08:48 -0800 |
| commit | dc66bc40724191f0068869773576dc4edf042c6f (patch) | |
| tree | 74b9684feea188736b21f2c829f29befaaf2e9da /libcaja-private/caja-icon-canvas-item.h | |
| parent | 935e1fed604f48e68d125d205c890a59f46f8f21 (diff) | |
| parent | 1466df20591105550738a1d0784a623af9909abf (diff) | |
| download | caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2 caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz | |
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'libcaja-private/caja-icon-canvas-item.h')
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.h b/libcaja-private/caja-icon-canvas-item.h index 27d01867..14b93b63 100644 --- a/libcaja-private/caja-icon-canvas-item.h +++ b/libcaja-private/caja-icon-canvas-item.h @@ -74,9 +74,13 @@ extern "C" { /* attributes */ void caja_icon_canvas_item_set_image (CajaIconCanvasItem *item, GdkPixbuf *image); +#if GTK_CHECK_VERSION(3,0,0) + cairo_surface_t* caja_icon_canvas_item_get_drag_surface (CajaIconCanvasItem *item); +#else GdkPixmap * caja_icon_canvas_item_get_image (CajaIconCanvasItem *item, - GdkBitmap **mask, - GdkColormap *colormap); + GdkBitmap **mask, + GdkColormap *colormap); +#endif void caja_icon_canvas_item_set_emblems (CajaIconCanvasItem *item, GList *emblem_pixbufs); void caja_icon_canvas_item_set_show_stretch_handles (CajaIconCanvasItem *item, |