summaryrefslogtreecommitdiff
path: root/settings
diff options
context:
space:
mode:
authorAndre Miranda <andreldm@xfce.org>2019-04-14 17:09:45 -0300
committerAndre Miranda <andreldm@xfce.org>2019-04-14 17:09:45 -0300
commit8c356dd9591ee6189c2df1831939b1e68d0868cb (patch)
treee5a0bfe42fb049f8dec6d26d7489a77183585411 /settings
parent34fe4403faaf6fe0a9de14153e32d5d3c92b919a (diff)
downloadixfce4-power-manager-8c356dd9591ee6189c2df1831939b1e68d0868cb.tar.gz
Fix g_type_class_add_private is deprecated
Diffstat (limited to 'settings')
-rw-r--r--settings/xfpm-settings-app.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/settings/xfpm-settings-app.c b/settings/xfpm-settings-app.c
index 388405fb..f1b4fa45 100644
--- a/settings/xfpm-settings-app.c
+++ b/settings/xfpm-settings-app.c
@@ -63,11 +63,9 @@ static void activate_quit (GSimpleAction *action,
GVariant *parameter,
gpointer data);
-G_DEFINE_TYPE(XfpmSettingsApp, xfpm_settings_app, GTK_TYPE_APPLICATION);
+G_DEFINE_TYPE_WITH_PRIVATE(XfpmSettingsApp, xfpm_settings_app, GTK_TYPE_APPLICATION);
-#define XFPM_SETTINGS_APP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), XFPM_TYPE_SETTINGS_APP, XfpmSettingsAppPrivate))
-
static void
xfpm_settings_app_init (XfpmSettingsApp *app)
@@ -118,7 +116,7 @@ xfpm_settings_app_activate (GApplication *app)
static void
xfpm_settings_app_launch (GApplication *app)
{
- XfpmSettingsAppPrivate *priv = XFPM_SETTINGS_APP_GET_PRIVATE (app);
+ XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (XFPM_SETTINGS_APP (app));
XfpmPowerManager *manager;
XfconfChannel *channel;
@@ -276,7 +274,7 @@ activate_socket (GSimpleAction *action,
gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
- XfpmSettingsAppPrivate *priv = XFPM_SETTINGS_APP_GET_PRIVATE (app);
+ XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (app);
TRACE ("entering");
@@ -291,7 +289,7 @@ activate_device (GSimpleAction *action,
gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
- XfpmSettingsAppPrivate *priv = XFPM_SETTINGS_APP_GET_PRIVATE (app);
+ XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (app);
TRACE ("entering");
@@ -306,7 +304,7 @@ activate_debug (GSimpleAction *action,
gpointer data)
{
XfpmSettingsApp *app = XFPM_SETTINGS_APP (data);
- XfpmSettingsAppPrivate *priv = XFPM_SETTINGS_APP_GET_PRIVATE (app);
+ XfpmSettingsAppPrivate *priv = xfpm_settings_app_get_instance_private (app);
TRACE ("entering");
@@ -418,8 +416,6 @@ xfpm_settings_app_class_init (XfpmSettingsAppClass *class)
gapplication_class->handle_local_options = xfpm_settings_app_local_options;
gapplication_class->startup = xfpm_settings_app_startup;
gapplication_class->activate = xfpm_settings_app_activate;
-
- g_type_class_add_private (class, sizeof (XfpmSettingsAppPrivate));
}
XfpmSettingsApp *