From 94f7f4412338fb4c05f2010f135cfab9985712fa 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 3 origin commits: https://gitlab.gnome.org/GNOME/eog/commit/d7317d2 https://gitlab.gnome.org/GNOME/eog/commit/756dc07 https://gitlab.gnome.org/GNOME/eog/commit/c485fb8 https://gitlab.gnome.org/GNOME/eog/commit/77be951 https://gitlab.gnome.org/GNOME/eog/commit/007273d https://gitlab.gnome.org/GNOME/eog/commit/a545274 https://gitlab.gnome.org/GNOME/eog/commit/e0f99fb https://gitlab.gnome.org/GNOME/eog/commit/1222978 --- src/eom-clipboard-handler.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/eom-clipboard-handler.c') diff --git a/src/eom-clipboard-handler.c b/src/eom-clipboard-handler.c index 6d7cd4f..a15e733 100644 --- a/src/eom-clipboard-handler.c +++ b/src/eom-clipboard-handler.c @@ -47,10 +47,7 @@ struct _EomClipboardHandlerPrivate { gchar *uri; }; -#define EOM_CLIPBOARD_HANDLER_GET_PRIVATE(object) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_CLIPBOARD_HANDLER, EomClipboardHandlerPrivate)) - -G_DEFINE_TYPE(EomClipboardHandler, eom_clipboard_handler, G_TYPE_INITIALLY_UNOWNED) +G_DEFINE_TYPE_WITH_PRIVATE (EomClipboardHandler, eom_clipboard_handler, G_TYPE_INITIALLY_UNOWNED) static GdkPixbuf* eom_clipboard_handler_get_pixbuf (EomClipboardHandler *handler) @@ -178,7 +175,7 @@ eom_clipboard_handler_dispose (GObject *obj) static void eom_clipboard_handler_init (EomClipboardHandler *handler) { - handler->priv = EOM_CLIPBOARD_HANDLER_GET_PRIVATE (handler); + handler->priv = eom_clipboard_handler_get_instance_private (handler); } static void @@ -186,8 +183,6 @@ eom_clipboard_handler_class_init (EomClipboardHandlerClass *klass) { GObjectClass *g_obj_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (EomClipboardHandlerPrivate)); - g_obj_class->get_property = eom_clipboard_handler_get_property; g_obj_class->set_property = eom_clipboard_handler_set_property; g_obj_class->dispose = eom_clipboard_handler_dispose; -- cgit v1.2.1