diff options
| author | Robert Mader <robert.mader@posteo.de> | 2019-03-14 00:08:53 +0100 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2019-08-13 20:27:10 +0000 |
| commit | 09f2c309b4d2ffa8759d000c366a62dd63b40d9c (patch) | |
| tree | f106e5c4dee260d8f69a8835ab36485f098ccc5f /daemon/gdm-launch-environment.c | |
| parent | ce120bc9eda2d8e6e7489b780fa4659ead6d39aa (diff) | |
| download | gdm-09f2c309b4d2ffa8759d000c366a62dd63b40d9c.tar.gz | |
gdm-launch-environment: Replace deprecated g_type_class_add_private()
Diffstat (limited to 'daemon/gdm-launch-environment.c')
| -rw-r--r-- | daemon/gdm-launch-environment.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c index 5e1427b0..feccf057 100644 --- a/daemon/gdm-launch-environment.c +++ b/daemon/gdm-launch-environment.c @@ -57,8 +57,6 @@ extern char **environ; -#define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate)) - struct GdmLaunchEnvironmentPrivate { GdmSession *session; @@ -113,7 +111,7 @@ static void gdm_launch_environment_class_init (GdmLaunchEnvironmentClass static void gdm_launch_environment_init (GdmLaunchEnvironment *launch_environment); static void gdm_launch_environment_finalize (GObject *object); -G_DEFINE_TYPE (GdmLaunchEnvironment, gdm_launch_environment, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GdmLaunchEnvironment, gdm_launch_environment, G_TYPE_OBJECT) static GHashTable * build_launch_environment (GdmLaunchEnvironment *launch_environment, @@ -706,8 +704,6 @@ gdm_launch_environment_class_init (GdmLaunchEnvironmentClass *klass) object_class->set_property = gdm_launch_environment_set_property; object_class->finalize = gdm_launch_environment_finalize; - g_type_class_add_private (klass, sizeof (GdmLaunchEnvironmentPrivate)); - g_object_class_install_property (object_class, PROP_VERIFICATION_MODE, g_param_spec_enum ("verification-mode", @@ -863,7 +859,7 @@ static void gdm_launch_environment_init (GdmLaunchEnvironment *launch_environment) { - launch_environment->priv = GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE (launch_environment); + launch_environment->priv = gdm_launch_environment_get_instance_private (launch_environment); launch_environment->priv->command = NULL; launch_environment->priv->session = NULL; |