mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-01 05:23:56 +00:00
general: Use gobject ADD_PRIVATE macros
Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1022
This commit is contained in:
parent
a90f60e359
commit
0bca2403c4
|
@ -59,7 +59,7 @@ typedef gint32 RequestCounter[REQUEST_TYPE_LAST];
|
|||
#define REQUEST_WANTS_TYPE(request, type) ((request) & (1<<(type)))
|
||||
#define REQUEST_SET_TYPE(request, type) (request) |= (1<<(type))
|
||||
|
||||
struct NautilusDirectoryDetails
|
||||
struct NautilusDirectoryPrivate
|
||||
{
|
||||
/* The location. */
|
||||
GFile *location;
|
||||
|
|
|
@ -65,7 +65,7 @@ static NautilusDirectory *nautilus_directory_new (GFile *location);
|
|||
static void set_directory_location (NautilusDirectory *directory,
|
||||
GFile *location);
|
||||
|
||||
G_DEFINE_TYPE (NautilusDirectory, nautilus_directory, G_TYPE_OBJECT);
|
||||
G_DEFINE_TYPE_WITH_PRIVATE (NautilusDirectory, nautilus_directory, G_TYPE_OBJECT);
|
||||
|
||||
static gboolean
|
||||
real_contains_file (NautilusDirectory *self,
|
||||
|
@ -332,14 +332,13 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
|
|||
G_TYPE_FILE,
|
||||
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (NautilusDirectoryDetails));
|
||||
g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
|
||||
}
|
||||
|
||||
static void
|
||||
nautilus_directory_init (NautilusDirectory *directory)
|
||||
{
|
||||
directory->details = G_TYPE_INSTANCE_GET_PRIVATE ((directory), NAUTILUS_TYPE_DIRECTORY, NautilusDirectoryDetails);
|
||||
directory->details = nautilus_directory_get_instance_private (directory);
|
||||
directory->details->file_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
|
||||
g_free, NULL);
|
||||
directory->details->high_priority_queue = nautilus_file_queue_new ();
|
||||
|
|
|
@ -59,12 +59,12 @@ typedef struct NautilusFile NautilusFile;
|
|||
#endif
|
||||
|
||||
typedef struct _NautilusDirectory NautilusDirectory;
|
||||
typedef struct NautilusDirectoryDetails NautilusDirectoryDetails;
|
||||
typedef struct NautilusDirectoryPrivate NautilusDirectoryPrivate;
|
||||
|
||||
struct _NautilusDirectory
|
||||
{
|
||||
GObject object;
|
||||
NautilusDirectoryDetails *details;
|
||||
NautilusDirectoryPrivate *details;
|
||||
};
|
||||
|
||||
typedef void (*NautilusDirectoryCallback) (NautilusDirectory *directory,
|
||||
|
|
|
@ -38,7 +38,7 @@ typedef enum {
|
|||
UNKNOWN
|
||||
} Knowledge;
|
||||
|
||||
struct NautilusFileDetails
|
||||
struct NautilusFilePrivate
|
||||
{
|
||||
NautilusDirectory *directory;
|
||||
|
||||
|
|
|
@ -183,12 +183,13 @@ static void metadata_hash_free (GHashTable *hash);
|
|||
|
||||
G_DEFINE_TYPE_WITH_CODE (NautilusFile, nautilus_file, G_TYPE_OBJECT,
|
||||
G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_FILE_INFO,
|
||||
nautilus_file_info_iface_init));
|
||||
nautilus_file_info_iface_init)
|
||||
G_ADD_PRIVATE (NautilusFile));
|
||||
|
||||
static void
|
||||
nautilus_file_init (NautilusFile *file)
|
||||
{
|
||||
file->details = G_TYPE_INSTANCE_GET_PRIVATE ((file), NAUTILUS_TYPE_FILE, NautilusFileDetails);
|
||||
file->details = nautilus_file_get_instance_private (file);
|
||||
|
||||
nautilus_file_clear_info (file);
|
||||
nautilus_file_invalidate_extension_info_internal (file);
|
||||
|
@ -9154,8 +9155,6 @@ nautilus_file_class_init (NautilusFileClass *class)
|
|||
g_cclosure_marshal_VOID__VOID,
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
g_type_class_add_private (class, sizeof (NautilusFileDetails));
|
||||
|
||||
thumbnail_limit_changed_callback (NULL);
|
||||
g_signal_connect_swapped (nautilus_preferences,
|
||||
"changed::" NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT,
|
||||
|
|
|
@ -486,11 +486,11 @@ gboolean nautilus_file_list_are_all_folders (const G
|
|||
/* Debugging */
|
||||
void nautilus_file_dump (NautilusFile *file);
|
||||
|
||||
typedef struct NautilusFileDetails NautilusFileDetails;
|
||||
typedef struct NautilusFilePrivate NautilusFilePrivate;
|
||||
|
||||
struct NautilusFile {
|
||||
GObject parent_slot;
|
||||
NautilusFileDetails *details;
|
||||
NautilusFilePrivate *details;
|
||||
};
|
||||
|
||||
/* This is actually a "protected" type, but it must be here so we can
|
||||
|
|
Loading…
Reference in a new issue