From c7b1d20fbd5f61d84dfc0e64b7abc3b3b7de6253 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Sun, 29 Jan 2012 23:30:24 -0800 Subject: [PATCH 2/2] glib: introspection fixes issues, don't expose PopplerAttachmentClass Fixes bug 45384. --- glib/poppler-action.h | 8 +++++++- glib/poppler-attachment.cc | 5 +++++ glib/poppler-attachment.h | 5 ----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/glib/poppler-action.h b/glib/poppler-action.h index 2a5d7f8..e63453a 100644 --- a/glib/poppler-action.h +++ b/glib/poppler-action.h @@ -184,7 +184,7 @@ struct _PopplerDest /** * PopplerActionLayer: * @action: a #PopplerActionLayerAction - * @layers: list of #PopplerLayers + * @layers: (element-type PopplerLayer): list of #PopplerLayers * * Action to perform over a list of layers */ @@ -260,6 +260,12 @@ struct _PopplerActionRendition PopplerMedia *media; }; +/** + * PopplerActionOCGState: + * @type: action type + * @title: action title + * @state_list: (element-type PopplerActionLayer): list of #PopplerActionLayer<-- -->s + */ struct _PopplerActionOCGState { PopplerActionType type; diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc index d07f1ab..474a9cc 100644 --- a/glib/poppler-attachment.cc +++ b/glib/poppler-attachment.cc @@ -38,6 +38,11 @@ struct _PopplerAttachmentPrivate Object *obj_stream; }; +typedef struct _PopplerAttachmentClass +{ + GObjectClass parent_class; +} PopplerAttachmentClass; + #define POPPLER_ATTACHMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), POPPLER_TYPE_ATTACHMENT, PopplerAttachmentPrivate)) static void poppler_attachment_dispose (GObject *obj); diff --git a/glib/poppler-attachment.h b/glib/poppler-attachment.h index e87971e..b6e7a27 100644 --- a/glib/poppler-attachment.h +++ b/glib/poppler-attachment.h @@ -66,11 +66,6 @@ struct _PopplerAttachment GString *checksum; }; -typedef struct _PopplerAttachmentClass -{ - GObjectClass parent_class; -} PopplerAttachmentClass; - GType poppler_attachment_get_type (void) G_GNUC_CONST; gboolean poppler_attachment_save (PopplerAttachment *attachment, -- 1.7.7.6