[poppler] 2 commits - glib/poppler-media.h glib/poppler-movie.h

[Carlos Garcia Campos]

 glib/poppler-media.h |   28 ++++++++++++++++++++++------
 glib/poppler-movie.h |    6 +++---
 2 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 166b78c0ce8a4536873c4f60b392c24c8a68e7aa
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Thu Jul 1 17:25:03 2010 +0200

    [glib] docs: document PopplerMediaSaveFunc

diff --git a/glib/poppler-media.h b/glib/poppler-media.h
index 7d97030..755695a 100644
--- a/glib/poppler-media.h
+++ b/glib/poppler-media.h
@@ -29,7 +29,23 @@ G_BEGIN_DECLS
 #define POPPLER_MEDIA(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), POPPLER_TYPE_MEDIA, PopplerMedia))
 #define POPPLER_IS_MEDIA(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), POPPLER_TYPE_MEDIA))
 
-// FIXME: this should be generic (PopplerSaveFunc)
+// FIXME: this should be generic (PopplerSaveToCallbackFunc)
+/**
+ * PopplerMediaSaveFunc:
+ * @buf: buffer containing bytes to be written.
+ * @count: number of bytes in @buf.
+ * @data: user data passed to poppler_media_save_to_callback()
+ * @error: GError to set on error, or NULL
+ *
+ * Specifies the type of the function passed to
+ * poppler_media_save_to_callback().  It is called once for each block of
+ * bytes that is "written" by poppler_media_save_to_callback().  If
+ * successful it should return %TRUE.  If an error occurs it should set
+ * @error and return %FALSE, in which case poppler_media_save_to_callback()
+ * will fail with the same error.
+ *
+ * Returns: %TRUE if successful, %FALSE (with @error set) if failed.
+ */
 typedef gboolean (*PopplerMediaSaveFunc) (const gchar  *buf,
 					  gsize         count,
 					  gpointer      data,
commit 5cc0a51f88580c65ac2d5c6ff02b8cf14697b70c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Thu Jul 1 17:20:13 2010 +0200

    [glib] Use the same name for parameter in function prototype

diff --git a/glib/poppler-media.h b/glib/poppler-media.h
index 42c88ee..7d97030 100644
--- a/glib/poppler-media.h
+++ b/glib/poppler-media.h
@@ -36,13 +36,13 @@ typedef gboolean (*PopplerMediaSaveFunc) (const gchar  *buf,
 					  GError      **error);
 
 GType        poppler_media_get_type         (void) G_GNUC_CONST;
-gboolean     poppler_media_is_embedded      (PopplerMedia        *media);
-const gchar *poppler_media_get_filename     (PopplerMedia        *media);
-const gchar *poppler_media_get_mime_type    (PopplerMedia        *media);
-gboolean     poppler_media_save             (PopplerMedia        *media,
+gboolean     poppler_media_is_embedded      (PopplerMedia        *poppler_media);
+const gchar *poppler_media_get_filename     (PopplerMedia        *poppler_media);
+const gchar *poppler_media_get_mime_type    (PopplerMedia        *poppler_media);
+gboolean     poppler_media_save             (PopplerMedia        *poppler_media,
 					     const char          *filename,
 					     GError             **error);
-gboolean     poppler_media_save_to_callback (PopplerMedia        *media,
+gboolean     poppler_media_save_to_callback (PopplerMedia        *poppler_media,
 					     PopplerMediaSaveFunc save_func,
 					     gpointer             user_data,
 					     GError             **error);
diff --git a/glib/poppler-movie.h b/glib/poppler-movie.h
index 0ff7878..9e1bc32 100644
--- a/glib/poppler-movie.h
+++ b/glib/poppler-movie.h
@@ -32,9 +32,9 @@ G_BEGIN_DECLS
 
 
 GType        poppler_movie_get_type      (void) G_GNUC_CONST;
-const gchar *poppler_movie_get_filename  (PopplerMovie *movie);
-gboolean     poppler_movie_need_poster   (PopplerMovie *movie);
-gboolean     poppler_movie_show_controls (PopplerMovie *movie);
+const gchar *poppler_movie_get_filename  (PopplerMovie *poppler_movie);
+gboolean     poppler_movie_need_poster   (PopplerMovie *poppler_movie);
+gboolean     poppler_movie_show_controls (PopplerMovie *poppler_movie);
 
 G_END_DECLS