From 7920f9788dc8a142472c358d693bb7532c46b609 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 26 Jan 2019 12:13:16 +0800 Subject: Avoid deprecated g_type_class_add_private under libcaja-private Changed CajaIconCanvasItem, CajaTrashMonitor and CajaUndoStackManager --- libcaja-private/caja-icon-canvas-item.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libcaja-private/caja-icon-canvas-item.h') diff --git a/libcaja-private/caja-icon-canvas-item.h b/libcaja-private/caja-icon-canvas-item.h index d6eb4ee5..507fd8ad 100644 --- a/libcaja-private/caja-icon-canvas-item.h +++ b/libcaja-private/caja-icon-canvas-item.h @@ -28,9 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS #define CAJA_TYPE_ICON_CANVAS_ITEM caja_icon_canvas_item_get_type() #define CAJA_ICON_CANVAS_ITEM(obj) \ @@ -46,12 +44,12 @@ extern "C" { typedef struct CajaIconCanvasItem CajaIconCanvasItem; typedef struct CajaIconCanvasItemClass CajaIconCanvasItemClass; - typedef struct CajaIconCanvasItemDetails CajaIconCanvasItemDetails; + typedef struct _CajaIconCanvasItemPrivate CajaIconCanvasItemPrivate; struct CajaIconCanvasItem { EelCanvasItem item; - CajaIconCanvasItemDetails *details; + CajaIconCanvasItemPrivate *details; gpointer user_data; }; @@ -116,8 +114,6 @@ extern "C" { void caja_icon_canvas_item_set_entire_text (CajaIconCanvasItem *icon_item, gboolean entire_text); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* CAJA_ICON_CANVAS_ITEM_H */ -- cgit v1.2.1