diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2010-07-25 10:48:55 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2010-07-25 10:50:36 (GMT) |
| commit | 03887c145d9614a0ca83f81d359a1e86b13b06c5 (patch) | |
| tree | a7da34ff27c265a0d9db215a6e1b9cdbedf96dd4 /libdocument | |
| parent | aeadd8e191190c43e94999fef077ebea69e966c9 (diff) | |
[libdocument] Fix interface properties handling in derived classes
Diffstat (limited to 'libdocument')
| -rw-r--r-- | libdocument/ev-annotation.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/libdocument/ev-annotation.c b/libdocument/ev-annotation.c index f7acc0b..a0433ee 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) @@ -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", |