1 files changed, 3 insertions, 29 deletions
diff --git a/mate-session/gsm-dbus-client.h b/mate-session/gsm-dbus-client.h
index 4b9dc7a..a1007cc 100644
--- a/mate-session/gsm-dbus-client.h
+++ b/mate-session/gsm-dbus-client.h
@@ -23,32 +23,10 @@
 
 #include "gsm-client.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define GSM_TYPE_DBUS_CLIENT            (gsm_dbus_client_get_type ())
-#define GSM_DBUS_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSM_TYPE_DBUS_CLIENT, GsmDBusClient))
-#define GSM_DBUS_CLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSM_TYPE_DBUS_CLIENT, GsmDBusClientClass))
-#define GSM_IS_DBUS_CLIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSM_TYPE_DBUS_CLIENT))
-#define GSM_IS_DBUS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSM_TYPE_DBUS_CLIENT))
-#define GSM_DBUS_CLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSM_TYPE_DBUS_CLIENT, GsmDBusClientClass))
-
-typedef struct _GsmDBusClient        GsmDBusClient;
-typedef struct _GsmDBusClientClass   GsmDBusClientClass;
-
-typedef struct GsmDBusClientPrivate  GsmDBusClientPrivate;
-
-struct _GsmDBusClient
-{
-        GsmClient             parent;
-        GsmDBusClientPrivate *priv;
-};
-
-struct _GsmDBusClientClass
-{
-        GsmClientClass parent_class;
-};
+G_DECLARE_FINAL_TYPE (GsmDBusClient, gsm_dbus_client, GSM, DBUS_CLIENT, GsmClient)
 
 typedef enum
 {
@@ -64,14 +42,10 @@ GType          gsm_dbus_client_error_get_type     (void);
 
 GQuark         gsm_dbus_client_error_quark        (void);
 
-GType          gsm_dbus_client_get_type           (void) G_GNUC_CONST;
-
 GsmClient *    gsm_dbus_client_new                (const char     *startup_id,
                                                    const char     *bus_name);
 const char *   gsm_dbus_client_get_bus_name       (GsmDBusClient  *client);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __GSM_DBUS_CLIENT_H__ */