Updating branch refs/heads/master to 8a0622fe986bc1f7798b71351db5617ff69b9ed5 (commit) from b68b07cb964ace117b34630712586bf92fe5e364 (commit)
commit 8a0622fe986bc1f7798b71351db5617ff69b9ed5 Author: Sean Davis <smd.seanda...@gmail.com> Date: Mon Aug 13 11:35:50 2012 -0400 Updated required dependency versions (bug #9197). Fix Plugin API docs building (bug #9196) README | 6 +++--- configure.ac.in | 8 ++++---- docs/plugin-api/Makefile.am | 2 +- docs/plugin-api/tmpl/parole-debug.sgml | 5 ++++- docs/plugin-api/tmpl/parole-enum-types.sgml | 7 +++++++ docs/plugin-api/tmpl/parole-file.sgml | 8 ++++++++ docs/plugin-api/tmpl/parole-filters.sgml | 8 ++++++++ docs/plugin-api/tmpl/parole-marshal.sgml | 3 +++ docs/plugin-api/tmpl/parole-pl-parser.sgml | 3 +++ docs/plugin-api/tmpl/parole-provider-player.sgml | 4 ++++ docs/plugin-api/tmpl/parole-provider-plugin.sgml | 3 +++ docs/plugin-api/tmpl/parole-stream.sgml | 3 +++ docs/plugin-api/tmpl/parole.sgml | 3 +++ docs/plugin-api/tmpl/stamp-enum-types.sgml | 3 +++ 14 files changed, 57 insertions(+), 9 deletions(-) diff --git a/README b/README index 494c613..4895a85 100644 --- a/README +++ b/README @@ -11,13 +11,13 @@ Required packages Parole depends on the following packages: - Gtk 2.20 or above. - - Glib 2.24 or above. + - Glib 2.32 or above. - Gio 2.16 or above. - DBus 0.60 or above. - DBus glib 0.70 or above. - - GStreamer: base, video, interface and GStreamer X, version 0.10.11 or above. + - GStreamer: base, video, interface and GStreamer X, version 0.10.24 or above. - libxfce4ui 4.8.0 or above. - - libxfce4util 4.8.0 or above + - libxfce4util 4.8.0 or above. How to report bugs? =================== diff --git a/configure.ac.in b/configure.ac.in index e3c19a4..8ca191e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -69,14 +69,14 @@ XDT_I18N([@LINGUAS@]) # Check for required packages # #=====================================================# m4_define([gtk_minimum_version], [2.20.0]) -m4_define([glib_minimum_version], [2.24.0]) -m4_define([gstreamer_minimum_version], [0.10.11]) +m4_define([glib_minimum_version], [2.32.0]) +m4_define([gstreamer_minimum_version], [0.10.24]) m4_define([dbus_minimum_version], [0.60]) m4_define([dbus_glib_minimum_version], [0.70]) -m4_define([libxfce4ui_minimum_version],[4.7.0]) -m4_define([libxfce4util_minimum_version],[4.6.0]) +m4_define([libxfce4ui_minimum_version],[4.8.0]) +m4_define([libxfce4util_minimum_version],[4.8.0]) m4_define([libnotify_minimum_version], [0.4.1]) diff --git a/docs/plugin-api/Makefile.am b/docs/plugin-api/Makefile.am index 26379f9..dd07724 100644 --- a/docs/plugin-api/Makefile.am +++ b/docs/plugin-api/Makefile.am @@ -17,7 +17,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting the functions and macros. # e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../../parole +DOC_SOURCE_DIR=../../src/misc # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" diff --git a/docs/plugin-api/tmpl/parole-debug.sgml b/docs/plugin-api/tmpl/parole-debug.sgml index efca9e3..4c6c03c 100644 --- a/docs/plugin-api/tmpl/parole-debug.sgml +++ b/docs/plugin-api/tmpl/parole-debug.sgml @@ -17,6 +17,9 @@ Parole Debug <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### MACRO PAROLE_DEBUG_ENUM ##### --> <para> @@ -61,6 +64,6 @@ Parole Debug @v_enum: @type: @format: -@Varargs: +@...: diff --git a/docs/plugin-api/tmpl/parole-enum-types.sgml b/docs/plugin-api/tmpl/parole-enum-types.sgml index 3e75993..c45ae5a 100644 --- a/docs/plugin-api/tmpl/parole-enum-types.sgml +++ b/docs/plugin-api/tmpl/parole-enum-types.sgml @@ -17,11 +17,15 @@ parole-enum-types <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### FUNCTION parole_media_type_get_type ##### --> <para> </para> +@void: @Returns: @@ -37,6 +41,7 @@ parole-enum-types </para> +@void: @Returns: @@ -52,6 +57,7 @@ parole-enum-types </para> +@void: @Returns: @@ -67,6 +73,7 @@ parole-enum-types </para> +@void: @Returns: diff --git a/docs/plugin-api/tmpl/parole-file.sgml b/docs/plugin-api/tmpl/parole-file.sgml index 9df6242..4d363bc 100644 --- a/docs/plugin-api/tmpl/parole-file.sgml +++ b/docs/plugin-api/tmpl/parole-file.sgml @@ -17,6 +17,9 @@ Simple file handling. <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ParoleFile ##### --> <para> @@ -28,6 +31,11 @@ Simple file handling. </para> +<!-- ##### ARG ParoleFile:directory ##### --> +<para> + +</para> + <!-- ##### ARG ParoleFile:display-name ##### --> <para> diff --git a/docs/plugin-api/tmpl/parole-filters.sgml b/docs/plugin-api/tmpl/parole-filters.sgml index 19706f0..6a807d3 100644 --- a/docs/plugin-api/tmpl/parole-filters.sgml +++ b/docs/plugin-api/tmpl/parole-filters.sgml @@ -17,11 +17,15 @@ Parole Filters <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### FUNCTION parole_get_supported_audio_filter ##### --> <para> </para> +@void: @Returns: @@ -30,6 +34,7 @@ Parole Filters </para> +@void: @Returns: @@ -38,6 +43,7 @@ Parole Filters </para> +@void: @Returns: @@ -46,6 +52,7 @@ Parole Filters </para> +@void: @Returns: @@ -54,6 +61,7 @@ Parole Filters </para> +@void: @Returns: diff --git a/docs/plugin-api/tmpl/parole-marshal.sgml b/docs/plugin-api/tmpl/parole-marshal.sgml index 4eb6295..ddbbf7d 100644 --- a/docs/plugin-api/tmpl/parole-marshal.sgml +++ b/docs/plugin-api/tmpl/parole-marshal.sgml @@ -17,6 +17,9 @@ parole-marshal <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### FUNCTION parole_marshal_VOID__OBJECT_ENUM ##### --> <para> diff --git a/docs/plugin-api/tmpl/parole-pl-parser.sgml b/docs/plugin-api/tmpl/parole-pl-parser.sgml index c9c2708..831dae6 100644 --- a/docs/plugin-api/tmpl/parole-pl-parser.sgml +++ b/docs/plugin-api/tmpl/parole-pl-parser.sgml @@ -17,6 +17,9 @@ Parole Playlist Parser <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### ENUM ParolePlFormat ##### --> <para> diff --git a/docs/plugin-api/tmpl/parole-provider-player.sgml b/docs/plugin-api/tmpl/parole-provider-player.sgml index c90cb6b..88cf7eb 100644 --- a/docs/plugin-api/tmpl/parole-provider-player.sgml +++ b/docs/plugin-api/tmpl/parole-provider-player.sgml @@ -19,6 +19,9 @@ playback status. <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ParoleProviderPlayerIface ##### --> <para> @@ -63,6 +66,7 @@ playback status. @PAROLE_STATE_STOPPED: @PAROLE_STATE_PLAYBACK_FINISHED: +@PAROLE_STATE_ABOUT_TO_FINISH: @PAROLE_STATE_PAUSED: @PAROLE_STATE_PLAYING: diff --git a/docs/plugin-api/tmpl/parole-provider-plugin.sgml b/docs/plugin-api/tmpl/parole-provider-plugin.sgml index 3a5c24d..fa87556 100644 --- a/docs/plugin-api/tmpl/parole-provider-plugin.sgml +++ b/docs/plugin-api/tmpl/parole-provider-plugin.sgml @@ -20,6 +20,9 @@ can use to get access to various functionalities of the player. <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ParoleProviderPluginIface ##### --> <para> diff --git a/docs/plugin-api/tmpl/parole-stream.sgml b/docs/plugin-api/tmpl/parole-stream.sgml index 9f11cff..7966c03 100644 --- a/docs/plugin-api/tmpl/parole-stream.sgml +++ b/docs/plugin-api/tmpl/parole-stream.sgml @@ -20,6 +20,9 @@ signal of the player, the plugin shouldn't take reference and all the properties <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### ENUM ParoleMediaType ##### --> <para> diff --git a/docs/plugin-api/tmpl/parole.sgml b/docs/plugin-api/tmpl/parole.sgml index ffc1863..8e57ffa 100644 --- a/docs/plugin-api/tmpl/parole.sgml +++ b/docs/plugin-api/tmpl/parole.sgml @@ -17,6 +17,9 @@ Parole <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### MACRO PAROLE_MAJOR_VERSION ##### --> <para> diff --git a/docs/plugin-api/tmpl/stamp-enum-types.sgml b/docs/plugin-api/tmpl/stamp-enum-types.sgml index 1d108b9..515350f 100644 --- a/docs/plugin-api/tmpl/stamp-enum-types.sgml +++ b/docs/plugin-api/tmpl/stamp-enum-types.sgml @@ -17,3 +17,6 @@ stamp-enum-types <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits