From e5129f93e489c1716d815452075f57a64b5fa149 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 26 Jan 2019 12:09:19 +0800 Subject: Avoid deprecated g_type_class_add_private under libcaja-private Changed CajaDesktopLink, CajaDirectoryAsync and CajaDirectory --- libcaja-private/caja-desktop-link.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libcaja-private/caja-desktop-link.c') diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c index d695af6d..360c75cc 100644 --- a/libcaja-private/caja-desktop-link.c +++ b/libcaja-private/caja-desktop-link.c @@ -36,7 +36,7 @@ #include #include -struct CajaDesktopLinkDetails +struct _CajaDesktopLinkPrivate { CajaDesktopLinkType type; char *filename; @@ -53,7 +53,7 @@ struct CajaDesktopLinkDetails GMount *mount; }; -G_DEFINE_TYPE(CajaDesktopLink, caja_desktop_link, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopLink, caja_desktop_link, G_TYPE_OBJECT) static void create_icon_file (CajaDesktopLink *link) @@ -446,9 +446,7 @@ caja_desktop_link_rename (CajaDesktopLink *link, static void caja_desktop_link_init (CajaDesktopLink *link) { - link->details = G_TYPE_INSTANCE_GET_PRIVATE (link, - CAJA_TYPE_DESKTOP_LINK, - CajaDesktopLinkDetails); + link->details = caja_desktop_link_get_instance_private (link); } static void @@ -529,6 +527,4 @@ caja_desktop_link_class_init (CajaDesktopLinkClass *klass) object_class = G_OBJECT_CLASS (klass); object_class->finalize = desktop_link_finalize; - - g_type_class_add_private (object_class, sizeof(CajaDesktopLinkDetails)); } -- cgit v1.2.1