[eel][libegg] Use G_DEFINE_TYPE_WITH_PRIVATE macro

yetist · lukefromdc · commit 10efec8be67f · 2019-01-22T04:36:49.000Z
Replace G_DEFINE_TYPE_WITH_CODE with G_DEFINE_TYPE_WITH_PRIVATE macro
diff --git a/eel/eel-background.c b/eel/eel-background.c
@@ -80,8 +80,7 @@ struct EelBackgroundPrivate
 
 static GList *desktop_bg_objects = NULL;
 
-G_DEFINE_TYPE_WITH_CODE (EelBackground, eel_background, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (EelBackground))
+G_DEFINE_TYPE_WITH_PRIVATE (EelBackground, eel_background, G_TYPE_OBJECT)
 
 static void
 free_fade (EelBackground *self)
diff --git a/eel/eel-image-table.c b/eel/eel-image-table.c
@@ -85,8 +85,7 @@ static int     ancestor_button_release_event        (GtkWidget          *widget,
         GdkEventButton     *event,
         gpointer            event_data);
 
-G_DEFINE_TYPE_WITH_CODE (EelImageTable, eel_image_table, EEL_TYPE_WRAP_TABLE,
-                         G_ADD_PRIVATE (EelImageTable))
+G_DEFINE_TYPE_WITH_PRIVATE (EelImageTable, eel_image_table, EEL_TYPE_WRAP_TABLE)
 
 static void
 eel_image_table_init (EelImageTable *image_table)
diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c
@@ -104,8 +104,7 @@ static gboolean      labeled_image_show_image             (const EelLabeledImage
 
 static guint labeled_image_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE_WITH_CODE (EelLabeledImage, eel_labeled_image, GTK_TYPE_CONTAINER,
-                         G_ADD_PRIVATE (EelLabeledImage))
+G_DEFINE_TYPE_WITH_PRIVATE (EelLabeledImage, eel_labeled_image, GTK_TYPE_CONTAINER)
 
 static void
 eel_labeled_image_init (EelLabeledImage *labeled_image)
diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c
@@ -70,8 +70,7 @@ static gboolean      wrap_table_child_focus_in           (GtkWidget           *w
 static void          wrap_table_layout                   (EelWrapTable        *wrap_table);
 
 
-G_DEFINE_TYPE_WITH_CODE (EelWrapTable, eel_wrap_table, GTK_TYPE_CONTAINER,
-                         G_ADD_PRIVATE (EelWrapTable))
+G_DEFINE_TYPE_WITH_PRIVATE (EelWrapTable, eel_wrap_table, GTK_TYPE_CONTAINER)
 
 static void
 eel_wrap_table_init (EelWrapTable *wrap_table)
diff --git a/libegg/eggsmclient.c b/libegg/eggsmclient.c
@@ -46,10 +46,7 @@ struct _EggSMClientPrivate
     GKeyFile *state_file;
 };
 
-#define EGG_SM_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EGG_TYPE_SM_CLIENT, EggSMClientPrivate))
-
-G_DEFINE_TYPE_WITH_CODE (EggSMClient, egg_sm_client, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (EggSMClient))
+G_DEFINE_TYPE_WITH_PRIVATE (EggSMClient, egg_sm_client, G_TYPE_OBJECT)
 
 static EggSMClient *global_client;
 static EggSMClientMode global_client_mode = EGG_SM_CLIENT_MODE_NORMAL;
