Skip to content

Commit f4bb742

Browse files
sc0wlukefromdc
authored andcommitted
eggsmclient: avoid deprecated 'g_type_class_add_private'
1 parent 29536a9 commit f4bb742

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/eggsmclient.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ struct _EggSMClientPrivate
4646
GKeyFile *state_file;
4747
};
4848

49-
#define EGG_SM_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EGG_TYPE_SM_CLIENT, EggSMClientPrivate))
50-
51-
G_DEFINE_TYPE (EggSMClient, egg_sm_client, G_TYPE_OBJECT)
49+
G_DEFINE_TYPE_WITH_PRIVATE (EggSMClient, egg_sm_client, G_TYPE_OBJECT)
5250

5351
static EggSMClient *global_client;
5452
static EggSMClientMode global_client_mode = EGG_SM_CLIENT_MODE_NORMAL;
@@ -64,8 +62,6 @@ egg_sm_client_class_init (EggSMClientClass *klass)
6462
{
6563
GObjectClass *object_class = G_OBJECT_CLASS (klass);
6664

67-
g_type_class_add_private (klass, sizeof (EggSMClientPrivate));
68-
6965
/**
7066
* EggSMClient::save_state:
7167
* @client: the client
@@ -387,7 +383,7 @@ egg_sm_client_is_resumed (EggSMClient *client)
387383
GKeyFile *
388384
egg_sm_client_get_state_file (EggSMClient *client)
389385
{
390-
EggSMClientPrivate *priv = EGG_SM_CLIENT_GET_PRIVATE (client);
386+
EggSMClientPrivate *priv = egg_sm_client_get_instance_private (client);
391387
char *state_file_path;
392388
GError *err = NULL;
393389

0 commit comments

Comments
 (0)