[gnome-software] proxy settings: Port to G_DECLARE_FINAL_TYPE macro



commit 1d410bee7241836a5577e3d2437d64bea8487654
Author: Kalev Lember <klember redhat com>
Date:   Mon Sep 7 17:43:16 2015 +0200

    proxy settings: Port to G_DECLARE_FINAL_TYPE macro

 src/gs-proxy-settings.c |    4 ----
 src/gs-proxy-settings.h |   11 ++---------
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/src/gs-proxy-settings.c b/src/gs-proxy-settings.c
index aa16e76..ea031a2 100644
--- a/src/gs-proxy-settings.c
+++ b/src/gs-proxy-settings.c
@@ -39,10 +39,6 @@ struct _GsProxySettings {
        GSettings       *settings_ftp;
 };
 
-struct _GsProxySettingsClass {
-       GObjectClass     parent_class;
-};
-
 G_DEFINE_TYPE (GsProxySettings, gs_proxy_settings, G_TYPE_OBJECT)
 
 static gchar *
diff --git a/src/gs-proxy-settings.h b/src/gs-proxy-settings.h
index e258252..b3be265 100644
--- a/src/gs-proxy-settings.h
+++ b/src/gs-proxy-settings.h
@@ -26,17 +26,10 @@
 
 G_BEGIN_DECLS
 
-#define GS_TYPE_PROXY_SETTINGS         (gs_proxy_settings_get_type ())
-#define GS_PROXY_SETTINGS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_PROXY_SETTINGS, 
GsProxySettings))
-#define GS_PROXY_SETTINGS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_PROXY_SETTINGS, 
GsProxySettingsClass))
-#define GS_IS_PROXY_SETTINGS(o)                (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_PROXY_SETTINGS))
-#define GS_IS_PROXY_SETTINGS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_PROXY_SETTINGS))
-#define GS_PROXY_SETTINGS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_PROXY_SETTINGS, 
GsProxySettingsClass))
+#define GS_TYPE_PROXY_SETTINGS (gs_proxy_settings_get_type ())
 
-typedef struct _GsProxySettings                GsProxySettings;
-typedef struct _GsProxySettingsClass   GsProxySettingsClass;
+G_DECLARE_FINAL_TYPE (GsProxySettings, gs_proxy_settings, GS, PROXY_SETTINGS, GObject)
 
-GType           gs_proxy_settings_get_type     (void);
 GsProxySettings        *gs_proxy_settings_new          (void);
 
 G_END_DECLS


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