From e99050ad48b89cb8e1a5eaafbb9fdf2ffd418485 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 26 Jan 2019 12:35:44 +0800 Subject: Avoid deprecated g_type_class_add_private under src Changed CajaSidePane, CajaSpatialWindow, CajaViewAsAction and CajaXContentBar --- src/caja-x-content-bar.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/caja-x-content-bar.h') diff --git a/src/caja-x-content-bar.h b/src/caja-x-content-bar.h index 50639e4e..a69fae13 100644 --- a/src/caja-x-content-bar.h +++ b/src/caja-x-content-bar.h @@ -28,9 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS #define CAJA_TYPE_X_CONTENT_BAR (caja_x_content_bar_get_type ()) #define CAJA_X_CONTENT_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_X_CONTENT_BAR, CajaXContentBar)) @@ -39,7 +37,7 @@ extern "C" { #define CAJA_IS_X_CONTENT_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CAJA_TYPE_X_CONTENT_BAR)) #define CAJA_X_CONTENT_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CAJA_TYPE_X_CONTENT_BAR, CajaXContentBarClass)) - typedef struct CajaXContentBarPrivate CajaXContentBarPrivate; + typedef struct _CajaXContentBarPrivate CajaXContentBarPrivate; typedef struct { @@ -64,8 +62,6 @@ extern "C" { GMount *mount); GMount *caja_x_content_bar_get_mount (CajaXContentBar *bar); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __CAJA_X_CONTENT_BAR_H */ -- cgit v1.2.1