From fb7c5396f68f03f634a57654267a67191031e75d Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Fri, 4 Oct 2013 14:21:20 +0200 Subject: Convert to G_DEFINE_TYPE_WITH_PRIVATE part 2 origin commits: https://gitlab.gnome.org/GNOME/eog/commit/ffc4137 https://gitlab.gnome.org/GNOME/eog/commit/ad8c963 https://gitlab.gnome.org/GNOME/eog/commit/afa0dc8 https://gitlab.gnome.org/GNOME/eog/commit/119a768 https://gitlab.gnome.org/GNOME/eog/commit/7725a55 https://gitlab.gnome.org/GNOME/eog/commit/80cf422 --- src/eom-metadata-sidebar.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/eom-metadata-sidebar.c') diff --git a/src/eom-metadata-sidebar.c b/src/eom-metadata-sidebar.c index 1c01abd..018269b 100644 --- a/src/eom-metadata-sidebar.c +++ b/src/eom-metadata-sidebar.c @@ -101,10 +101,7 @@ struct _EomMetadataSidebarPrivate { #endif }; -#define EOM_METADATA_SIDEBAR_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_METADATA_SIDEBAR, EomMetadataSidebarPrivate)) - -G_DEFINE_TYPE(EomMetadataSidebar, eom_metadata_sidebar, GTK_TYPE_SCROLLED_WINDOW) +G_DEFINE_TYPE_WITH_PRIVATE(EomMetadataSidebar, eom_metadata_sidebar, GTK_TYPE_SCROLLED_WINDOW) static GtkWidget* _gtk_grid_append_title_line (GtkGrid *grid, GtkWidget *sibling, @@ -492,7 +489,7 @@ eom_metadata_sidebar_init (EomMetadataSidebar *sidebar) EomMetadataSidebarPrivate *priv; GtkWidget *label; - priv = sidebar->priv = EOM_METADATA_SIDEBAR_GET_PRIVATE (sidebar); + priv = sidebar->priv = eom_metadata_sidebar_get_instance_private (sidebar); priv->grid = gtk_grid_new (); g_object_set (G_OBJECT (priv->grid), "row-spacing", 6, @@ -655,8 +652,6 @@ eom_metadata_sidebar_class_init (EomMetadataSidebarClass *klass) { GObjectClass *g_obj_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof(EomMetadataSidebarPrivate)); - g_obj_class->constructed = eom_metadata_sidebar_constructed; g_obj_class->get_property = eom_metadata_sidebar_get_property; g_obj_class->set_property = eom_metadata_sidebar_set_property; -- cgit v1.2.1