GNOME.org
 

[gnome-control-center/wip/rancell/g-define-type] code style

commit dca1a155673790c1e612b0f60ac46a2431cc525f
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Sep 5 12:47:42 2017 +1200

    code style

 panels/background/bg-colors-source.h               |    3 +--
 panels/background/bg-pictures-source.h             |    3 +--
 panels/background/bg-source.h                      |    3 +--
 panels/background/bg-wallpapers-source.h           |    3 +--
 panels/background/cc-background-chooser-dialog.h   |    1 -
 panels/background/cc-background-grilo-miner.h      |    3 +--
 panels/background/cc-background-item.h             |    3 +--
 panels/background/cc-background-panel.h            |    3 +--
 panels/background/cc-background-xml.h              |    3 +--
 panels/bluetooth/cc-bluetooth-panel.h              |    3 +--
 panels/color/cc-color-calibrate.h                  |    3 +--
 panels/color/cc-color-cell-renderer-text.h         |    3 +--
 panels/color/cc-color-device.h                     |    3 +--
 panels/color/cc-color-panel.h                      |    3 +--
 panels/color/cc-color-profile.h                    |    3 +--
 panels/datetime/cc-datetime-panel.h                |    3 +--
 panels/datetime/cc-timezone-map.h                  |    3 +--
 panels/display/cc-display-panel.h                  |    3 +--
 panels/display/scrollarea.h                        |    3 +--
 panels/info/cc-info-default-apps-panel.h           |    1 -
 panels/info/cc-info-overview-panel.h               |    1 -
 panels/info/cc-info-panel.h                        |    3 +--
 panels/info/cc-info-removable-media-panel.h        |    1 -
 panels/mouse/cc-mouse-panel.h                      |    3 +--
 panels/mouse/gnome-mouse-properties.h              |    3 +--
 panels/mouse/gnome-mouse-test.h                    |    3 +--
 panels/power/cc-power-panel.h                      |    3 +--
 panels/printers/cc-printers-panel.h                |    3 +--
 panels/printers/pp-cups.h                          |    3 +--
 panels/printers/pp-details-dialog.h                |    3 +--
 panels/printers/pp-host.h                          |    3 +--
 panels/printers/pp-ipp-option-widget.h             |    3 +--
 panels/printers/pp-maintenance-command.h           |    3 +--
 panels/printers/pp-new-printer-dialog.h            |    3 +--
 panels/printers/pp-new-printer.h                   |    3 +--
 panels/printers/pp-ppd-option-widget.h             |    3 +--
 panels/printers/pp-print-device.h                  |    3 +--
 panels/printers/pp-printer-entry.h                 |    3 +--
 panels/printers/pp-printer.h                       |    1 -
 panels/printers/pp-samba.h                         |    3 +--
 panels/privacy/cc-privacy-panel.h                  |    3 +--
 panels/region/cc-region-panel.h                    |    3 +--
 panels/search/cc-search-locations-dialog.h         |    3 +--
 panels/search/cc-search-panel.h                    |    3 +--
 panels/sharing/cc-sharing-networks.h               |    3 +--
 panels/sharing/cc-sharing-panel.h                  |    3 +--
 panels/sharing/cc-sharing-switch.h                 |    3 +--
 panels/sound/cc-sound-panel.h                      |    3 +--
 panels/sound/gvc-balance-bar.h                     |    3 +--
 panels/sound/gvc-channel-bar.h                     |    3 +--
 panels/sound/gvc-combo-box.h                       |    3 +--
 panels/sound/gvc-level-bar.h                       |    3 +--
 panels/sound/gvc-mixer-dialog.h                    |    3 +--
 panels/sound/gvc-sound-theme-chooser.h             |    3 +--
 panels/sound/gvc-speaker-test.h                    |    3 +--
 panels/universal-access/cc-ua-panel.h              |    3 +--
 panels/universal-access/zoom-options.h             |    1 -
 panels/user-accounts/cc-crop-area.h                |    3 +--
 panels/user-accounts/um-account-dialog.h           |    3 +--
 panels/user-accounts/um-carousel.h                 |    4 +---
 panels/user-accounts/um-cell-renderer-user-image.h |    3 +--
 panels/user-accounts/um-realm-manager.h            |    3 +--
 panels/user-accounts/um-user-image.h               |    3 +--
 panels/user-accounts/um-user-panel.h               |    3 +--
 panels/wacom/calibrator/cc-clock-actor.h           |    3 +--
 panels/wacom/calibrator/cc-target-actor.h          |    3 +--
 panels/wacom/cc-drawing-area.h                     |    3 +--
 panels/wacom/cc-tablet-tool-map.h                  |    1 -
 panels/wacom/cc-wacom-button-row.h                 |    3 +--
 panels/wacom/cc-wacom-device.h                     |    1 -
 panels/wacom/cc-wacom-mapping-panel.h              |    3 +--
 panels/wacom/cc-wacom-nav-button.h                 |    3 +--
 panels/wacom/cc-wacom-page.h                       |    3 +--
 panels/wacom/cc-wacom-panel.h                      |    3 +--
 panels/wacom/cc-wacom-stylus-page.h                |    3 +--
 panels/wacom/cc-wacom-tool.h                       |    1 -
 panels/wacom/gsd-wacom-key-shortcut-button.h       |    3 +--
 77 files changed, 68 insertions(+), 146 deletions(-)
---
diff --git a/panels/background/bg-colors-source.h b/panels/background/bg-colors-source.h
index f2b989e..de1d93c 100644
--- a/panels/background/bg-colors-source.h
+++ b/panels/background/bg-colors-source.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define BG_TYPE_COLORS_SOURCE bg_colors_source_get_type()
-
+#define BG_TYPE_COLORS_SOURCE (bg_colors_source_get_type ())
 G_DECLARE_FINAL_TYPE (BgColorsSource, bg_colors_source, BG, COLORS_SOURCE, BgSource)
 
 BgColorsSource *bg_colors_source_new (GtkWindow *window);
diff --git a/panels/background/bg-pictures-source.h b/panels/background/bg-pictures-source.h
index 89c22ce..476ecb7 100644
--- a/panels/background/bg-pictures-source.h
+++ b/panels/background/bg-pictures-source.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define BG_TYPE_PICTURES_SOURCE bg_pictures_source_get_type()
-
+#define BG_TYPE_PICTURES_SOURCE (bg_pictures_source_get_type ())
 G_DECLARE_FINAL_TYPE (BgPicturesSource, bg_pictures_source, BG, PICTURES_SOURCE, BgSource)
 
 BgPicturesSource *bg_pictures_source_new            (GtkWindow *window);
diff --git a/panels/background/bg-source.h b/panels/background/bg-source.h
index 4924416..c6f9b40 100644
--- a/panels/background/bg-source.h
+++ b/panels/background/bg-source.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define BG_TYPE_SOURCE bg_source_get_type()
-
+#define BG_TYPE_SOURCE (bg_source_get_type ())
 G_DECLARE_DERIVABLE_TYPE (BgSource, bg_source, BG, SOURCE, GObject)
 
 struct _BgSourceClass
diff --git a/panels/background/bg-wallpapers-source.h b/panels/background/bg-wallpapers-source.h
index 93104f1..129c249 100644
--- a/panels/background/bg-wallpapers-source.h
+++ b/panels/background/bg-wallpapers-source.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define BG_TYPE_WALLPAPERS_SOURCE bg_wallpapers_source_get_type()
-
+#define BG_TYPE_WALLPAPERS_SOURCE (bg_wallpapers_source_get_type ())
 G_DECLARE_FINAL_TYPE (BgWallpapersSource, bg_wallpapers_source, BG, WALLPAPERS_SOURCE, BgSource)
 
 BgWallpapersSource *bg_wallpapers_source_new (GtkWindow *window);
diff --git a/panels/background/cc-background-chooser-dialog.h 
b/panels/background/cc-background-chooser-dialog.h
index fffeea2..82f789d 100644
--- a/panels/background/cc-background-chooser-dialog.h
+++ b/panels/background/cc-background-chooser-dialog.h
@@ -27,7 +27,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_BACKGROUND_CHOOSER_DIALOG (cc_background_chooser_dialog_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcBackgroundChooserDialog, cc_background_chooser_dialog, CC, 
BACKGROUND_CHOOSER_DIALOG, GtkDialog)
 
 GtkWidget *            cc_background_chooser_dialog_new                    (GtkWindow *transient_for);
diff --git a/panels/background/cc-background-grilo-miner.h b/panels/background/cc-background-grilo-miner.h
index c05a837..647d307 100644
--- a/panels/background/cc-background-grilo-miner.h
+++ b/panels/background/cc-background-grilo-miner.h
@@ -23,8 +23,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_BACKGROUND_GRILO_MINER cc_background_grilo_miner_get_type()
-
+#define CC_TYPE_BACKGROUND_GRILO_MINER (cc_background_grilo_miner_get_type ())
 G_DECLARE_FINAL_TYPE (CcBackgroundGriloMiner, cc_background_grilo_miner, CC, BACKGROUND_GRILO_MINER, 
GObject);
 
 CcBackgroundGriloMiner   *cc_background_grilo_miner_new            (void);
diff --git a/panels/background/cc-background-item.h b/panels/background/cc-background-item.h
index 360fe74..b97c7a0 100644
--- a/panels/background/cc-background-item.h
+++ b/panels/background/cc-background-item.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_BACKGROUND_ITEM         (cc_background_item_get_type ())
-
+#define CC_TYPE_BACKGROUND_ITEM (cc_background_item_get_type ())
 G_DECLARE_FINAL_TYPE (CcBackgroundItem, cc_background_item, CC, BACKGROUND_ITEM, GObject)
 
 typedef enum {
diff --git a/panels/background/cc-background-panel.h b/panels/background/cc-background-panel.h
index a4469c6..42ea8c2 100644
--- a/panels/background/cc-background-panel.h
+++ b/panels/background/cc-background-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_BACKGROUND_PANEL cc_background_panel_get_type()
-
+#define CC_TYPE_BACKGROUND_PANEL (cc_background_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcBackgroundPanel, cc_background_panel, CC, BACKGROUND_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/background/cc-background-xml.h b/panels/background/cc-background-xml.h
index 0253fab..bf0687f 100644
--- a/panels/background/cc-background-xml.h
+++ b/panels/background/cc-background-xml.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_BACKGROUND_XML         (cc_background_xml_get_type ())
-
+#define CC_TYPE_BACKGROUND_XML (cc_background_xml_get_type ())
 G_DECLARE_FINAL_TYPE (CcBackgroundXml, cc_background_xml, CC, BACKGROUND_XML, GObject)
 
 CcBackgroundXml *cc_background_xml_new (void);
diff --git a/panels/bluetooth/cc-bluetooth-panel.h b/panels/bluetooth/cc-bluetooth-panel.h
index 02f5c5c..c4cc468 100644
--- a/panels/bluetooth/cc-bluetooth-panel.h
+++ b/panels/bluetooth/cc-bluetooth-panel.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_BLUETOOTH_PANEL cc_bluetooth_panel_get_type()
-
+#define CC_TYPE_BLUETOOTH_PANEL (cc_bluetooth_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcBluetoothPanel, cc_bluetooth_panel, CC, BLUETOOTH_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/color/cc-color-calibrate.h b/panels/color/cc-color-calibrate.h
index 4049b5a..4fb6d37 100644
--- a/panels/color/cc-color-calibrate.h
+++ b/panels/color/cc-color-calibrate.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_COLOR_CALIBRATE         (cc_color_calibrate_get_type ())
-
+#define CC_TYPE_COLOR_CALIBRATE (cc_color_calibrate_get_type ())
 G_DECLARE_FINAL_TYPE (CcColorCalibrate, cc_color_calibrate, CC, COLOR_CALIBRATE, GObject)
 
 CcColorCalibrate *cc_color_calibrate_new    (void);
diff --git a/panels/color/cc-color-cell-renderer-text.h b/panels/color/cc-color-cell-renderer-text.h
index 6b0e005..f309361 100644
--- a/panels/color/cc-color-cell-renderer-text.h
+++ b/panels/color/cc-color-cell-renderer-text.h
@@ -24,8 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#define CC_COLOR_TYPE_CELL_RENDERER_TEXT (cc_color_cell_renderer_text_get_type())
-
+#define CC_COLOR_TYPE_CELL_RENDERER_TEXT (cc_color_cell_renderer_text_get_type ())
 G_DECLARE_FINAL_TYPE (CcColorCellRendererText, cc_color_cell_renderer_text, CC_COLOR, CELL_RENDERER_TEXT, 
GtkCellRendererText)
 
 GtkCellRenderer *cc_color_cell_renderer_text_new (void);
diff --git a/panels/color/cc-color-device.h b/panels/color/cc-color-device.h
index 8c1cf1d..736dcbd 100644
--- a/panels/color/cc-color-device.h
+++ b/panels/color/cc-color-device.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_COLOR_DEVICE (cc_color_device_get_type())
-
+#define CC_TYPE_COLOR_DEVICE (cc_color_device_get_type ())
 G_DECLARE_FINAL_TYPE (CcColorDevice, cc_color_device, CC, COLOR_DEVICE, GtkListBoxRow)
 
 GtkWidget   *cc_color_device_new           (CdDevice       *device);
diff --git a/panels/color/cc-color-panel.h b/panels/color/cc-color-panel.h
index 87c8883..cd5f7a6 100644
--- a/panels/color/cc-color-panel.h
+++ b/panels/color/cc-color-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_COLOR_PANEL cc_color_panel_get_type()
-
+#define CC_TYPE_COLOR_PANEL (cc_color_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcColorPanel, cc_color_panel, CC, COLOR_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/color/cc-color-profile.h b/panels/color/cc-color-profile.h
index b8f79f6..4806511 100644
--- a/panels/color/cc-color-profile.h
+++ b/panels/color/cc-color-profile.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_COLOR_PROFILE (cc_color_profile_get_type())
-
+#define CC_TYPE_COLOR_PROFILE (cc_color_profile_get_type ())
 G_DECLARE_FINAL_TYPE (CcColorProfile, cc_color_profile, CC, COLOR_PROFILE, GtkListBoxRow)
 
 GtkWidget   *cc_color_profile_new              (CdDevice        *device,
diff --git a/panels/datetime/cc-datetime-panel.h b/panels/datetime/cc-datetime-panel.h
index 2b3f407..29c0498 100644
--- a/panels/datetime/cc-datetime-panel.h
+++ b/panels/datetime/cc-datetime-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_DATE_TIME_PANEL cc_date_time_panel_get_type()
-
+#define CC_TYPE_DATE_TIME_PANEL (cc_date_time_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcDateTimePanel, cc_date_time_panel, CC, DATE_TIME_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/datetime/cc-timezone-map.h b/panels/datetime/cc-timezone-map.h
index 4688774..bf6cbc2 100644
--- a/panels/datetime/cc-timezone-map.h
+++ b/panels/datetime/cc-timezone-map.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_TIMEZONE_MAP cc_timezone_map_get_type()
-
+#define CC_TYPE_TIMEZONE_MAP (cc_timezone_map_get_type ())
 G_DECLARE_FINAL_TYPE (CcTimezoneMap, cc_timezone_map, CC, TIMEZONE_MAP, GtkWidget)
 
 CcTimezoneMap *cc_timezone_map_new (void);
diff --git a/panels/display/cc-display-panel.h b/panels/display/cc-display-panel.h
index d521fef..a6b932b 100644
--- a/panels/display/cc-display-panel.h
+++ b/panels/display/cc-display-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_DISPLAY_PANEL cc_display_panel_get_type()
-
+#define CC_TYPE_DISPLAY_PANEL (cc_display_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcDisplayPanel, cc_display_panel, CC, DISPLAY_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/display/scrollarea.h b/panels/display/scrollarea.h
index 1422024..8ced6d4 100644
--- a/panels/display/scrollarea.h
+++ b/panels/display/scrollarea.h
@@ -22,8 +22,7 @@
 
 G_BEGIN_DECLS
 
-#define FOO_TYPE_SCROLL_AREA foo_scroll_area_get_type ()
-
+#define FOO_TYPE_SCROLL_AREA (foo_scroll_area_get_type ())
 G_DECLARE_FINAL_TYPE (FooScrollArea, foo_scroll_area, FOO, SCROLL_AREA, GtkContainer)
 
 typedef enum
diff --git a/panels/info/cc-info-default-apps-panel.h b/panels/info/cc-info-default-apps-panel.h
index 22fccd8..7fb1d72 100644
--- a/panels/info/cc-info-default-apps-panel.h
+++ b/panels/info/cc-info-default-apps-panel.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_INFO_DEFAULT_APPS_PANEL (cc_info_default_apps_panel_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcInfoDefaultAppsPanel, cc_info_default_apps_panel, CC, INFO_DEFAULT_APPS_PANEL, 
CcPanel)
 
 GtkWidget *cc_info_default_apps_panel_new (void);
diff --git a/panels/info/cc-info-overview-panel.h b/panels/info/cc-info-overview-panel.h
index d9e4ff8..d81fe58 100644
--- a/panels/info/cc-info-overview-panel.h
+++ b/panels/info/cc-info-overview-panel.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_INFO_OVERVIEW_PANEL (cc_info_overview_panel_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcInfoOverviewPanel, cc_info_overview_panel, CC, INFO_OVERVIEW_PANEL, CcPanel)
 
 GtkWidget *cc_info_overview_panel_new (void);
diff --git a/panels/info/cc-info-panel.h b/panels/info/cc-info-panel.h
index d94b6e1..48863f5 100644
--- a/panels/info/cc-info-panel.h
+++ b/panels/info/cc-info-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_INFO_PANEL cc_info_panel_get_type()
-
+#define CC_TYPE_INFO_PANEL (cc_info_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcInfoPanel, cc_info_panel, CC, INFO_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/info/cc-info-removable-media-panel.h b/panels/info/cc-info-removable-media-panel.h
index dccecde..d0d1660 100644
--- a/panels/info/cc-info-removable-media-panel.h
+++ b/panels/info/cc-info-removable-media-panel.h
@@ -25,7 +25,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_INFO_REMOVABLE_MEDIA_PANEL (cc_info_removable_media_panel_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcInfoRemovableMediaPanel, cc_info_removable_media_panel, CC, 
INFO_REMOVABLE_MEDIA_PANEL, CcPanel)
 
 
diff --git a/panels/mouse/cc-mouse-panel.h b/panels/mouse/cc-mouse-panel.h
index b44aec2..e27fca4 100644
--- a/panels/mouse/cc-mouse-panel.h
+++ b/panels/mouse/cc-mouse-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_MOUSE_PANEL cc_mouse_panel_get_type()
-
+#define CC_TYPE_MOUSE_PANEL (cc_mouse_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcMousePanel, cc_mouse_panel, CC, MOUSE_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/mouse/gnome-mouse-properties.h b/panels/mouse/gnome-mouse-properties.h
index 0e3c1fe..dd7554d 100644
--- a/panels/mouse/gnome-mouse-properties.h
+++ b/panels/mouse/gnome-mouse-properties.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_MOUSE_PROPERTIES cc_mouse_properties_get_type ()
-
+#define CC_TYPE_MOUSE_PROPERTIES (cc_mouse_properties_get_type ())
 G_DECLARE_FINAL_TYPE (CcMouseProperties, cc_mouse_properties, CC, MOUSE_PROPERTIES, GtkBin)
 
 GtkWidget *cc_mouse_properties_new (void);
diff --git a/panels/mouse/gnome-mouse-test.h b/panels/mouse/gnome-mouse-test.h
index f6eeb6e..d06c993 100644
--- a/panels/mouse/gnome-mouse-test.h
+++ b/panels/mouse/gnome-mouse-test.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_MOUSE_TEST cc_mouse_test_get_type ()
-
+#define CC_TYPE_MOUSE_TEST (cc_mouse_test_get_type ())
 G_DECLARE_FINAL_TYPE (CcMouseTest, cc_mouse_test, CC, MOUSE_TEST, GtkBin)
 
 GtkWidget *cc_mouse_test_new (void);
diff --git a/panels/power/cc-power-panel.h b/panels/power/cc-power-panel.h
index e055238..4ea08a2 100644
--- a/panels/power/cc-power-panel.h
+++ b/panels/power/cc-power-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_POWER_PANEL cc_power_panel_get_type()
-
+#define CC_TYPE_POWER_PANEL (cc_power_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcPowerPanel, cc_power_panel, CC, POWER_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/printers/cc-printers-panel.h b/panels/printers/cc-printers-panel.h
index 6d8ad7e..ed5abb2 100644
--- a/panels/printers/cc-printers-panel.h
+++ b/panels/printers/cc-printers-panel.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_PRINTERS_PANEL cc_printers_panel_get_type()
-
+#define CC_TYPE_PRINTERS_PANEL (cc_printers_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcPrintersPanel, cc_printers_panel, CC, PRINTERS_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/printers/pp-cups.h b/panels/printers/pp-cups.h
index bbdfa32..f3ee9e8 100644
--- a/panels/printers/pp-cups.h
+++ b/panels/printers/pp-cups.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_CUPS pp_cups_get_type ()
-
+#define PP_TYPE_CUPS (pp_cups_get_type ())
 G_DECLARE_FINAL_TYPE (PpCups, pp_cups, PP, CUPS, GObject)
 
 typedef struct{
diff --git a/panels/printers/pp-details-dialog.h b/panels/printers/pp-details-dialog.h
index 2ee5865..499f9db 100644
--- a/panels/printers/pp-details-dialog.h
+++ b/panels/printers/pp-details-dialog.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_DETAILS_DIALOG_TYPE pp_details_dialog_get_type ()
-
+#define PP_DETAILS_DIALOG_TYPE (pp_details_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (PpDetailsDialog, pp_details_dialog, PP, DETAILS_DIALOG, GtkDialog)
 
 PpDetailsDialog *pp_details_dialog_new      (GtkWindow            *parent,
diff --git a/panels/printers/pp-host.h b/panels/printers/pp-host.h
index bd46ed5..cc14103 100644
--- a/panels/printers/pp-host.h
+++ b/panels/printers/pp-host.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_HOST pp_host_get_type ()
-
+#define PP_TYPE_HOST (pp_host_get_type ())
 G_DECLARE_DERIVABLE_TYPE (PpHost, pp_host, PP, HOST, GObject)
 
 struct _PpHostClass
diff --git a/panels/printers/pp-ipp-option-widget.h b/panels/printers/pp-ipp-option-widget.h
index 65ea295..aa2ffbc 100644
--- a/panels/printers/pp-ipp-option-widget.h
+++ b/panels/printers/pp-ipp-option-widget.h
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_IPP_OPTION_WIDGET pp_ipp_option_widget_get_type ()
-
+#define PP_TYPE_IPP_OPTION_WIDGET (pp_ipp_option_widget_get_type ())
 G_DECLARE_FINAL_TYPE (PpIPPOptionWidget, pp_ipp_option_widget, PP, IPP_OPTION_WIDGET, GtkBox)
 
 GtkWidget   *pp_ipp_option_widget_new (IPPAttribute *attr_supported,
diff --git a/panels/printers/pp-maintenance-command.h b/panels/printers/pp-maintenance-command.h
index 3a7653c..5ba0a08 100644
--- a/panels/printers/pp-maintenance-command.h
+++ b/panels/printers/pp-maintenance-command.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_MAINTENANCE_COMMAND pp_maintenance_command_get_type ()
-
+#define PP_TYPE_MAINTENANCE_COMMAND (pp_maintenance_command_get_type ())
 G_DECLARE_FINAL_TYPE (PpMaintenanceCommand, pp_maintenance_command, PP, MAINTENANCE_COMMAND, GObject)
 
 PpMaintenanceCommand *pp_maintenance_command_new                 (const gchar *printer_name,
diff --git a/panels/printers/pp-new-printer-dialog.h b/panels/printers/pp-new-printer-dialog.h
index ccde2b7..54a0a23 100644
--- a/panels/printers/pp-new-printer-dialog.h
+++ b/panels/printers/pp-new-printer-dialog.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_NEW_PRINTER_DIALOG pp_new_printer_dialog_get_type ()
-
+#define PP_TYPE_NEW_PRINTER_DIALOG (pp_new_printer_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (PpNewPrinterDialog, pp_new_printer_dialog, PP, NEW_PRINTER_DIALOG, GObject)
 
 PpNewPrinterDialog *pp_new_printer_dialog_new          (GtkWindow          *parent,
diff --git a/panels/printers/pp-new-printer.h b/panels/printers/pp-new-printer.h
index 03b5a74..2f70d45 100644
--- a/panels/printers/pp-new-printer.h
+++ b/panels/printers/pp-new-printer.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_NEW_PRINTER pp_new_printer_get_type ()
-
+#define PP_TYPE_NEW_PRINTER (pp_new_printer_get_type ())
 G_DECLARE_FINAL_TYPE (PpNewPrinter, pp_new_printer, PP, NEW_PRINTER, GObject)
 
 PpNewPrinter *pp_new_printer_new        (void);
diff --git a/panels/printers/pp-ppd-option-widget.h b/panels/printers/pp-ppd-option-widget.h
index 6725531..2216a8a 100644
--- a/panels/printers/pp-ppd-option-widget.h
+++ b/panels/printers/pp-ppd-option-widget.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_PPD_OPTION_WIDGET pp_ppd_option_widget_get_type ()
-
+#define PP_TYPE_PPD_OPTION_WIDGET (pp_ppd_option_widget_get_type ())
 G_DECLARE_FINAL_TYPE (PpPPDOptionWidget, pp_ppd_option_widget, PP, PPD_OPTION_WIDGET, GtkBox)
 
 GtkWidget   *pp_ppd_option_widget_new      (ppd_option_t *source,
diff --git a/panels/printers/pp-print-device.h b/panels/printers/pp-print-device.h
index d9abf85..ecf07a3 100644
--- a/panels/printers/pp-print-device.h
+++ b/panels/printers/pp-print-device.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_PRINT_DEVICE pp_print_device_get_type ()
-
+#define PP_TYPE_PRINT_DEVICE (pp_print_device_get_type ())
 G_DECLARE_FINAL_TYPE (PpPrintDevice, pp_print_device, PP, PRINT_DEVICE, GObject)
 
 PpPrintDevice *pp_print_device_new                       (void);
diff --git a/panels/printers/pp-printer-entry.h b/panels/printers/pp-printer-entry.h
index b981102..dbdfb96 100644
--- a/panels/printers/pp-printer-entry.h
+++ b/panels/printers/pp-printer-entry.h
@@ -23,8 +23,7 @@
 #include <gtk/gtk.h>
 #include <cups/cups.h>
 
-#define PP_PRINTER_ENTRY_TYPE pp_printer_entry_get_type ()
-
+#define PP_PRINTER_ENTRY_TYPE (pp_printer_entry_get_type ())
 G_DECLARE_FINAL_TYPE (PpPrinterEntry, pp_printer_entry, PP, PRINTER_ENTRY, GtkListBoxRow)
 
 PpPrinterEntry *pp_printer_entry_new  (cups_dest_t printer,
diff --git a/panels/printers/pp-printer.h b/panels/printers/pp-printer.h
index 80b6b96..17594d3 100644
--- a/panels/printers/pp-printer.h
+++ b/panels/printers/pp-printer.h
@@ -29,7 +29,6 @@
 G_BEGIN_DECLS
 
 #define PP_TYPE_PRINTER (pp_printer_get_type ())
-
 G_DECLARE_FINAL_TYPE (PpPrinter, pp_printer, PP, PRINTER, GObject)
 
 GType        pp_printer_get_type      (void) G_GNUC_CONST;
diff --git a/panels/printers/pp-samba.h b/panels/printers/pp-samba.h
index 1a4f317..cef347a 100644
--- a/panels/printers/pp-samba.h
+++ b/panels/printers/pp-samba.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define PP_TYPE_SAMBA pp_samba_get_type ()
-
+#define PP_TYPE_SAMBA (pp_samba_get_type ())
 G_DECLARE_FINAL_TYPE (PpSamba, pp_samba, PP, SAMBA, PpHost)
 
 PpSamba       *pp_samba_new                (const gchar         *hostname);
diff --git a/panels/privacy/cc-privacy-panel.h b/panels/privacy/cc-privacy-panel.h
index 42c2081..fb206ff 100644
--- a/panels/privacy/cc-privacy-panel.h
+++ b/panels/privacy/cc-privacy-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_PRIVACY_PANEL cc_privacy_panel_get_type()
-
+#define CC_TYPE_PRIVACY_PANEL (cc_privacy_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcPrivacyPanel, cc_privacy_panel, CC, PRIVACY_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/region/cc-region-panel.h b/panels/region/cc-region-panel.h
index 9aedce6..b1f73a7 100644
--- a/panels/region/cc-region-panel.h
+++ b/panels/region/cc-region-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_REGION_PANEL cc_region_panel_get_type()
-
+#define CC_TYPE_REGION_PANEL (cc_region_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcRegionPanel, cc_region_panel, CC, REGION_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/search/cc-search-locations-dialog.h b/panels/search/cc-search-locations-dialog.h
index 8871981..26424d1 100644
--- a/panels/search/cc-search-locations-dialog.h
+++ b/panels/search/cc-search-locations-dialog.h
@@ -23,8 +23,7 @@
 
 #include "cc-search-panel.h"
 
-#define CC_SEARCH_LOCATIONS_DIALOG_TYPE cc_search_locations_dialog_get_type ()
-
+#define CC_SEARCH_LOCATIONS_DIALOG_TYPE (cc_search_locations_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, CC, SEARCH_LOCATIONS_DIALOG, 
GtkDialog)
 
 CcSearchLocationsDialog *cc_search_locations_dialog_new (CcSearchPanel *panel);
diff --git a/panels/search/cc-search-panel.h b/panels/search/cc-search-panel.h
index 50b27a8..39de469 100644
--- a/panels/search/cc-search-panel.h
+++ b/panels/search/cc-search-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_SEARCH_PANEL cc_search_panel_get_type()
-
+#define CC_TYPE_SEARCH_PANEL (cc_search_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcSearchPanel, cc_search_panel, CC, SEARCH_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/sharing/cc-sharing-networks.h b/panels/sharing/cc-sharing-networks.h
index 1fae8dc..8abe10b 100644
--- a/panels/sharing/cc-sharing-networks.h
+++ b/panels/sharing/cc-sharing-networks.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_SHARING_NETWORKS cc_sharing_networks_get_type ()
-
+#define CC_TYPE_SHARING_NETWORKS (cc_sharing_networks_get_type ())
 G_DECLARE_FINAL_TYPE (CcSharingNetworks, cc_sharing_networks, CC, SHARING_NETWORKS, GtkGrid)
 
 typedef enum {
diff --git a/panels/sharing/cc-sharing-panel.h b/panels/sharing/cc-sharing-panel.h
index 27b4fe0..17f84db 100644
--- a/panels/sharing/cc-sharing-panel.h
+++ b/panels/sharing/cc-sharing-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_SHARING_PANEL cc_sharing_panel_get_type()
-
+#define CC_TYPE_SHARING_PANEL (cc_sharing_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcSharingPanel, cc_sharing_panel, CC, SHARING_PANEL, CcPanel)
 
 CcSharingPanel *cc_sharing_panel_new (void);
diff --git a/panels/sharing/cc-sharing-switch.h b/panels/sharing/cc-sharing-switch.h
index 48588ed..9a42f0f 100644
--- a/panels/sharing/cc-sharing-switch.h
+++ b/panels/sharing/cc-sharing-switch.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_SHARING_SWITCH cc_sharing_switch_get_type ()
-
+#define CC_TYPE_SHARING_SWITCH (cc_sharing_switch_get_type ())
 G_DECLARE_FINAL_TYPE (CcSharingSwitch, cc_sharing_switch, CC, SHARING_SWITCH, GtkSwitch)
 
 GtkWidget    * cc_sharing_switch_new       (GtkWidget *widget);
diff --git a/panels/sound/cc-sound-panel.h b/panels/sound/cc-sound-panel.h
index 18803a3..dd72ef9 100644
--- a/panels/sound/cc-sound-panel.h
+++ b/panels/sound/cc-sound-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_SOUND_PANEL cc_sound_panel_get_type()
-
+#define CC_TYPE_SOUND_PANEL (cc_sound_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcSoundPanel, cc_sound_panel, CC, SOUND_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/sound/gvc-balance-bar.h b/panels/sound/gvc-balance-bar.h
index 1a09a7d..4638b06 100644
--- a/panels/sound/gvc-balance-bar.h
+++ b/panels/sound/gvc-balance-bar.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_BALANCE_BAR gvc_balance_bar_get_type ()
-
+#define GVC_TYPE_BALANCE_BAR (gvc_balance_bar_get_type ())
 G_DECLARE_FINAL_TYPE (GvcBalanceBar, gvc_balance_bar, GVC, BALANCE_BAR, GtkBox)
 
 typedef enum {
diff --git a/panels/sound/gvc-channel-bar.h b/panels/sound/gvc-channel-bar.h
index bc788f0..f0ded18 100644
--- a/panels/sound/gvc-channel-bar.h
+++ b/panels/sound/gvc-channel-bar.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_CHANNEL_BAR gvc_channel_bar_get_type ()
-
+#define GVC_TYPE_CHANNEL_BAR (gvc_channel_bar_get_type ())
 G_DECLARE_FINAL_TYPE (GvcChannelBar, gvc_channel_bar, GVC, CHANNEL_BAR, GtkBox)
 
 GtkWidget *         gvc_channel_bar_new                 (void);
diff --git a/panels/sound/gvc-combo-box.h b/panels/sound/gvc-combo-box.h
index de9d7f2..77937c2 100644
--- a/panels/sound/gvc-combo-box.h
+++ b/panels/sound/gvc-combo-box.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_COMBO_BOX gvc_combo_box_get_type ()
-
+#define GVC_TYPE_COMBO_BOX (gvc_combo_box_get_type ())
 G_DECLARE_FINAL_TYPE (GvcComboBox, gvc_combo_box, GVC, COMBO_BOX, GtkBox)
 
 GtkWidget *         gvc_combo_box_new                 (const char   *label);
diff --git a/panels/sound/gvc-level-bar.h b/panels/sound/gvc-level-bar.h
index d4629d4..758b011 100644
--- a/panels/sound/gvc-level-bar.h
+++ b/panels/sound/gvc-level-bar.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_LEVEL_BAR         (gvc_level_bar_get_type ())
-
+#define GVC_TYPE_LEVEL_BAR (gvc_level_bar_get_type ())
 G_DECLARE_FINAL_TYPE (GvcLevelBar, gvc_level_bar, GVC, LEVEL_BAR, GtkBox)
 
 typedef enum
diff --git a/panels/sound/gvc-mixer-dialog.h b/panels/sound/gvc-mixer-dialog.h
index 545cd8d..5d8b754 100644
--- a/panels/sound/gvc-mixer-dialog.h
+++ b/panels/sound/gvc-mixer-dialog.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_MIXER_DIALOG gvc_mixer_dialog_get_type ()
-
+#define GVC_TYPE_MIXER_DIALOG (gvc_mixer_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (GvcMixerDialog, gvc_mixer_dialog, GVC, MIXER_DIALOG, GtkBox)
 
 GvcMixerDialog *    gvc_mixer_dialog_new                 (GvcMixerControl *control);
diff --git a/panels/sound/gvc-sound-theme-chooser.h b/panels/sound/gvc-sound-theme-chooser.h
index acd31ae..122a9f0 100644
--- a/panels/sound/gvc-sound-theme-chooser.h
+++ b/panels/sound/gvc-sound-theme-chooser.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_SOUND_THEME_CHOOSER gvc_sound_theme_chooser_get_type ()
-
+#define GVC_TYPE_SOUND_THEME_CHOOSER (gvc_sound_theme_chooser_get_type ())
 G_DECLARE_FINAL_TYPE (GvcSoundThemeChooser, gvc_sound_theme_chooser, GVC, SOUND_THEME_CHOOSER, GtkBox)
 
 GtkWidget *         gvc_sound_theme_chooser_new                 (void);
diff --git a/panels/sound/gvc-speaker-test.h b/panels/sound/gvc-speaker-test.h
index 40eb154..fc5dcc4 100644
--- a/panels/sound/gvc-speaker-test.h
+++ b/panels/sound/gvc-speaker-test.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GVC_TYPE_SPEAKER_TEST         (gvc_speaker_test_get_type ())
-
+#define GVC_TYPE_SPEAKER_TEST (gvc_speaker_test_get_type ())
 G_DECLARE_FINAL_TYPE (GvcSpeakerTest, gvc_speaker_test, GVC, SPEAKER_TEST, GtkGrid)
 
 GtkWidget *         gvc_speaker_test_new                 (GvcMixerControl *control,
diff --git a/panels/universal-access/cc-ua-panel.h b/panels/universal-access/cc-ua-panel.h
index f5fabf8..b8c467e 100644
--- a/panels/universal-access/cc-ua-panel.h
+++ b/panels/universal-access/cc-ua-panel.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_UA_PANEL cc_ua_panel_get_type()
-
+#define CC_TYPE_UA_PANEL (cc_ua_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcUaPanel, cc_ua_panel, CC, UA_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/universal-access/zoom-options.h b/panels/universal-access/zoom-options.h
index 320a85e..683bab0 100644
--- a/panels/universal-access/zoom-options.h
+++ b/panels/universal-access/zoom-options.h
@@ -27,7 +27,6 @@
 G_BEGIN_DECLS
 
 #define ZOOM_TYPE_OPTIONS (zoom_options_get_type ())
-
 G_DECLARE_FINAL_TYPE (ZoomOptions, zoom_options, ZOOM, OPTIONS, GObject)
 
 ZoomOptions *zoom_options_new    (void);
diff --git a/panels/user-accounts/cc-crop-area.h b/panels/user-accounts/cc-crop-area.h
index 511b518..1cc1788 100644
--- a/panels/user-accounts/cc-crop-area.h
+++ b/panels/user-accounts/cc-crop-area.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_CROP_AREA cc_crop_area_get_type ()
-
+#define CC_TYPE_CROP_AREA (cc_crop_area_get_type ())
 G_DECLARE_FINAL_TYPE (CcCropArea, cc_crop_area, CC, CROP_AREA, GtkDrawingArea)
 
 GtkWidget *cc_crop_area_new                  (void);
diff --git a/panels/user-accounts/um-account-dialog.h b/panels/user-accounts/um-account-dialog.h
index 0e47de9..44a356c 100644
--- a/panels/user-accounts/um-account-dialog.h
+++ b/panels/user-accounts/um-account-dialog.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define UM_TYPE_ACCOUNT_DIALOG um_account_dialog_get_type ()
-
+#define UM_TYPE_ACCOUNT_DIALOG (um_account_dialog_get_type ())
 G_DECLARE_FINAL_TYPE (UmAccountDialog, um_account_dialog, UM, ACCOUNT_DIALOG, GtkDialog)
 
 UmAccountDialog *um_account_dialog_new      (void);
diff --git a/panels/user-accounts/um-carousel.h b/panels/user-accounts/um-carousel.h
index 0812ca3..45a11ca 100644
--- a/panels/user-accounts/um-carousel.h
+++ b/panels/user-accounts/um-carousel.h
@@ -26,11 +26,9 @@
 G_BEGIN_DECLS
 
 #define UM_TYPE_CAROUSEL_ITEM (um_carousel_item_get_type ())
-
 G_DECLARE_FINAL_TYPE (UmCarouselItem, um_carousel_item, UM, CAROUSEL_ITEM, GtkRadioButton)
 
-#define UM_TYPE_CAROUSEL (um_carousel_get_type())
-
+#define UM_TYPE_CAROUSEL (um_carousel_get_type ())
 G_DECLARE_FINAL_TYPE (UmCarousel, um_carousel, UM, CAROUSEL, GtkRevealer)
 
 GtkWidget       *um_carousel_item_new    (void);
diff --git a/panels/user-accounts/um-cell-renderer-user-image.h 
b/panels/user-accounts/um-cell-renderer-user-image.h
index e1be7f9..1763127 100644
--- a/panels/user-accounts/um-cell-renderer-user-image.h
+++ b/panels/user-accounts/um-cell-renderer-user-image.h
@@ -23,8 +23,7 @@
 
 G_BEGIN_DECLS
 
-#define UM_TYPE_CELL_RENDERER_USER_IMAGE um_cell_renderer_user_image_get_type()
-
+#define UM_TYPE_CELL_RENDERER_USER_IMAGE (um_cell_renderer_user_image_get_type ())
 G_DECLARE_FINAL_TYPE (UmCellRendererUserImage, um_cell_renderer_user_image, UM, CELL_RENDERER_USER_IMAGE, 
GtkCellRendererPixbuf)
 
 GtkCellRenderer *um_cell_renderer_user_image_new      (GtkWidget *parent);
diff --git a/panels/user-accounts/um-realm-manager.h b/panels/user-accounts/um-realm-manager.h
index 6989dd9..2e1b07e 100644
--- a/panels/user-accounts/um-realm-manager.h
+++ b/panels/user-accounts/um-realm-manager.h
@@ -36,8 +36,7 @@ typedef enum {
 
 GQuark           um_realm_error_get_quark         (void) G_GNUC_CONST;
 
-#define UM_TYPE_REALM_MANAGER um_realm_manager_get_type ()
-
+#define UM_TYPE_REALM_MANAGER (um_realm_manager_get_type ())
 G_DECLARE_FINAL_TYPE (UmRealmManager, um_realm_manager, UM, REALM_MANAGER, UmRealmObjectManagerClient)
 
 void             um_realm_manager_new             (GCancellable *cancellable,
diff --git a/panels/user-accounts/um-user-image.h b/panels/user-accounts/um-user-image.h
index cbce01b..e418b05 100644
--- a/panels/user-accounts/um-user-image.h
+++ b/panels/user-accounts/um-user-image.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define UM_TYPE_USER_IMAGE um_user_image_get_type()
-
+#define UM_TYPE_USER_IMAGE (um_user_image_get_type ())
 G_DECLARE_FINAL_TYPE (UmUserImage, um_user_image, UM, USER_IMAGE, GtkImage)
 
 GtkWidget *um_user_image_new      (void);
diff --git a/panels/user-accounts/um-user-panel.h b/panels/user-accounts/um-user-panel.h
index 459c6bf..a5cc79d 100644
--- a/panels/user-accounts/um-user-panel.h
+++ b/panels/user-accounts/um-user-panel.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define UM_TYPE_USER_PANEL cc_user_panel_get_type()
-
+#define UM_TYPE_USER_PANEL (cc_user_panel_get_type ())
 G_DECLARE_FINAL_TYPE (CcUserPanel, cc_user_panel, UM, USER_PANEL, CcPanel)
 
 G_END_DECLS
diff --git a/panels/wacom/calibrator/cc-clock-actor.h b/panels/wacom/calibrator/cc-clock-actor.h
index dc2245b..f6e2b2e 100644
--- a/panels/wacom/calibrator/cc-clock-actor.h
+++ b/panels/wacom/calibrator/cc-clock-actor.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_CLOCK_ACTOR_TYPE cc_clock_actor_get_type ()
-
+#define CC_CLOCK_ACTOR_TYPE (cc_clock_actor_get_type ())
 G_DECLARE_FINAL_TYPE (CcClockActor, cc_clock_actor, CC, CLOCK_ACTOR, ClutterActor)
 
 ClutterActor * cc_clock_actor_new      (void);
diff --git a/panels/wacom/calibrator/cc-target-actor.h b/panels/wacom/calibrator/cc-target-actor.h
index 306bae1..9ac7c2f 100644
--- a/panels/wacom/calibrator/cc-target-actor.h
+++ b/panels/wacom/calibrator/cc-target-actor.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TARGET_ACTOR_TYPE cc_target_actor_get_type ()
-
+#define CC_TARGET_ACTOR_TYPE (cc_target_actor_get_type ())
 G_DECLARE_FINAL_TYPE (CcTargetActor, cc_target_actor, CC, TARGET_ACTOR, ClutterActor)
 
 ClutterActor * cc_target_actor_new         (void);
diff --git a/panels/wacom/cc-drawing-area.h b/panels/wacom/cc-drawing-area.h
index 4c542fd..088bb7e 100644
--- a/panels/wacom/cc-drawing-area.h
+++ b/panels/wacom/cc-drawing-area.h
@@ -24,8 +24,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_DRAWING_AREA cc_drawing_area_get_type()
-
+#define CC_TYPE_DRAWING_AREA (cc_drawing_area_get_type())
 G_DECLARE_FINAL_TYPE (CcDrawingArea, cc_drawing_area, CC, DRAWING_AREA, GtkEventBox)
 
 GtkWidget *cc_drawing_area_new (void);
diff --git a/panels/wacom/cc-tablet-tool-map.h b/panels/wacom/cc-tablet-tool-map.h
index 2463202..5e542a8 100644
--- a/panels/wacom/cc-tablet-tool-map.h
+++ b/panels/wacom/cc-tablet-tool-map.h
@@ -29,7 +29,6 @@
 G_BEGIN_DECLS
 
 #define CC_TYPE_TABLET_TOOL_MAP (cc_tablet_tool_map_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcTabletToolMap, cc_tablet_tool_map, CC, TABLET_TOOL_MAP, GObject)
 
 CcTabletToolMap * cc_tablet_tool_map_new        (void);
diff --git a/panels/wacom/cc-wacom-button-row.h b/panels/wacom/cc-wacom-button-row.h
index dcad166..91cb17e 100644
--- a/panels/wacom/cc-wacom-button-row.h
+++ b/panels/wacom/cc-wacom-button-row.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_WACOM_TYPE_BUTTON_ROW cc_wacom_button_row_get_type ()
-
+#define CC_WACOM_TYPE_BUTTON_ROW (cc_wacom_button_row_get_type ())
 G_DECLARE_FINAL_TYPE (CcWacomButtonRow, cc_wacom_button_row, CC, WACOM_BUTTON_ROW, GtkListBoxRow)
 
 static struct {
diff --git a/panels/wacom/cc-wacom-device.h b/panels/wacom/cc-wacom-device.h
index 856065b..ffc46f6 100644
--- a/panels/wacom/cc-wacom-device.h
+++ b/panels/wacom/cc-wacom-device.h
@@ -30,7 +30,6 @@
 #include <libgnome-desktop/gnome-rr.h>
 
 #define CC_TYPE_WACOM_DEVICE (cc_wacom_device_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcWacomDevice, cc_wacom_device, CC, WACOM_DEVICE, GObject)
 
 WacomDeviceDatabase *
diff --git a/panels/wacom/cc-wacom-mapping-panel.h b/panels/wacom/cc-wacom-mapping-panel.h
index 74211ef..fdc947e 100644
--- a/panels/wacom/cc-wacom-mapping-panel.h
+++ b/panels/wacom/cc-wacom-mapping-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_MAPPING_PANEL cc_wacom_mapping_panel_get_type()
-
+#define CC_TYPE_WACOM_MAPPING_PANEL (cc_wacom_mapping_panel_get_type())
 G_DECLARE_FINAL_TYPE (CcWacomMappingPanel, cc_wacom_mapping_panel, CC, WACOM_MAPPING_PANEL, GtkBox)
 
 GtkWidget * cc_wacom_mapping_panel_new (void);
diff --git a/panels/wacom/cc-wacom-nav-button.h b/panels/wacom/cc-wacom-nav-button.h
index 9d72fb2..85ba221 100644
--- a/panels/wacom/cc-wacom-nav-button.h
+++ b/panels/wacom/cc-wacom-nav-button.h
@@ -25,8 +25,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_NAV_BUTTON cc_wacom_nav_button_get_type()
-
+#define CC_TYPE_WACOM_NAV_BUTTON (cc_wacom_nav_button_get_type())
 G_DECLARE_FINAL_TYPE (CcWacomNavButton, cc_wacom_nav_button, CC, WACOM_NAV_BUTTON, GtkBox)
 
 GtkWidget * cc_wacom_nav_button_new (void);
diff --git a/panels/wacom/cc-wacom-page.h b/panels/wacom/cc-wacom-page.h
index 76a27dd..0f282ef 100644
--- a/panels/wacom/cc-wacom-page.h
+++ b/panels/wacom/cc-wacom-page.h
@@ -28,8 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_PAGE cc_wacom_page_get_type()
-
+#define CC_TYPE_WACOM_PAGE (cc_wacom_page_get_type())
 G_DECLARE_FINAL_TYPE (CcWacomPage, cc_wacom_page, CC, WACOM_PAGE, GtkBox)
 
 GtkWidget * cc_wacom_page_new (CcWacomPanel  *panel,
diff --git a/panels/wacom/cc-wacom-panel.h b/panels/wacom/cc-wacom-panel.h
index 874e9eb..21e4ff3 100644
--- a/panels/wacom/cc-wacom-panel.h
+++ b/panels/wacom/cc-wacom-panel.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_PANEL cc_wacom_panel_get_type()
-
+#define CC_TYPE_WACOM_PANEL (cc_wacom_panel_get_type())
 G_DECLARE_FINAL_TYPE (CcWacomPanel, cc_wacom_panel, CC, WACOM_PANEL, CcPanel)
 
 void  cc_wacom_panel_switch_to_panel (CcWacomPanel *self,
diff --git a/panels/wacom/cc-wacom-stylus-page.h b/panels/wacom/cc-wacom-stylus-page.h
index 42e0726..4eb5823 100644
--- a/panels/wacom/cc-wacom-stylus-page.h
+++ b/panels/wacom/cc-wacom-stylus-page.h
@@ -27,8 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define CC_TYPE_WACOM_STYLUS_PAGE cc_wacom_stylus_page_get_type()
-
+#define CC_TYPE_WACOM_STYLUS_PAGE (cc_wacom_stylus_page_get_type())
 G_DECLARE_FINAL_TYPE (CcWacomStylusPage, cc_wacom_stylus_page, CC, WACOM_STYLUS_PAGE, GtkBox)
 
 GtkWidget * cc_wacom_stylus_page_new (CcWacomTool *stylus);
diff --git a/panels/wacom/cc-wacom-tool.h b/panels/wacom/cc-wacom-tool.h
index e366c2e..a7da468 100644
--- a/panels/wacom/cc-wacom-tool.h
+++ b/panels/wacom/cc-wacom-tool.h
@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #define CC_TYPE_WACOM_TOOL (cc_wacom_tool_get_type ())
-
 G_DECLARE_FINAL_TYPE (CcWacomTool, cc_wacom_tool, CC, WACOM_TOOL, GObject)
 
 CcWacomTool   * cc_wacom_tool_new             (guint64        serial,
diff --git a/panels/wacom/gsd-wacom-key-shortcut-button.h b/panels/wacom/gsd-wacom-key-shortcut-button.h
index 2432f1f..e7d44c0 100644
--- a/panels/wacom/gsd-wacom-key-shortcut-button.h
+++ b/panels/wacom/gsd-wacom-key-shortcut-button.h
@@ -26,8 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GSD_WACOM_TYPE_KEY_SHORTCUT_BUTTON gsd_wacom_key_shortcut_button_get_type ()
-
+#define GSD_WACOM_TYPE_KEY_SHORTCUT_BUTTON (gsd_wacom_key_shortcut_button_get_type ())
 G_DECLARE_FINAL_TYPE (GsdWacomKeyShortcutButton, gsd_wacom_key_shortcut_button, GSD, 
WACOM_KEY_SHORTCUT_BUTTON, GtkButton)
 
 GType gsd_wacom_key_shortcut_button_mode_type (void) G_GNUC_CONST;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]