From 9cd63d4532ec29f9ed133e4f6d8ae07b241de416 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 26 Jan 2019 12:06:01 +0800 Subject: Avoid deprecated g_type_class_add_private under libcaja-private Changed CajaClipboardMonitor, CajaColumnChooser and CajaDesktopIconFile --- libcaja-private/caja-desktop-icon-file.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'libcaja-private/caja-desktop-icon-file.c') diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c index ede7f2e1..a91b926d 100644 --- a/libcaja-private/caja-desktop-icon-file.c +++ b/libcaja-private/caja-desktop-icon-file.c @@ -40,12 +40,12 @@ #include #include -struct CajaDesktopIconFileDetails +struct _CajaDesktopIconFilePrivate { CajaDesktopLink *link; }; -G_DEFINE_TYPE(CajaDesktopIconFile, caja_desktop_icon_file, CAJA_TYPE_FILE) +G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopIconFile, caja_desktop_icon_file, CAJA_TYPE_FILE) static void @@ -166,9 +166,7 @@ desktop_icon_file_get_where_string (CajaFile *file) static void caja_desktop_icon_file_init (CajaDesktopIconFile *desktop_file) { - desktop_file->details = G_TYPE_INSTANCE_GET_PRIVATE (desktop_file, - CAJA_TYPE_DESKTOP_ICON_FILE, - CajaDesktopIconFileDetails); + desktop_file->details = caja_desktop_icon_file_get_instance_private (desktop_file); } static void @@ -384,10 +382,8 @@ caja_desktop_icon_file_set_metadata_as_list (CajaFile *file, static void caja_desktop_icon_file_class_init (CajaDesktopIconFileClass *klass) { - GObjectClass *object_class; CajaFileClass *file_class; - object_class = G_OBJECT_CLASS (klass); file_class = CAJA_FILE_CLASS (klass); file_class->default_file_type = G_FILE_TYPE_DIRECTORY; @@ -405,6 +401,4 @@ caja_desktop_icon_file_class_init (CajaDesktopIconFileClass *klass) file_class->set_metadata_as_list = caja_desktop_icon_file_set_metadata_as_list; file_class->unmount = caja_desktop_icon_file_unmount; file_class->eject = caja_desktop_icon_file_eject; - - g_type_class_add_private (object_class, sizeof(CajaDesktopIconFileDetails)); } -- cgit v1.2.1