From 1feffa2b7fba6bab62fe044777dad6e3278e848b Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 9 Dec 2014 11:47:09 +0100 Subject: Do not cache layers in the backends se g_object_set_data instead, to attach the backend object to the evince layer. Based on evince commit: 08993c59369086fa8916236f580438d656ccb8f7 From: Carlos Garcia Campos --- libdocument/ev-layer.c | 17 +++-------------- libdocument/ev-layer.h | 4 +--- 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'libdocument') diff --git a/libdocument/ev-layer.c b/libdocument/ev-layer.c index cb86cca4..cb735164 100644 --- a/libdocument/ev-layer.c +++ b/libdocument/ev-layer.c @@ -22,9 +22,8 @@ #include "ev-layer.h" struct _EvLayerPrivate { - guint id; - gboolean is_parent; - gint rb_group; + gboolean is_parent; + gint rb_group; }; #define EV_LAYER_GET_PRIVATE(object) \ @@ -47,28 +46,18 @@ ev_layer_init (EvLayer *layer) } EvLayer * -ev_layer_new (guint layer_id, - gboolean is_parent, +ev_layer_new (gboolean is_parent, gint rb_group) { EvLayer *layer; layer = EV_LAYER (g_object_new (EV_TYPE_LAYER, NULL)); - layer->priv->id = layer_id; layer->priv->is_parent = is_parent; layer->priv->rb_group = rb_group; return layer; } -guint -ev_layer_get_id (EvLayer *layer) -{ - g_return_val_if_fail (EV_IS_LAYER (layer), 0); - - return layer->priv->id; -} - gboolean ev_layer_is_parent (EvLayer *layer) { diff --git a/libdocument/ev-layer.h b/libdocument/ev-layer.h index f87c9e08..656d2994 100644 --- a/libdocument/ev-layer.h +++ b/libdocument/ev-layer.h @@ -50,10 +50,8 @@ struct _EvLayerClass { }; GType ev_layer_get_type (void) G_GNUC_CONST; -EvLayer *ev_layer_new (guint layer_id, - gboolean is_parent, +EvLayer *ev_layer_new (gboolean is_parent, gint rb_group); -guint ev_layer_get_id (EvLayer *layer); gboolean ev_layer_is_parent (EvLayer *layer); gint ev_layer_get_rb_group (EvLayer *layer); -- cgit v1.2.1