[libdocument] Fix interface properties handling in derived classes

diff --git a/libdocument/ev-annotation.c b/libdocument/ev-annotation.c
index f7acc0bfec50542bed7cdf5d26f7d94da1060985..a0433ee2361509f7b3d349a750ebdb7260214e73 100644 (file)
--- 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)
@@ -782,11 +780,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 +891,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 +913,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 +932,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",