diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-26 09:17:36 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-26 09:17:36 +0200 |
| commit | 7379a3dc11eec20b947b82cc096b58a0cc0d7372 (patch) | |
| tree | b5a17179679b73838ebebee627da446bfdbfe98f /src/service.c | |
| parent | 9ebe29d4875538010fca79a0f68e5ab12586877a (diff) | |
| parent | cd78667f5baa22ff64eec87dcef6bafd868c070c (diff) | |
| download | ayatana-indicator-session-7379a3dc11eec20b947b82cc096b58a0cc0d7372.tar.gz ayatana-indicator-session-7379a3dc11eec20b947b82cc096b58a0cc0d7372.tar.bz2 ayatana-indicator-session-7379a3dc11eec20b947b82cc096b58a0cc0d7372.zip | |
Merge branch 'tari01-pr/deprecations-and-warnings'
Attributes GH PR #14: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/14
Diffstat (limited to 'src/service.c')
| -rw-r--r-- | src/service.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/service.c b/src/service.c index 4f547b3..c364864 100644 --- a/src/service.c +++ b/src/service.c @@ -33,10 +33,6 @@ #define ICON_INFO "system-devices-panel-information" #define ICON_ALERT "system-devices-panel-alert" -G_DEFINE_TYPE (IndicatorSessionService, - indicator_session_service, - G_TYPE_OBJECT) - /* signals enum */ enum { @@ -117,6 +113,8 @@ struct _IndicatorSessionServicePrivate typedef IndicatorSessionServicePrivate priv_t; +G_DEFINE_TYPE_WITH_PRIVATE(IndicatorSessionService, indicator_session_service, G_TYPE_OBJECT) + static const char * get_current_real_name (IndicatorSessionService * self); /*** @@ -1175,9 +1173,7 @@ indicator_session_service_init (IndicatorSessionService * self) GIcon * icon; /* init our priv pointer */ - p = G_TYPE_INSTANCE_GET_PRIVATE (self, - INDICATOR_TYPE_SESSION_SERVICE, - IndicatorSessionServicePrivate); + p = indicator_session_service_get_instance_private (self); p->indicator_settings = g_settings_new ("org.ayatana.indicator.session"); if (is_mate()) p->keybinding_settings = g_settings_new ("org.mate.SettingsDaemon.plugins.media-keys"); @@ -1376,8 +1372,6 @@ indicator_session_service_class_init (IndicatorSessionServiceClass * klass) object_class->get_property = my_get_property; object_class->set_property = my_set_property; - g_type_class_add_private (klass, sizeof (IndicatorSessionServicePrivate)); - signals[NAME_LOST] = g_signal_new (INDICATOR_SESSION_SERVICE_SIGNAL_NAME_LOST, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, |