[poppler] 5 commits - glib/Makefile.am glib/poppler-annot.cc glib/poppler-attachment.h glib/poppler-form-field.cc glib/poppler-layer.cc
Carlos Garcia Campos
carlosgc at kemper.freedesktop.org
Sun Nov 25 03:37:05 PST 2012
glib/Makefile.am | 6 +++---
glib/poppler-annot.cc | 2 +-
glib/poppler-attachment.h | 2 +-
glib/poppler-form-field.cc | 10 +++++-----
glib/poppler-layer.cc | 12 ++++++------
5 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 703f85a10cf7ad61d2f2d3a5faf347fdddcb4738
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date: Sun Nov 25 12:36:33 2012 +0100
glib: Fix returns tag in PopplerAttachmentSaveFunc api doc
diff --git a/glib/poppler-attachment.h b/glib/poppler-attachment.h
index e87971e..ff8c849 100644
--- a/glib/poppler-attachment.h
+++ b/glib/poppler-attachment.h
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
* @error and return %FALSE, in which case poppler_attachment_save_to_callback()
* will fail with the same error.
*
- * @Returns: %TRUE if successful, %FALSE (with @error set) if failed.
+ * Returns: %TRUE if successful, %FALSE (with @error set) if failed.
*/
typedef gboolean (*PopplerAttachmentSaveFunc) (const gchar *buf,
gsize count,
commit 52896031783b28cee350ea92c8736e2c2e4e9d33
Author: José Aliste <jaliste at src.gnome.org>
Date: Mon Nov 19 23:47:19 2012 +0100
glib: Add missing ":" at the end of some functions documentation
New versions of gir-scanner emit a warning when the : at
the end of the function documentation is not found.
https://bugs.freedesktop.org/show_bug.cgi?id=56218
diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc
index 728e64b..1627d25 100644
--- a/glib/poppler-annot.cc
+++ b/glib/poppler-annot.cc
@@ -491,7 +491,7 @@ poppler_annot_get_modified (PopplerAnnot *poppler_annot)
}
/**
- * poppler_annot_get_flags
+ * poppler_annot_get_flags:
* @poppler_annot: a #PopplerAnnot
*
* Retrieves the flag field specifying various characteristics of the
diff --git a/glib/poppler-form-field.cc b/glib/poppler-form-field.cc
index 09f8be1..5687799 100644
--- a/glib/poppler-form-field.cc
+++ b/glib/poppler-form-field.cc
@@ -133,7 +133,7 @@ poppler_form_field_get_id (PopplerFormField *field)
}
/**
- * poppler_form_field_get_font_size
+ * poppler_form_field_get_font_size:
* @field: a #PopplerFormField
*
* Gets the font size of @field
@@ -149,7 +149,7 @@ poppler_form_field_get_font_size (PopplerFormField *field)
}
/**
- * poppler_form_field_is_read_only
+ * poppler_form_field_is_read_only:
* @field: a #PopplerFormField
*
* Checks whether @field is read only
@@ -195,7 +195,7 @@ poppler_form_field_get_action (PopplerFormField *field)
/* Button Field */
/**
- * poppler_form_field_button_get_button_type
+ * poppler_form_field_button_get_button_type:
* @field: a #PopplerFormField
*
* Gets the button type of @field
@@ -221,7 +221,7 @@ poppler_form_field_button_get_button_type (PopplerFormField *field)
}
/**
- * poppler_form_field_button_get_state
+ * poppler_form_field_button_get_state:
* @field: a #PopplerFormField
*
* Queries a #PopplerFormField and returns its current state. Returns %TRUE if
@@ -238,7 +238,7 @@ poppler_form_field_button_get_state (PopplerFormField *field)
}
/**
- * poppler_form_field_button_set_state
+ * poppler_form_field_button_set_state:
* @field: a #PopplerFormField
* @state: %TRUE or %FALSE
*
diff --git a/glib/poppler-layer.cc b/glib/poppler-layer.cc
index 8a481dd..4c6bf6e 100644
--- a/glib/poppler-layer.cc
+++ b/glib/poppler-layer.cc
@@ -92,7 +92,7 @@ _poppler_layer_new (PopplerDocument *document,
}
/**
- * poppler_layer_get_title
+ * poppler_layer_get_title:
* @layer: a #PopplerLayer
*
* Returns the name of the layer suitable for
@@ -111,7 +111,7 @@ poppler_layer_get_title (PopplerLayer *poppler_layer)
}
/**
- * poppler_layer_is_visible
+ * poppler_layer_is_visible:
* @layer: a #PopplerLayer
*
* Returns whether @layer is visible
@@ -129,7 +129,7 @@ poppler_layer_is_visible (PopplerLayer *poppler_layer)
}
/**
- * poppler_layer_show
+ * poppler_layer_show:
* @layer: a #PopplerLayer
*
* Shows @layer
@@ -160,7 +160,7 @@ poppler_layer_show (PopplerLayer *poppler_layer)
}
/**
- * poppler_layer_hide
+ * poppler_layer_hide:
* @layer: a #PopplerLayer
*
* Hides @layer. If @layer is the parent of other nested layers,
@@ -186,7 +186,7 @@ poppler_layer_hide (PopplerLayer *poppler_layer)
/**
- * poppler_layer_is_parent
+ * poppler_layer_is_parent:
* @layer: a #PopplerLayer
*
* Returns whether @layer is parent of other nested layers.
@@ -204,7 +204,7 @@ poppler_layer_is_parent (PopplerLayer *poppler_layer)
}
/**
- * poppler_layer_get_radio_button_group_id
+ * poppler_layer_get_radio_button_group_id:
* @layer: a #PopplerLayer
*
* Returns the numeric ID the radio button group associated with @layer.
commit 60dfc1a3471f824f40b0bef5b97a7b04bd78e72b
Author: Hib Eris <hib at hiberis.nl>
Date: Sat Oct 20 10:17:01 2012 +0200
glib: Exclude poppler-input-stream.h from introspection files
Fixes warning:
poppler-input-stream.h:28: Warning: Poppler: symbol='inputStreamBufSize': Unknown namespace for symbol 'inputStreamBufSize'
https://bugs.freedesktop.org/show_bug.cgi?id=56218
diff --git a/glib/Makefile.am b/glib/Makefile.am
index d3d65dc..4346c62 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -93,7 +93,7 @@ INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-introspection_files = $(filter-out poppler-private.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
+introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
Poppler-0.18.gir: libpoppler-glib.la
Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
commit c84753e12029fcc6113f80dedc9a943ce1deb214
Author: Hib Eris <hib at hiberis.nl>
Date: Sat Oct 20 09:40:09 2012 +0200
glib: Include Gio-2.0 for introspection
Fixes g-ir-scanner warnings:
poppler-document.cc:257: Warning: Poppler: poppler_document_new_from_stream: argument stream: Unresolved type: 'GInputStream*'
poppler-document.cc:257: Warning: Poppler: poppler_document_new_from_stream: argument cancellable: Unresolved type: 'GCancellable*'
poppler-document.cc:315: Warning: Poppler: poppler_document_new_from_gfile: argument file: Unresolved type: 'GFile*'
poppler-document.cc:315: Warning: Poppler: poppler_document_new_from_gfile: argument cancellable: Unresolved type: 'GCancellable*'
https://bugs.freedesktop.org/show_bug.cgi?id=56218
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 534a48e..d3d65dc 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -95,7 +95,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
introspection_files = $(filter-out poppler-private.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
Poppler-0.18.gir: libpoppler-glib.la
-Poppler_0_18_gir_INCLUDES = GObject-2.0 cairo-1.0
+Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
Poppler_0_18_gir_LIBS = libpoppler-glib.la
Poppler_0_18_gir_FILES = $(introspection_files)
commit 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c
Author: Hib Eris <hib at hiberis.nl>
Date: Sat Oct 20 09:30:05 2012 +0200
glib: Show all suppressed introspection scanner warnings
https://bugs.freedesktop.org/show_bug.cgi?id=56218
diff --git a/glib/Makefile.am b/glib/Makefile.am
index f1a8b7a..534a48e 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -90,7 +90,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
introspection_files = $(filter-out poppler-private.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
More information about the poppler
mailing list