[gdm/wip/nielsdg/add-private-deprecated: 8/20] local-display: use G_DECLARE_FINAL_TYPE

[Niels De Graef <nielsdg src gnome org>]

commit 8e7237f34b76eec6789c09660d3c8d15230a27f7
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sun Dec 23 14:38:44 2018 +0100

    local-display: use G_DECLARE_FINAL_TYPE

 daemon/gdm-local-display.c | 15 +++++----------
 daemon/gdm-local-display.h | 21 +--------------------
 2 files changed, 6 insertions(+), 30 deletions(-)
---
diff --git a/daemon/gdm-local-display.c b/daemon/gdm-local-display.c
index 3b682262..69945d95 100644
--- a/daemon/gdm-local-display.c
+++ b/daemon/gdm-local-display.c
@@ -44,10 +44,9 @@
 #include "gdm-settings-direct.h"
 #include "gdm-settings-keys.h"
 
-#define GDM_LOCAL_DISPLAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LOCAL_DISPLAY, 
GdmLocalDisplayPrivate))
-
-struct GdmLocalDisplayPrivate
+struct _GdmLocalDisplay
 {
+        GdmDisplay           parent;
         GdmDBusLocalDisplay *skeleton;
 };
 
@@ -67,10 +66,10 @@ gdm_local_display_constructor (GType                  type,
                                                                                                    
n_construct_properties,
                                                                                                    
construct_properties));
 
-        display->priv->skeleton = GDM_DBUS_LOCAL_DISPLAY (gdm_dbus_local_display_skeleton_new ());
+        display->skeleton = GDM_DBUS_LOCAL_DISPLAY (gdm_dbus_local_display_skeleton_new ());
 
         g_dbus_object_skeleton_add_interface (gdm_display_get_object_skeleton (GDM_DISPLAY (display)),
-                                              G_DBUS_INTERFACE_SKELETON (display->priv->skeleton));
+                                              G_DBUS_INTERFACE_SKELETON (display->skeleton));
 
         return G_OBJECT (display);
 }
@@ -80,7 +79,7 @@ gdm_local_display_finalize (GObject *object)
 {
         GdmLocalDisplay *display = GDM_LOCAL_DISPLAY (object);
 
-        g_clear_object (&display->priv->skeleton);
+        g_clear_object (&display->skeleton);
 
         G_OBJECT_CLASS (gdm_local_display_parent_class)->finalize (object);
 }
@@ -149,15 +148,11 @@ gdm_local_display_class_init (GdmLocalDisplayClass *klass)
         object_class->finalize = gdm_local_display_finalize;
 
         display_class->prepare = gdm_local_display_prepare;
-
-        g_type_class_add_private (klass, sizeof (GdmLocalDisplayPrivate));
 }
 
 static void
 gdm_local_display_init (GdmLocalDisplay *local_display)
 {
-
-        local_display->priv = GDM_LOCAL_DISPLAY_GET_PRIVATE (local_display);
 }
 
 GdmDisplay *
diff --git a/daemon/gdm-local-display.h b/daemon/gdm-local-display.h
index dec22f5b..5bd7f923 100644
--- a/daemon/gdm-local-display.h
+++ b/daemon/gdm-local-display.h
@@ -28,27 +28,8 @@
 G_BEGIN_DECLS
 
 #define GDM_TYPE_LOCAL_DISPLAY         (gdm_local_display_get_type ())
-#define GDM_LOCAL_DISPLAY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_LOCAL_DISPLAY, 
GdmLocalDisplay))
-#define GDM_LOCAL_DISPLAY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_LOCAL_DISPLAY, 
GdmLocalDisplayClass))
-#define GDM_IS_LOCAL_DISPLAY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_LOCAL_DISPLAY))
-#define GDM_IS_LOCAL_DISPLAY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_LOCAL_DISPLAY))
-#define GDM_LOCAL_DISPLAY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_LOCAL_DISPLAY, 
GdmLocalDisplayClass))
+G_DECLARE_FINAL_TYPE (GdmLocalDisplay, gdm_local_display, GDM, LOCAL_DISPLAY, GdmDisplay)
 
-typedef struct GdmLocalDisplayPrivate GdmLocalDisplayPrivate;
-
-typedef struct
-{
-        GdmDisplay               parent;
-        GdmLocalDisplayPrivate *priv;
-} GdmLocalDisplay;
-
-typedef struct
-{
-        GdmDisplayClass   parent_class;
-
-} GdmLocalDisplayClass;
-
-GType               gdm_local_display_get_type                (void);
 GdmDisplay *        gdm_local_display_new                     (void);