[gdm: 6/7] gdm-xdmcp-chooser-display: Use G_DECLARE_FINAL_TYPE




commit d75e5d7ed8a0d807650e764bdca86b7f86c91864
Author: Alessandro Bono <alessandro bono369 gmail com>
Date:   Tue Aug 30 18:29:53 2022 +0200

    gdm-xdmcp-chooser-display: Use G_DECLARE_FINAL_TYPE

 daemon/gdm-xdmcp-chooser-display.c |  8 +++++++-
 daemon/gdm-xdmcp-chooser-display.h | 26 ++------------------------
 2 files changed, 9 insertions(+), 25 deletions(-)
---
diff --git a/daemon/gdm-xdmcp-chooser-display.c b/daemon/gdm-xdmcp-chooser-display.c
index d593cb448..58b0d04aa 100644
--- a/daemon/gdm-xdmcp-chooser-display.c
+++ b/daemon/gdm-xdmcp-chooser-display.c
@@ -42,6 +42,12 @@
 #include "gdm-common.h"
 #include "gdm-address.h"
 
+
+struct _GdmXdmcpChooserDisplay
+{
+        GdmXdmcpDisplay parent;
+};
+
 enum {
         HOSTNAME_SELECTED,
         LAST_SIGNAL
@@ -76,7 +82,7 @@ gdm_xdmcp_chooser_display_class_init (GdmXdmcpChooserDisplayClass *klass)
                 g_signal_new ("hostname-selected",
                               G_OBJECT_CLASS_TYPE (object_class),
                               G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (GdmXdmcpChooserDisplayClass, hostname_selected),
+                              0,
                               NULL,
                               NULL,
                               g_cclosure_marshal_VOID__STRING,
diff --git a/daemon/gdm-xdmcp-chooser-display.h b/daemon/gdm-xdmcp-chooser-display.h
index 7890afa53..2c24a196c 100644
--- a/daemon/gdm-xdmcp-chooser-display.h
+++ b/daemon/gdm-xdmcp-chooser-display.h
@@ -31,30 +31,8 @@
 
 G_BEGIN_DECLS
 
-#define GDM_TYPE_XDMCP_CHOOSER_DISPLAY         (gdm_xdmcp_chooser_display_get_type ())
-#define GDM_XDMCP_CHOOSER_DISPLAY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), 
GDM_TYPE_XDMCP_CHOOSER_DISPLAY, GdmXdmcpChooserDisplay))
-#define GDM_XDMCP_CHOOSER_DISPLAY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_XDMCP_CHOOSER_DISPLAY, 
GdmXdmcpChooserDisplayClass))
-#define GDM_IS_XDMCP_CHOOSER_DISPLAY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), 
GDM_TYPE_XDMCP_CHOOSER_DISPLAY))
-#define GDM_IS_XDMCP_CHOOSER_DISPLAY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), 
GDM_TYPE_XDMCP_CHOOSER_DISPLAY))
-#define GDM_XDMCP_CHOOSER_DISPLAY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), 
GDM_TYPE_XDMCP_CHOOSER_DISPLAY, GdmXdmcpChooserDisplayClass))
-
-typedef struct GdmXdmcpChooserDisplayPrivate GdmXdmcpChooserDisplayPrivate;
-
-typedef struct
-{
-        GdmXdmcpDisplay                parent;
-} GdmXdmcpChooserDisplay;
-
-typedef struct
-{
-        GdmXdmcpDisplayClass   parent_class;
-
-        void (* hostname_selected)          (GdmXdmcpChooserDisplay *display,
-                                             const char             *hostname);
-} GdmXdmcpChooserDisplayClass;
-
-GType                     gdm_xdmcp_chooser_display_get_type                 (void);
-
+#define GDM_TYPE_XDMCP_CHOOSER_DISPLAY (gdm_xdmcp_chooser_display_get_type ())
+G_DECLARE_FINAL_TYPE (GdmXdmcpChooserDisplay, gdm_xdmcp_chooser_display, GDM, XDMCP_CHOOSER_DISPLAY, 
GdmXdmcpDisplay)
 
 GdmDisplay *              gdm_xdmcp_chooser_display_new                      (const char              
*hostname,
                                                                               int                      
number,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]