From 5a5612ab8ec4fb31464fa35e049a4a3b7cb64393 Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Fri, 4 Oct 2013 12:07:29 +0200 Subject: Convert to G_DEFINE_TYPE_WITH_PRIVATE part 1 origin commits: https://gitlab.gnome.org/GNOME/eog/commit/35c3864 https://gitlab.gnome.org/GNOME/eog/commit/842775b https://gitlab.gnome.org/GNOME/eog/commit/3fe0bd4 https://gitlab.gnome.org/GNOME/eog/commit/2b25632 https://gitlab.gnome.org/GNOME/eog/commit/f0c977d https://gitlab.gnome.org/GNOME/eog/commit/5cdb1b8 https://gitlab.gnome.org/GNOME/eog/commit/dba0bd4 https://gitlab.gnome.org/GNOME/eog/commit/8e31683 https://gitlab.gnome.org/GNOME/eog/commit/3945bb1 --- src/eom-scroll-view.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/eom-scroll-view.c') diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c index 0b070b9..1458c18 100644 --- a/src/eom-scroll-view.c +++ b/src/eom-scroll-view.c @@ -165,12 +165,9 @@ static void view_on_drag_data_get_cb (GtkWidget *widget, GtkSelectionData *data, guint info, guint time, gpointer user_data); -#define EOM_SCROLL_VIEW_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_SCROLL_VIEW, EomScrollViewPrivate)) - static gboolean _eom_gdk_rgba_equal0 (const GdkRGBA *a, const GdkRGBA *b); -G_DEFINE_TYPE (EomScrollView, eom_scroll_view, GTK_TYPE_GRID) +G_DEFINE_TYPE_WITH_PRIVATE (EomScrollView, eom_scroll_view, GTK_TYPE_GRID) /*=================================== widget size changing handler & @@ -1815,7 +1812,7 @@ eom_scroll_view_init (EomScrollView *view) GSettings *settings; EomScrollViewPrivate *priv; - priv = view->priv = EOM_SCROLL_VIEW_GET_PRIVATE (view); + priv = view->priv = eom_scroll_view_get_instance_private (view); settings = g_settings_new (EOM_CONF_VIEW); priv->zoom = 1.0; @@ -2171,8 +2168,6 @@ eom_scroll_view_class_init (EomScrollViewClass *klass) G_TYPE_DOUBLE); widget_class->size_allocate = eom_scroll_view_size_allocate; - - g_type_class_add_private (klass, sizeof (EomScrollViewPrivate)); } static void -- cgit v1.2.1