diff options
| author | Wu Xiaotian <[email protected]> | 2019-07-01 15:52:13 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-08-02 23:28:31 +0200 |
| commit | ace9111b8f3ecdc3c1d94dae4350e12b5b48ec02 (patch) | |
| tree | f6d183cd2df8e710fd7c11f3221f89bad3055a7b /plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | |
| parent | 468d84f415c325e342b61fd102cd24202d37c1f3 (diff) | |
| download | mate-settings-daemon-ace9111b8f3ecdc3c1d94dae4350e12b5b48ec02.tar.bz2 mate-settings-daemon-ace9111b8f3ecdc3c1d94dae4350e12b5b48ec02.tar.xz | |
plugins a11y-keyboard: fix deprecated g_type_class_add_private
Diffstat (limited to 'plugins/a11y-keyboard/msd-a11y-keyboard-manager.c')
| -rw-r--r-- | plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c index 8d26108..0c6d3e6 100644 --- a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c +++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c @@ -54,8 +54,6 @@ #define CONFIG_SCHEMA "org.mate.accessibility-keyboard" #define NOTIFICATION_TIMEOUT 30 -#define MSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_A11Y_KEYBOARD_MANAGER, MsdA11yKeyboardManagerPrivate)) - struct MsdA11yKeyboardManagerPrivate { int xkbEventBase; @@ -80,7 +78,7 @@ static void msd_a11y_keyboard_manager_finalize (GObject *obje static void msd_a11y_keyboard_manager_ensure_status_icon (MsdA11yKeyboardManager *manager); static void set_server_from_settings (MsdA11yKeyboardManager *manager); -G_DEFINE_TYPE (MsdA11yKeyboardManager, msd_a11y_keyboard_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (MsdA11yKeyboardManager, msd_a11y_keyboard_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; @@ -1123,8 +1121,6 @@ msd_a11y_keyboard_manager_class_init (MsdA11yKeyboardManagerClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = msd_a11y_keyboard_manager_finalize; - - g_type_class_add_private (klass, sizeof (MsdA11yKeyboardManagerPrivate)); } static void @@ -1181,7 +1177,7 @@ msd_a11y_keyboard_manager_ensure_status_icon (MsdA11yKeyboardManager *manager) static void msd_a11y_keyboard_manager_init (MsdA11yKeyboardManager *manager) { - manager->priv = MSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE (manager); + manager->priv = msd_a11y_keyboard_manager_get_instance_private (manager); } static void |