[eog] EogThumbView: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] EogThumbView: Convert to G_DEFINE_TYPE_WITH_PRIVATE
- Date: Fri, 4 Oct 2013 13:26:40 +0000 (UTC)
commit 3fe0bd486b94600bf4c08fa1e6fb13567200e347
Author: Felix Riemann <friemann gnome org>
Date: Fri Oct 4 12:02:32 2013 +0200
EogThumbView: Convert to G_DEFINE_TYPE_WITH_PRIVATE
Use G_ADD_PRIVATE directly in this case.
src/eog-thumb-view.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/src/eog-thumb-view.c b/src/eog-thumb-view.c
index c9fc638..b4a2bad 100644
--- a/src/eog-thumb-view.c
+++ b/src/eog-thumb-view.c
@@ -45,9 +45,6 @@ enum {
#define EOG_THUMB_VIEW_SPACING 0
-#define EOG_THUMB_VIEW_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_THUMB_VIEW, EogThumbViewPrivate))
-
static void eog_thumb_view_init (EogThumbView *thumbview);
static EogImage* eog_thumb_view_get_image_from_path (EogThumbView *thumbview,
@@ -57,9 +54,6 @@ static void eog_thumb_view_popup_menu (EogThumbView *widget,
GdkEventButton *event);
static void eog_thumb_view_update_columns (EogThumbView *view);
-G_DEFINE_TYPE_WITH_CODE (EogThumbView, eog_thumb_view, GTK_TYPE_ICON_VIEW,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL));
-
static gboolean
thumbview_on_query_tooltip_cb (GtkWidget *widget,
gint x,
@@ -92,6 +86,10 @@ struct _EogThumbViewPrivate {
gulong image_removed_id;
};
+G_DEFINE_TYPE_WITH_CODE (EogThumbView, eog_thumb_view, GTK_TYPE_ICON_VIEW,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL) \
+ G_ADD_PRIVATE (EogThumbView));
+
/* Drag 'n Drop */
static void
@@ -236,8 +234,6 @@ eog_thumb_view_class_init (EogThumbViewClass *class)
g_object_class_override_property (gobject_class, PROP_ORIENTATION,
"orientation");
-
- g_type_class_add_private (class, sizeof (EogThumbViewPrivate));
}
static void
@@ -637,7 +633,7 @@ thumbview_on_query_tooltip_cb (GtkWidget *widget,
static void
eog_thumb_view_init (EogThumbView *thumbview)
{
- thumbview->priv = EOG_THUMB_VIEW_GET_PRIVATE (thumbview);
+ thumbview->priv = eog_thumb_view_get_instance_private (thumbview);
thumbview->priv->visible_range_changed_id = 0;
thumbview->priv->image_add_id = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]