X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2Fev-annotation.c;h=e215fdfbda7538a24a12181822d1b7c7f567f68a;hb=f4dd355fb0ec24f49be5d8d4321ceeeb9088fd90;hp=f7acc0bfec50542bed7cdf5d26f7d94da1060985;hpb=584f014b63c56fe3770cba9682fc21c31e09a2e9;p=evince.git

diff --git a/libdocument/ev-annotation.c b/libdocument/ev-annotation.c
index f7acc0bf..e215fdfb 100644
--- a/libdocument/ev-annotation.c
+++ b/libdocument/ev-annotation.c
@@ -93,15 +93,13 @@ enum {
 
 /* EvAnnotationText */
 enum {
-	PROP_TEXT_0,
-	PROP_TEXT_ICON,
+	PROP_TEXT_ICON = PROP_MARKUP_POPUP_IS_OPEN + 1,
 	PROP_TEXT_IS_OPEN
 };
 
 /* EvAnnotationAttachment */
 enum {
-	PROP_ATTACHMENT_0,
-	PROP_ATTACHMENT_ATTACHMENT
+	PROP_ATTACHMENT_ATTACHMENT = PROP_MARKUP_POPUP_IS_OPEN + 1
 };
 
 G_DEFINE_ABSTRACT_TYPE (EvAnnotation, ev_annotation, G_TYPE_OBJECT)
@@ -745,6 +743,11 @@ ev_annotation_text_set_property (GObject      *object,
 {
 	EvAnnotationText *annot = EV_ANNOTATION_TEXT (object);
 
+	if (prop_id < PROP_ATTACHMENT_ATTACHMENT) {
+		ev_annotation_markup_set_property (object, prop_id, value, pspec);
+		return;
+	}
+
 	switch (prop_id) {
 	case PROP_TEXT_ICON:
 		ev_annotation_text_set_icon (annot, g_value_get_enum (value));
@@ -765,6 +768,11 @@ ev_annotation_text_get_property (GObject    *object,
 {
 	EvAnnotationText *annot = EV_ANNOTATION_TEXT (object);
 
+	if (prop_id < PROP_ATTACHMENT_ATTACHMENT) {
+		ev_annotation_markup_get_property (object, prop_id, value, pspec);
+		return;
+	}
+
 	switch (prop_id) {
 	case PROP_TEXT_ICON:
 		g_value_set_enum (value, annot->icon);
@@ -782,11 +790,11 @@ ev_annotation_text_class_init (EvAnnotationTextClass *klass)
 {
 	GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
 
+	ev_annotation_markup_class_install_properties (g_object_class);
+
 	g_object_class->set_property = ev_annotation_text_set_property;
 	g_object_class->get_property = ev_annotation_text_get_property;
 
-	ev_annotation_markup_class_install_properties (g_object_class);
-
 	g_object_class_install_property (g_object_class,
 					 PROP_TEXT_ICON,
 					 g_param_spec_enum ("icon",
@@ -893,6 +901,11 @@ ev_annotation_attachment_set_property (GObject      *object,
 {
 	EvAnnotationAttachment *annot = EV_ANNOTATION_ATTACHMENT (object);
 
+	if (prop_id < PROP_ATTACHMENT_ATTACHMENT) {
+		ev_annotation_markup_set_property (object, prop_id, value, pspec);
+		return;
+	}
+
 	switch (prop_id) {
 	case PROP_ATTACHMENT_ATTACHMENT:
 		ev_annotation_attachment_set_attachment (annot, g_value_get_object (value));
@@ -910,6 +923,11 @@ ev_annotation_attachment_get_property (GObject    *object,
 {
 	EvAnnotationAttachment *annot = EV_ANNOTATION_ATTACHMENT (object);
 
+	if (prop_id < PROP_ATTACHMENT_ATTACHMENT) {
+		ev_annotation_markup_get_property (object, prop_id, value, pspec);
+		return;
+	}
+
 	switch (prop_id) {
 	case PROP_ATTACHMENT_ATTACHMENT:
 		g_value_set_object (value, annot->attachment);
@@ -924,12 +942,12 @@ ev_annotation_attachment_class_init (EvAnnotationAttachmentClass *klass)
 {
 	GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
 
+	ev_annotation_markup_class_install_properties (g_object_class);
+
 	g_object_class->set_property = ev_annotation_attachment_set_property;
 	g_object_class->get_property = ev_annotation_attachment_get_property;
 	g_object_class->finalize = ev_annotation_attachment_finalize;
 
-	ev_annotation_markup_class_install_properties (g_object_class);
-
 	g_object_class_install_property (g_object_class,
 					 PROP_ATTACHMENT_ATTACHMENT,
 					 g_param_spec_object ("attachment",