From 5279a6bff46b3c9fb42da27bc1961e8d522fbc93 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 22 Aug 2018 13:19:45 +0200 Subject: two-lines-renderer: Use G_DEFINE_WITH_PRIVATE This paves the way for improving our GObject use and reducing the amount of boilerplate. G_DEFINE_WITH_WITH_PRIVATE was introduced in GLib 2.38, which should be old enough for all users. https://bugzilla.gnome.org/show_bug.cgi?id=774709 --- libgd/gd-two-lines-renderer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libgd/gd-two-lines-renderer.c b/libgd/gd-two-lines-renderer.c index a2c3fdc..1f58fd7 100644 --- a/libgd/gd-two-lines-renderer.c +++ b/libgd/gd-two-lines-renderer.c @@ -25,8 +25,6 @@ #define SUBTITLE_DIM_PERCENTAGE 0.55 #define SUBTITLE_SIZE_PERCENTAGE 0.82 -G_DEFINE_TYPE (GdTwoLinesRenderer, gd_two_lines_renderer, GTK_TYPE_CELL_RENDERER_TEXT) - struct _GdTwoLinesRendererPrivate { gchar *line_two; gint text_lines; @@ -40,6 +38,8 @@ enum { static GParamSpec *properties[NUM_PROPERTIES] = { NULL, }; +G_DEFINE_TYPE_WITH_PRIVATE (GdTwoLinesRenderer, gd_two_lines_renderer, GTK_TYPE_CELL_RENDERER_TEXT) + static PangoLayout * create_layout_with_attrs (GtkWidget *widget, const GdkRectangle *cell_area, @@ -598,15 +598,13 @@ gd_two_lines_renderer_class_init (GdTwoLinesRendererClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - g_type_class_add_private (klass, sizeof (GdTwoLinesRendererPrivate)); g_object_class_install_properties (oclass, NUM_PROPERTIES, properties); } static void gd_two_lines_renderer_init (GdTwoLinesRenderer *self) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_TWO_LINES_RENDERER, - GdTwoLinesRendererPrivate); + self->priv = gd_two_lines_renderer_get_instance_private (self); } GtkCellRenderer * -- cgit v1.2.1