[Xfce4-commits] [xfce/xfce4-settings] 01/01: Resolved g_type_class_add_private deprecations (GObject 2.58)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 050a58650b1079e6c34b1c1b21743c5072cd002b
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Oct 15 21:39:00 2018 -0400

    Resolved g_type_class_add_private deprecations (GObject 2.58)
---
 dialogs/keyboard-settings/xfce-keyboard-settings.c | 10 ++--------
 xfsettingsd/clipboard-manager.c                    |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 64e6449..08eba7a 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -50,10 +50,6 @@
 
 
 
-#define XFCE_KEYBOARD_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFCE_TYPE_KEYBOARD_SETTINGS, XfceKeyboardSettingsPrivate))
-
-
-
 enum
 {
   COMMAND_COLUMN,
@@ -229,7 +225,7 @@ struct _XfceKeyboardShortcutInfo
 
 
 
-G_DEFINE_TYPE (XfceKeyboardSettings, xfce_keyboard_settings, GTK_TYPE_BUILDER)
+G_DEFINE_TYPE_WITH_PRIVATE (XfceKeyboardSettings, xfce_keyboard_settings, GTK_TYPE_BUILDER)
 
 
 
@@ -238,8 +234,6 @@ xfce_keyboard_settings_class_init (XfceKeyboardSettingsClass *klass)
 {
   GObjectClass *gobject_class;
 
-  g_type_class_add_private (klass, sizeof (XfceKeyboardSettingsPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->constructed = xfce_keyboard_settings_constructed;
   gobject_class->finalize = xfce_keyboard_settings_finalize;
@@ -252,7 +246,7 @@ xfce_keyboard_settings_init (XfceKeyboardSettings *settings)
 {
   GError *error = NULL;
 
-  settings->priv = XFCE_KEYBOARD_SETTINGS_GET_PRIVATE (settings);
+  settings->priv = xfce_keyboard_settings_get_instance_private (settings);
 
   settings->priv->keyboards_channel = xfconf_channel_new ("keyboards");
   settings->priv->keyboard_layout_channel = xfconf_channel_new ("keyboard-layout");
diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
index b65d633..2218361 100644
--- a/xfsettingsd/clipboard-manager.c
+++ b/xfsettingsd/clipboard-manager.c
@@ -99,7 +99,7 @@ static Atom XA_TIMESTAMP = None;
 
 
 
-G_DEFINE_TYPE (GsdClipboardManager, gsd_clipboard_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GsdClipboardManager, gsd_clipboard_manager, G_TYPE_OBJECT)
 
 
 
@@ -109,8 +109,6 @@ gsd_clipboard_manager_class_init (GsdClipboardManagerClass *klass)
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
         object_class->finalize = gsd_clipboard_manager_finalize;
-
-        g_type_class_add_private (klass, sizeof (GsdClipboardManagerPrivate));
 }
 
 static void

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.