Commit 43dbd4b9 authored by Andrea Bolognani's avatar Andrea Bolognani

Remove all uses of g_type_class_add_private()

The API has been deprecated, which causes build failures
on Fedora Rawhide; use the G_DEFINE_TYPE_WITH_PRIVATE()
macro instead.

This requires bumping the minimum GLib version to 2.38.
Signed-off-by: 's avatarAndrea Bolognani <abologna@redhat.com>
Reviewed-by: 's avatarDaniel P. Berrangé <berrange@redhat.com>
parent 27f2bea3
...@@ -10,7 +10,7 @@ AC_CANONICAL_HOST ...@@ -10,7 +10,7 @@ AC_CANONICAL_HOST
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
GLIB_REQUIRED=2.32.0 GLIB_REQUIRED=2.38.0
LIBVIRT_REQUIRED=1.0.2 LIBVIRT_REQUIRED=1.0.2
LIBVIRT_GCONFIG_REQUIRED=0.2.1 LIBVIRT_GCONFIG_REQUIRED=0.2.1
LIBVIRT_GLIB_REQUIRED=0.2.2 LIBVIRT_GLIB_REQUIRED=0.2.2
......
...@@ -48,7 +48,7 @@ struct _GVirSandboxBuilderContainerPrivate ...@@ -48,7 +48,7 @@ struct _GVirSandboxBuilderContainerPrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_TYPE(GVirSandboxBuilderContainer, gvir_sandbox_builder_container, GVIR_SANDBOX_TYPE_BUILDER); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxBuilderContainer, gvir_sandbox_builder_container, GVIR_SANDBOX_TYPE_BUILDER);
enum { enum {
...@@ -473,8 +473,6 @@ static void gvir_sandbox_builder_container_class_init(GVirSandboxBuilderContaine ...@@ -473,8 +473,6 @@ static void gvir_sandbox_builder_container_class_init(GVirSandboxBuilderContaine
builder_class->construct_devices = gvir_sandbox_builder_container_construct_devices; builder_class->construct_devices = gvir_sandbox_builder_container_construct_devices;
builder_class->get_disk_prefix = gvir_sandbox_builder_container_get_disk_prefix; builder_class->get_disk_prefix = gvir_sandbox_builder_container_get_disk_prefix;
builder_class->get_files_to_copy = gvir_sandbox_builder_container_get_files_to_copy; builder_class->get_files_to_copy = gvir_sandbox_builder_container_get_files_to_copy;
g_type_class_add_private(klass, sizeof(GVirSandboxBuilderContainerPrivate));
} }
......
...@@ -51,7 +51,7 @@ struct _GVirSandboxBuilderInitrdPrivate ...@@ -51,7 +51,7 @@ struct _GVirSandboxBuilderInitrdPrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_TYPE(GVirSandboxBuilderInitrd, gvir_sandbox_builder_initrd, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxBuilderInitrd, gvir_sandbox_builder_initrd, G_TYPE_OBJECT);
enum { enum {
...@@ -127,8 +127,6 @@ static void gvir_sandbox_builder_initrd_class_init(GVirSandboxBuilderInitrdClass ...@@ -127,8 +127,6 @@ static void gvir_sandbox_builder_initrd_class_init(GVirSandboxBuilderInitrdClass
object_class->finalize = gvir_sandbox_builder_initrd_finalize; object_class->finalize = gvir_sandbox_builder_initrd_finalize;
object_class->get_property = gvir_sandbox_builder_initrd_get_property; object_class->get_property = gvir_sandbox_builder_initrd_get_property;
object_class->set_property = gvir_sandbox_builder_initrd_set_property; object_class->set_property = gvir_sandbox_builder_initrd_set_property;
g_type_class_add_private(klass, sizeof(GVirSandboxBuilderInitrdPrivate));
} }
......
...@@ -50,7 +50,7 @@ struct _GVirSandboxBuilderMachinePrivate ...@@ -50,7 +50,7 @@ struct _GVirSandboxBuilderMachinePrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_TYPE(GVirSandboxBuilderMachine, gvir_sandbox_builder_machine, GVIR_SANDBOX_TYPE_BUILDER); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxBuilderMachine, gvir_sandbox_builder_machine, GVIR_SANDBOX_TYPE_BUILDER);
enum { enum {
...@@ -792,8 +792,6 @@ static void gvir_sandbox_builder_machine_class_init(GVirSandboxBuilderMachineCla ...@@ -792,8 +792,6 @@ static void gvir_sandbox_builder_machine_class_init(GVirSandboxBuilderMachineCla
builder_class->clean_post_start = gvir_sandbox_builder_machine_clean_post_start; builder_class->clean_post_start = gvir_sandbox_builder_machine_clean_post_start;
builder_class->clean_post_stop = gvir_sandbox_builder_machine_clean_post_stop; builder_class->clean_post_stop = gvir_sandbox_builder_machine_clean_post_stop;
builder_class->get_disk_prefix = gvir_sandbox_builder_machine_get_disk_prefix; builder_class->get_disk_prefix = gvir_sandbox_builder_machine_get_disk_prefix;
g_type_class_add_private(klass, sizeof(GVirSandboxBuilderMachinePrivate));
} }
......
...@@ -47,7 +47,7 @@ struct _GVirSandboxBuilderPrivate ...@@ -47,7 +47,7 @@ struct _GVirSandboxBuilderPrivate
GVirConnection *connection; GVirConnection *connection;
}; };
G_DEFINE_ABSTRACT_TYPE(GVirSandboxBuilder, gvir_sandbox_builder, G_TYPE_OBJECT); G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxBuilder, gvir_sandbox_builder, G_TYPE_OBJECT);
enum { enum {
...@@ -193,8 +193,6 @@ static void gvir_sandbox_builder_class_init(GVirSandboxBuilderClass *klass) ...@@ -193,8 +193,6 @@ static void gvir_sandbox_builder_class_init(GVirSandboxBuilderClass *klass)
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxBuilderPrivate));
} }
......
...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigDiskPrivate ...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigDiskPrivate
GVirConfigDomainDiskFormat format; GVirConfigDomainDiskFormat format;
}; };
G_DEFINE_TYPE(GVirSandboxConfigDisk, gvir_sandbox_config_disk, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigDisk, gvir_sandbox_config_disk, G_TYPE_OBJECT);
enum { enum {
...@@ -194,8 +194,6 @@ static void gvir_sandbox_config_disk_class_init(GVirSandboxConfigDiskClass *klas ...@@ -194,8 +194,6 @@ static void gvir_sandbox_config_disk_class_init(GVirSandboxConfigDiskClass *klas
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigDiskPrivate));
} }
......
...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigInitrdPrivate ...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigInitrdPrivate
GList *modules; GList *modules;
}; };
G_DEFINE_TYPE(GVirSandboxConfigInitrd, gvir_sandbox_config_initrd, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigInitrd, gvir_sandbox_config_initrd, G_TYPE_OBJECT);
enum { enum {
...@@ -174,8 +174,6 @@ static void gvir_sandbox_config_initrd_class_init(GVirSandboxConfigInitrdClass * ...@@ -174,8 +174,6 @@ static void gvir_sandbox_config_initrd_class_init(GVirSandboxConfigInitrdClass *
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigInitrdPrivate));
} }
......
...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigInteractivePrivate ...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigInteractivePrivate
gchar **command; gchar **command;
}; };
G_DEFINE_TYPE(GVirSandboxConfigInteractive, gvir_sandbox_config_interactive, GVIR_SANDBOX_TYPE_CONFIG); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigInteractive, gvir_sandbox_config_interactive, GVIR_SANDBOX_TYPE_CONFIG);
static gchar **gvir_sandbox_config_interactive_get_command(GVirSandboxConfig *config); static gchar **gvir_sandbox_config_interactive_get_command(GVirSandboxConfig *config);
...@@ -210,8 +210,6 @@ static void gvir_sandbox_config_interactive_class_init(GVirSandboxConfigInteract ...@@ -210,8 +210,6 @@ static void gvir_sandbox_config_interactive_class_init(GVirSandboxConfigInteract
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigInteractivePrivate));
} }
......
...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountFilePrivate ...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountFilePrivate
gchar *source; gchar *source;
}; };
G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfigMountFile, gvir_sandbox_config_mount_file, GVIR_SANDBOX_TYPE_CONFIG_MOUNT); G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfigMountFile, gvir_sandbox_config_mount_file, GVIR_SANDBOX_TYPE_CONFIG_MOUNT);
enum { enum {
PROP_0, PROP_0,
...@@ -131,8 +131,6 @@ static void gvir_sandbox_config_mount_file_class_init(GVirSandboxConfigMountFile ...@@ -131,8 +131,6 @@ static void gvir_sandbox_config_mount_file_class_init(GVirSandboxConfigMountFile
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountFilePrivate));
} }
......
...@@ -48,12 +48,11 @@ struct _GVirSandboxConfigMountGuestBindPrivate ...@@ -48,12 +48,11 @@ struct _GVirSandboxConfigMountGuestBindPrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_TYPE(GVirSandboxConfigMountGuestBind, gvir_sandbox_config_mount_guest_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountGuestBind, gvir_sandbox_config_mount_guest_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE);
static void gvir_sandbox_config_mount_guest_bind_class_init(GVirSandboxConfigMountGuestBindClass *klass) static void gvir_sandbox_config_mount_guest_bind_class_init(GVirSandboxConfigMountGuestBindClass *klass G_GNUC_UNUSED)
{ {
g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountGuestBindPrivate));
} }
......
...@@ -48,12 +48,11 @@ struct _GVirSandboxConfigMountHostBindPrivate ...@@ -48,12 +48,11 @@ struct _GVirSandboxConfigMountHostBindPrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_TYPE(GVirSandboxConfigMountHostBind, gvir_sandbox_config_mount_host_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountHostBind, gvir_sandbox_config_mount_host_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE);
static void gvir_sandbox_config_mount_host_bind_class_init(GVirSandboxConfigMountHostBindClass *klass) static void gvir_sandbox_config_mount_host_bind_class_init(GVirSandboxConfigMountHostBindClass *klass G_GNUC_UNUSED)
{ {
g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountHostBindPrivate));
} }
......
...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountHostImagePrivate ...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountHostImagePrivate
GVirConfigDomainDiskFormat format; GVirConfigDomainDiskFormat format;
}; };
G_DEFINE_TYPE(GVirSandboxConfigMountHostImage, gvir_sandbox_config_mount_host_image, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountHostImage, gvir_sandbox_config_mount_host_image, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE);
enum { enum {
PROP_0, PROP_0,
...@@ -118,8 +118,6 @@ static void gvir_sandbox_config_mount_host_image_class_init(GVirSandboxConfigMou ...@@ -118,8 +118,6 @@ static void gvir_sandbox_config_mount_host_image_class_init(GVirSandboxConfigMou
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountHostImagePrivate));
} }
......
...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountRamPrivate ...@@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountRamPrivate
guint64 usage; guint64 usage;
}; };
G_DEFINE_TYPE(GVirSandboxConfigMountRam, gvir_sandbox_config_mount_ram, GVIR_SANDBOX_TYPE_CONFIG_MOUNT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountRam, gvir_sandbox_config_mount_ram, GVIR_SANDBOX_TYPE_CONFIG_MOUNT);
enum { enum {
PROP_0, PROP_0,
...@@ -121,8 +121,6 @@ static void gvir_sandbox_config_mount_ram_class_init(GVirSandboxConfigMountRamCl ...@@ -121,8 +121,6 @@ static void gvir_sandbox_config_mount_ram_class_init(GVirSandboxConfigMountRamCl
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountRamPrivate));
} }
......
...@@ -49,7 +49,7 @@ struct _GVirSandboxConfigMountPrivate ...@@ -49,7 +49,7 @@ struct _GVirSandboxConfigMountPrivate
GHashTable *includes; GHashTable *includes;
}; };
G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfigMount, gvir_sandbox_config_mount, G_TYPE_OBJECT); G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfigMount, gvir_sandbox_config_mount, G_TYPE_OBJECT);
enum { enum {
...@@ -134,8 +134,6 @@ static void gvir_sandbox_config_mount_class_init(GVirSandboxConfigMountClass *kl ...@@ -134,8 +134,6 @@ static void gvir_sandbox_config_mount_class_init(GVirSandboxConfigMountClass *kl
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountPrivate));
} }
......
...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkAddressPrivate ...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkAddressPrivate
guint prefix; guint prefix;
}; };
G_DEFINE_TYPE(GVirSandboxConfigNetworkAddress, gvir_sandbox_config_network_address, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkAddress, gvir_sandbox_config_network_address, G_TYPE_OBJECT);
enum { enum {
...@@ -180,8 +180,6 @@ static void gvir_sandbox_config_network_address_class_init(GVirSandboxConfigNetw ...@@ -180,8 +180,6 @@ static void gvir_sandbox_config_network_address_class_init(GVirSandboxConfigNetw
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkAddressPrivate));
} }
......
...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigNetworkFilterrefParameterPrivate ...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigNetworkFilterrefParameterPrivate
gchar *value; gchar *value;
}; };
G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterrefParameter, gvir_sandbox_config_network_filterref_parameter, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkFilterrefParameter, gvir_sandbox_config_network_filterref_parameter, G_TYPE_OBJECT);
enum { enum {
...@@ -143,8 +143,6 @@ static void gvir_sandbox_config_network_filterref_parameter_class_init(GVirSandb ...@@ -143,8 +143,6 @@ static void gvir_sandbox_config_network_filterref_parameter_class_init(GVirSandb
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefParameterPrivate));
} }
......
...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkFilterrefPrivate ...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkFilterrefPrivate
GList *parameters; GList *parameters;
}; };
G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterref, gvir_sandbox_config_network_filterref, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkFilterref, gvir_sandbox_config_network_filterref, G_TYPE_OBJECT);
enum { enum {
...@@ -128,8 +128,6 @@ static void gvir_sandbox_config_network_filterref_class_init(GVirSandboxConfigNe ...@@ -128,8 +128,6 @@ static void gvir_sandbox_config_network_filterref_class_init(GVirSandboxConfigNe
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefPrivate));
} }
/** /**
......
...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkRoutePrivate ...@@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkRoutePrivate
GInetAddress *target; GInetAddress *target;
}; };
G_DEFINE_TYPE(GVirSandboxConfigNetworkRoute, gvir_sandbox_config_network_route, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkRoute, gvir_sandbox_config_network_route, G_TYPE_OBJECT);
enum { enum {
...@@ -180,8 +180,6 @@ static void gvir_sandbox_config_network_route_class_init(GVirSandboxConfigNetwor ...@@ -180,8 +180,6 @@ static void gvir_sandbox_config_network_route_class_init(GVirSandboxConfigNetwor
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkRoutePrivate));
} }
......
...@@ -50,7 +50,7 @@ struct _GVirSandboxConfigNetworkPrivate ...@@ -50,7 +50,7 @@ struct _GVirSandboxConfigNetworkPrivate
GVirSandboxConfigNetworkFilterref *filterref; GVirSandboxConfigNetworkFilterref *filterref;
}; };
G_DEFINE_TYPE(GVirSandboxConfigNetwork, gvir_sandbox_config_network, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetwork, gvir_sandbox_config_network, G_TYPE_OBJECT);
enum { enum {
...@@ -183,8 +183,6 @@ static void gvir_sandbox_config_network_class_init(GVirSandboxConfigNetworkClass ...@@ -183,8 +183,6 @@ static void gvir_sandbox_config_network_class_init(GVirSandboxConfigNetworkClass
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkPrivate));
} }
......
...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigServiceGenericPrivate ...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigServiceGenericPrivate
gchar **command; gchar **command;
}; };
G_DEFINE_TYPE(GVirSandboxConfigServiceGeneric, gvir_sandbox_config_service_generic, GVIR_SANDBOX_TYPE_CONFIG_SERVICE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigServiceGeneric, gvir_sandbox_config_service_generic, GVIR_SANDBOX_TYPE_CONFIG_SERVICE);
static gchar **gvir_sandbox_config_service_generic_get_command(GVirSandboxConfig *config); static gchar **gvir_sandbox_config_service_generic_get_command(GVirSandboxConfig *config);
...@@ -154,8 +154,6 @@ static void gvir_sandbox_config_service_generic_class_init(GVirSandboxConfigServ ...@@ -154,8 +154,6 @@ static void gvir_sandbox_config_service_generic_class_init(GVirSandboxConfigServ
config_class->load_config = gvir_sandbox_config_service_generic_load_config; config_class->load_config = gvir_sandbox_config_service_generic_load_config;
config_class->save_config = gvir_sandbox_config_service_generic_save_config; config_class->save_config = gvir_sandbox_config_service_generic_save_config;
config_class->get_command = gvir_sandbox_config_service_generic_get_command; config_class->get_command = gvir_sandbox_config_service_generic_get_command;
g_type_class_add_private(klass, sizeof(GVirSandboxConfigServiceGenericPrivate));
} }
......
...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigServiceSystemdPrivate ...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigServiceSystemdPrivate
gchar *bootTarget; gchar *bootTarget;
}; };
G_DEFINE_TYPE(GVirSandboxConfigServiceSystemd, gvir_sandbox_config_service_systemd, GVIR_SANDBOX_TYPE_CONFIG_SERVICE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigServiceSystemd, gvir_sandbox_config_service_systemd, GVIR_SANDBOX_TYPE_CONFIG_SERVICE);
static gchar **gvir_sandbox_config_service_systemd_get_command(GVirSandboxConfig *config); static gchar **gvir_sandbox_config_service_systemd_get_command(GVirSandboxConfig *config);
...@@ -165,8 +165,6 @@ static void gvir_sandbox_config_service_systemd_class_init(GVirSandboxConfigServ ...@@ -165,8 +165,6 @@ static void gvir_sandbox_config_service_systemd_class_init(GVirSandboxConfigServ
config_class->load_config = gvir_sandbox_config_service_systemd_load_config; config_class->load_config = gvir_sandbox_config_service_systemd_load_config;
config_class->save_config = gvir_sandbox_config_service_systemd_save_config; config_class->save_config = gvir_sandbox_config_service_systemd_save_config;
config_class->get_command = gvir_sandbox_config_service_systemd_get_command; config_class->get_command = gvir_sandbox_config_service_systemd_get_command;
g_type_class_add_private(klass, sizeof(GVirSandboxConfigServiceSystemdPrivate));
} }
......
...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigServicePrivate ...@@ -45,7 +45,7 @@ struct _GVirSandboxConfigServicePrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfigService, gvir_sandbox_config_service, GVIR_SANDBOX_TYPE_CONFIG); G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfigService, gvir_sandbox_config_service, GVIR_SANDBOX_TYPE_CONFIG);
enum { enum {
...@@ -77,8 +77,6 @@ static void gvir_sandbox_config_service_class_init(GVirSandboxConfigServiceClass ...@@ -77,8 +77,6 @@ static void gvir_sandbox_config_service_class_init(GVirSandboxConfigServiceClass
GObjectClass *object_class = G_OBJECT_CLASS(klass); GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = gvir_sandbox_config_service_finalize; object_class->finalize = gvir_sandbox_config_service_finalize;
g_type_class_add_private(klass, sizeof(GVirSandboxConfigServicePrivate));
} }
......
...@@ -73,7 +73,7 @@ struct _GVirSandboxConfigPrivate ...@@ -73,7 +73,7 @@ struct _GVirSandboxConfigPrivate
gboolean verbose; gboolean verbose;
}; };
G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfig, gvir_sandbox_config, G_TYPE_OBJECT); G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfig, gvir_sandbox_config, G_TYPE_OBJECT);
enum { enum {
...@@ -470,8 +470,6 @@ static void gvir_sandbox_config_class_init(GVirSandboxConfigClass *klass) ...@@ -470,8 +470,6 @@ static void gvir_sandbox_config_class_init(GVirSandboxConfigClass *klass)
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB)); G_PARAM_STATIC_BLURB));
g_type_class_add_private(klass, sizeof(GVirSandboxConfigPrivate));
} }
......
...@@ -94,7 +94,7 @@ struct _GVirSandboxConsoleRawPrivate ...@@ -94,7 +94,7 @@ struct _GVirSandboxConsoleRawPrivate
GSource *consoleOutputSource; GSource *consoleOutputSource;
}; };
G_DEFINE_TYPE(GVirSandboxConsoleRaw, gvir_sandbox_console_raw, GVIR_SANDBOX_TYPE_CONSOLE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConsoleRaw, gvir_sandbox_console_raw, GVIR_SANDBOX_TYPE_CONSOLE);
enum { enum {
LAST_SIGNAL LAST_SIGNAL
...@@ -133,8 +133,6 @@ static void gvir_sandbox_console_raw_class_init(GVirSandboxConsoleRawClass *klas ...@@ -133,8 +133,6 @@ static void gvir_sandbox_console_raw_class_init(GVirSandboxConsoleRawClass *klas
object_class->finalize = gvir_sandbox_console_raw_finalize; object_class->finalize = gvir_sandbox_console_raw_finalize;
console_class->attach = gvir_sandbox_console_raw_attach; console_class->attach = gvir_sandbox_console_raw_attach;
console_class->detach = gvir_sandbox_console_raw_detach; console_class->detach = gvir_sandbox_console_raw_detach;
g_type_class_add_private(klass, sizeof(GVirSandboxConsoleRawPrivate));
} }
......
...@@ -153,7 +153,7 @@ struct _GVirSandboxConsoleRpcPrivate ...@@ -153,7 +153,7 @@ struct _GVirSandboxConsoleRpcPrivate
gsize serial; gsize serial;
}; };
G_DEFINE_TYPE(GVirSandboxConsoleRpc, gvir_sandbox_console_rpc, GVIR_SANDBOX_TYPE_CONSOLE); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConsoleRpc, gvir_sandbox_console_rpc, GVIR_SANDBOX_TYPE_CONSOLE);
enum { enum {
...@@ -291,8 +291,6 @@ static void gvir_sandbox_console_rpc_class_init(GVirSandboxConsoleRpcClass *klas ...@@ -291,8 +291,6 @@ static void gvir_sandbox_console_rpc_class_init(GVirSandboxConsoleRpcClass *klas
G_TYPE_NONE, G_TYPE_NONE,
1, 1,
G_TYPE_INT); G_TYPE_INT);
g_type_class_add_private(klass, sizeof(GVirSandboxConsoleRpcPrivate));
} }
......
...@@ -54,7 +54,7 @@ struct _GVirSandboxConsolePrivate ...@@ -54,7 +54,7 @@ struct _GVirSandboxConsolePrivate
}; };
G_DEFINE_ABSTRACT_TYPE(GVirSandboxConsole, gvir_sandbox_console, G_TYPE_OBJECT); G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConsole, gvir_sandbox_console, G_TYPE_OBJECT);
enum { enum {
PROP_0, PROP_0,
...@@ -251,8 +251,6 @@ static void gvir_sandbox_console_class_init(GVirSandboxConsoleClass *klass) ...@@ -251,8 +251,6 @@ static void gvir_sandbox_console_class_init(GVirSandboxConsoleClass *klass)
G_TYPE_NONE, G_TYPE_NONE,
1, 1,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);
g_type_class_add_private(klass, sizeof(GVirSandboxConsolePrivate));
} }
......
...@@ -49,7 +49,7 @@ struct _GVirSandboxContextInteractivePrivate ...@@ -49,7 +49,7 @@ struct _GVirSandboxContextInteractivePrivate
gboolean unused; gboolean unused;
}; };
G_DEFINE_TYPE(GVirSandboxContextInteractive, gvir_sandbox_context_interactive, GVIR_SANDBOX_TYPE_CONTEXT); G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxContextInteractive, gvir_sandbox_context_interactive, GVIR_SANDBOX_TYPE_CONTEXT);
enum { enum {
...@@ -346,8 +346,6 @@ static void gvir_sandbox_context_interactive_class_init(GVirSandboxContextIntera ...@@ -346,8 +346,6 @@ static void gvir_sandbox_context_interactive_class_init(GVirSandboxContextIntera
context_class->start = gvir_sandbox_context_interactive_start; context_class->start = gvir_sandbox_context_interactive_start;
context_class->stop = gvir_sandbox_context_interactive_stop; context_class->stop = gvir_sandbox_context_interactive_stop;
g_type_class_add_private(klass, sizeof(GVirSandboxContextInteractivePrivate));
} }