Hello community, here is the log from the commit of package grilo for openSUSE:Factory checked in at 2013-04-02 20:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo (Old) and /work/SRC/openSUSE:Factory/.grilo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grilo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grilo/grilo.changes 2013-01-07 15:16:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grilo.new/grilo.changes 2013-04-02 20:31:24.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Mar 19 19:38:23 UTC 2013 - [email protected] + +- Update to version 0.2.5: + + Fixed compilation problem with gcc 4.2. + + Removed some warnings. + + Several changes in test-ui + + Bugs fixed: bgo#689577, bgo#690612, bgo#690613, bgo#692118, + bgo#692873, bgo#694390. + +------------------------------------------------------------------- Old: ---- grilo-0.2.4.tar.xz New: ---- grilo-0.2.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.4sbLuW/_old 2013-04-02 20:31:25.000000000 +0200 +++ /var/tmp/diff_new_pack.4sbLuW/_new 2013-04-02 20:31:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package grilo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: grilo -Version: 0.2.4 +Version: 0.2.5 Release: 0 Summary: Framework for browsing and searching media content License: LGPL-2.1+ ++++++ grilo-0.2.4.tar.xz -> grilo-0.2.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/AUTHORS new/grilo-0.2.5/AUTHORS --- old/grilo-0.2.4/AUTHORS 2012-11-30 16:11:35.000000000 +0100 +++ new/grilo-0.2.5/AUTHORS 2013-03-19 12:51:52.000000000 +0100 @@ -1,3 +1,4 @@ +Bastien Nocera <[email protected]> Damien Lespiau <[email protected]> Guillaume Emont <[email protected]> Iago Toral Quiroga <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/ChangeLog new/grilo-0.2.5/ChangeLog --- old/grilo-0.2.4/ChangeLog 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/ChangeLog 2013-03-19 13:09:56.000000000 +0100 @@ -1,3 +1,215 @@ +commit 1c2a33adb18d25b9214c3a9859e72bf3bc01af0d +Author: Mike Ruprecht <[email protected]> +Date: Thu Feb 21 15:39:28 2013 -0600 + + core: Fix double-free protection assert when unloading a plugin twice + + When calling g_module_close() twice on the same module, it throws a + g_return_if_fail() assertion stating ref_count > 0 fails. It's + effectively like g_object_unref(). + + This patch prevents g_module_close() being called twice on the same + module by unsetting it from the plugin instance when closing it + in grl_registry_unload_plugin(). + + https://bugzilla.gnome.org/show_bug.cgi?id=694390 + + src/grl-registry.c | 1 + + 1 file changed, 1 insertion(+) + +commit 2958b268b7fbffaf70740856784913b252f13527 +Author: Juan A. Suarez Romero <[email protected]> +Date: Thu Feb 7 12:36:49 2013 +0000 + + core: Check options when decorating a media + + When decorating a media (adding missing keys in content from browse/search + operations), make sure that the source involved in decoration gets the proper + supported options. + + src/grl-source.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 6dfc79c20bf33f0df483452ae6a4bd0f757177e9 +Author: Juan A. Suarez Romero <[email protected]> +Date: Wed Jan 30 18:52:42 2013 +0100 + + core: Skip browsed source from resolvable sources + + When a key cannot be solved in a browse/search operation, we ask other + sources that implement resolve() and that can be solve that key to get + its value (only when GRL_RESOLVE_FULL is true). + + But it can happen that the key is supported by the source in the + browse/search operation, only that for the result it doesn't have a + value. Thus, when looking for sources implementing resolve() for that + key, we need to skip the browsed source, as we know it doesn't have a + value for the key. + + src/grl-source.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a719f69707f4031917d98458966156ad12ac7d7e +Author: Mike Ruprecht <[email protected]> +Date: Wed Jan 30 06:29:03 2013 -0600 + + grl-source: Fix leak of GrlOperationOptions in _get_media_from_uri() + + https://bugzilla.gnome.org/show_bug.cgi?id=692873 + + src/grl-source.c | 1 + + 1 file changed, 1 insertion(+) + +commit e02a934699535e1b6eed5f6ca2fd3bd5a75f3aa1 +Author: Juan A. Suarez Romero <[email protected]> +Date: Wed Jan 23 18:56:17 2013 +0000 + + core: Try next source if previous couldn't resolve a key + + The code was almost correct: there was a comment saying "try next source", but + seems we forgot to execute the "get next source". + + src/grl-source.c | 1 + + 1 file changed, 1 insertion(+) + +commit 6272f77a076f965835dba7776b5c08ec90199f58 +Author: Nuno Araujo <[email protected]> +Date: Sat Jan 19 11:26:16 2013 +0100 + + build: Fix the build with automake 1.13 + + In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated + since 2002) has been removed in favour of AC_CONFIG_HEADERS. + + https://bugzilla.gnome.org/show_bug.cgi?id=692118 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d4cdd7edc2233c8753189b16f87bec3569ec3ec +Author: Juan A. Suarez Romero <[email protected]> +Date: Tue Jan 15 11:42:19 2013 +0000 + + net: SoupRequester is deprecated for libsoup >= 2.41.3 + + Use SoupSession instead. + + configure.ac | 6 ++++++ + libs/net/Makefile.am | 5 +++++ + libs/net/grl-net-private.h | 2 ++ + libs/net/grl-net-soup-unstable.c | 17 ++++++++++++++++- + 4 files changed, 29 insertions(+), 1 deletion(-) + +commit 68a5d15c86d99393c173fe3254fcc4d7a228bdd7 +Author: Juan A. Suarez Romero <[email protected]> +Date: Tue Jan 15 10:59:57 2013 +0000 + + grl-inspect: Fix a couple of warnings + + Use void parameter for non-parametrized functions. + + tools/grilo-inspect/grl-inspect.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 75380838229a1dbb0e504bb96b2bd550349599a9 +Author: Juan A. Suarez Romero <[email protected]> +Date: Sat Jan 5 19:41:02 2013 +0100 + + test-ui: Show multi-valued elements + + For all the keys with several values, show all them separated by comma. + + tools/grilo-test-ui/main.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +commit 057b849c9659534ff51c7a0597815eb174013fd8 +Author: Bastien Nocera <[email protected]> +Date: Fri Dec 21 14:49:47 2012 +0100 + + core: Downgrade init failure to a debug statement + + It's quite common for plugin load to fail when it lacks the + necessary API keys, especially when the plugin type isn't + supported by the application. + + Eg. we don't want Totem to warn if it cannot load the Flickr + plugin that it will not be using. + + https://bugzilla.gnome.org/show_bug.cgi?id=690613 + + Signed-off-by: Juan A. Suarez Romero <[email protected]> + + src/grl-registry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b3529dd4212043b2fb962410e414f65e76cdcdbb +Author: Bastien Nocera <[email protected]> +Date: Fri Dec 21 14:39:45 2012 +0100 + + core: Explain why module could not be loaded + + Note that g_module_error() already contains the filename that + failed to be loaded. + + https://bugzilla.gnome.org/show_bug.cgi?id=690612 + + src/grl-registry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d72ae5c147bd8cbce04a156d210b9e370c91277 +Author: Juan A. Suarez Romero <[email protected]> +Date: Sun Dec 16 12:42:42 2012 +0000 + + test-ui: Allow filtering by type in any source + + Allows to select the kind of desired content for any source and operation. + + If the source or operation can't filter the content, then it will be ignored + and all content retrieved. + + tools/grilo-test-ui/main.c | 116 +++++++++++++++----------------------------- + 1 file changed, 40 insertions(+), 76 deletions(-) + +commit 4cec1fd081cd4c9d0d501ab70f9f8d55a4918795 +Author: Juan A. Suarez Romero <[email protected]> +Date: Sun Dec 16 12:39:10 2012 +0000 + + test-ui: Fix some warnings + + tools/grilo-test-ui/main.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f3917fa0a40ce257874947c38a42a49685c0b656 +Author: Juan A. Suarez Romero <[email protected]> +Date: Wed Dec 5 17:27:34 2012 +0000 + + core: Notify when an operation is performed over invalid operation_id + + It is actually done, but no message is actually shown to developer. + + src/grl-operation.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit ad073a62533df5782ba231e282399806d998eff0 +Author: Evan Nemerson <[email protected]> +Date: Mon Dec 3 15:39:03 2012 -0800 + + build: fix passing arguments to gnome-autogen.sh from autogen.sh + + https://bugzilla.gnome.org/show_bug.cgi?id=689577 + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b994ca21a5e441d6a86dd65495cc9c5774263ac2 +Author: Juan A. Suarez Romero <[email protected]> +Date: Fri Nov 30 16:52:39 2012 +0100 + + Post-release version bump to 0.2.5 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit cddf75e3ca028dcada3e0029a5de4787ef027f9e Author: Juan A. Suarez Romero <[email protected]> Date: Fri Nov 30 15:17:37 2012 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/NEWS new/grilo-0.2.5/NEWS --- old/grilo-0.2.4/NEWS 2012-11-30 16:16:13.000000000 +0100 +++ new/grilo-0.2.5/NEWS 2013-03-19 13:05:42.000000000 +0100 @@ -1,3 +1,27 @@ +NEW in 0.2.5 +============ + + * Fixed compilation problem with gcc 4.2 + * Removed some warnings + * Several changes in test-ui + * Add filtering by type + * Print multi-valued elements + * Several fixes, including: + * BGO#689577 - autogen.sh does not pass all arguments correctly to gnome-autogen.sh + * BGO#690612 - grilo: Explain why module could not be loaded + * BGO#690613 - grilo: Downgrade init failure to a debug statement + * BGO#692118 - [PATCH] Fix build with automake 1.13 + * BGO#692873 - GrlOperationOptions leaked in grl_source_get_media_from_uri() + * BGO#694390 - Assertion when calling grl_registry_unload_plugin() twice + + * Contributors to this release: + * Bastien Nocera <[email protected]> + * Evan Nemerson <[email protected]> + * Juan A. Suarez Romero <[email protected]> + * Mike Ruprecht <[email protected]> + * Nuno Araujo <[email protected]> + + NEW in 0.2.4 ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/aclocal.m4 new/grilo-0.2.5/aclocal.m4 --- old/grilo-0.2.4/aclocal.m4 2012-11-30 16:17:47.000000000 +0100 +++ new/grilo-0.2.5/aclocal.m4 2013-03-19 13:08:19.000000000 +0100 @@ -416,18 +416,6 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/configure new/grilo-0.2.5/configure --- old/grilo-0.2.4/configure 2012-11-30 16:17:47.000000000 +0100 +++ new/grilo-0.2.5/configure 2013-03-19 13:08:20.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for grilo 0.2.4. +# Generated by GNU Autoconf 2.69 for grilo 0.2.5. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='grilo' PACKAGE_TARNAME='grilo' -PACKAGE_VERSION='0.2.4' -PACKAGE_STRING='grilo 0.2.4' +PACKAGE_VERSION='0.2.5' +PACKAGE_STRING='grilo 0.2.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=grilo;component=core' PACKAGE_URL='http://live.gnome.org/Grilo' @@ -674,6 +674,8 @@ VALA_CFLAGS ENABLE_TESTS_FALSE ENABLE_TESTS_TRUE +BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_FALSE +BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_TRUE BUILD_GRILO_NET_WITH_CACHE_FALSE BUILD_GRILO_NET_WITH_CACHE_TRUE BUILD_GRILO_NET_FALSE @@ -1401,7 +1403,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures grilo 0.2.4 to adapt to many kinds of systems. +\`configure' configures grilo 0.2.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1471,7 +1473,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of grilo 0.2.4:";; + short | recursive ) echo "Configuration of grilo 0.2.5:";; esac cat <<\_ACEOF @@ -1608,7 +1610,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -grilo configure 0.2.4 +grilo configure 0.2.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1886,7 +1888,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by grilo $as_me 0.2.4, which was +It was created by grilo $as_me 0.2.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2702,7 +2704,7 @@ # Define the identity of the package. PACKAGE='grilo' - VERSION='0.2.4' + VERSION='0.2.5' cat >>confdefs.h <<_ACEOF @@ -11594,8 +11596,8 @@ # Libtool library version, not to confuse with API version # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html -GRL_LT_VERSION=3:1:2 -GRLNET_LT_VERSION=1:2:1 +GRL_LT_VERSION=3:2:2 +GRLNET_LT_VERSION=1:3:1 @@ -12267,6 +12269,18 @@ else HAVE_CACHED_LIBSOUP=no fi + +if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.41.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.41.3") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + HAVE_LIBSOUP_REQUESTER_DEPRECATED=yes +else + HAVE_LIBSOUP_REQUESTER_DEPRECATED=no +fi + # Check whether --enable-grl_net was given. if test "${enable_grl_net+set}" = set; then : enableval=$enable_grl_net; @@ -12300,6 +12314,14 @@ BUILD_GRILO_NET_WITH_CACHE_FALSE= fi + if test "x$HAVE_LIBSOUP_REQUESTER_DEPRECATED" = "xyes"; then + BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_TRUE= + BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_FALSE='#' +else + BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_TRUE='#' + BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_FALSE= +fi + # ---------------------------------------------------------- # DEBUG SUPPORT @@ -12834,31 +12856,11 @@ # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - -$GTKDOC_DEPS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details" "$LINENO" 5; } + : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -13208,6 +13210,10 @@ as_fn_error $? "conditional \"BUILD_GRILO_NET_WITH_CACHE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_TRUE}" && test -z "${BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_FALSE}"; then + as_fn_error $? "conditional \"BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13637,7 +13643,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by grilo $as_me 0.2.4, which was +This file was extended by grilo $as_me 0.2.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13704,7 +13710,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -grilo config.status 0.2.4 +grilo config.status 0.2.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/configure.ac new/grilo-0.2.5/configure.ac --- old/grilo-0.2.4/configure.ac 2012-11-30 16:09:26.000000000 +0100 +++ new/grilo-0.2.5/configure.ac 2013-03-19 12:49:31.000000000 +0100 @@ -9,7 +9,7 @@ m4_define([prj_gir_name], [Grilo]) m4_define([grl_major_version], [0]) m4_define([grl_minor_version], [2]) -m4_define([grl_micro_version], [4]) +m4_define([grl_micro_version], [5]) m4_define([prj_version], grl_major_version.grl_minor_version.grl_micro_version) AC_INIT([prj_name], @@ -23,7 +23,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src]) -AM_CONFIG_HEADER(src/config.h) +AC_CONFIG_HEADERS([src/config.h]) AC_PROG_CC AC_PROG_INSTALL @@ -50,8 +50,8 @@ # Libtool library version, not to confuse with API version # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html -GRL_LT_VERSION=3:1:2 -GRLNET_LT_VERSION=1:2:1 +GRL_LT_VERSION=3:2:2 +GRLNET_LT_VERSION=1:3:1 AC_SUBST([GRL_LT_VERSION]) AC_SUBST([GRLNET_LT_VERSION]) @@ -162,6 +162,11 @@ PKG_CHECK_EXISTS([libsoup-2.4 >= 2.33.4], [HAVE_CACHED_LIBSOUP=yes], [HAVE_CACHED_LIBSOUP=no]) + +PKG_CHECK_EXISTS([libsoup-2.4 >= 2.41.3], + [HAVE_LIBSOUP_REQUESTER_DEPRECATED=yes], + [HAVE_LIBSOUP_REQUESTER_DEPRECATED=no]) + AC_ARG_ENABLE([grl_net], AS_HELP_STRING([--enable-grl-net], [Enable Grilo Net library (default: auto)]), @@ -180,6 +185,7 @@ AM_CONDITIONAL(BUILD_GRILO_NET, test "x$HAVE_LIBSOUP" = "xyes") AM_CONDITIONAL(BUILD_GRILO_NET_WITH_CACHE, test "x$HAVE_CACHED_LIBSOUP" = "xyes") +AM_CONDITIONAL(BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER, test "x$HAVE_LIBSOUP_REQUESTER_DEPRECATED" = "xyes") # ---------------------------------------------------------- # DEBUG SUPPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/GrlOperationOptions.html new/grilo-0.2.5/doc/grilo/html/GrlOperationOptions.html --- old/grilo-0.2.4/doc/grilo/html/GrlOperationOptions.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/GrlOperationOptions.html 2013-03-19 13:09:55.000000000 +0100 @@ -569,7 +569,7 @@ <p> </p> <div class="example"> -<a name="id2973752"></a><p class="title"><b>Example 1. </b></p> +<a name="id3017020"></a><p class="title"><b>Example 1. </b></p> <div class="example-contents"> Elements from album "Frozen" with a bitrate of 256kbs. <pre class="programlisting"> @@ -617,7 +617,7 @@ <p> </p> <div class="example"> -<a name="id2981451"></a><p class="title"><b>Example 2. </b></p> +<a name="id3024786"></a><p class="title"><b>Example 2. </b></p> <div class="example-contents"> Album must start with "T" and the bitrate should be 256kbs or greater. <pre class="programlisting"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/annotation-glossary.html new/grilo-0.2.5/doc/grilo/html/annotation-glossary.html --- old/grilo-0.2.4/doc/grilo/html/annotation-glossary.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/annotation-glossary.html 2013-03-19 13:09:55.000000000 +0100 @@ -36,9 +36,9 @@ | <a class="shortcut" href="#glsT">T</a> | - <a class="shortcut" href="#glsS">S</a> - | <a class="shortcut" href="#glsO">O</a> + | + <a class="shortcut" href="#glsS">S</a> </td></tr> </table> <div class="glossary"> @@ -82,14 +82,14 @@ <dt> <a name="annotation-glossterm-type"></a>type</dt> <dd><p>Override the parsed C type with given type.</p></dd> -<a name="glsS"></a><h3 class="title">S</h3> -<dt> -<a name="annotation-glossterm-scope%20notified"></a>scope notified</dt> -<dd><p>The callback is valid until the GDestroyNotify argument is called.</p></dd> <a name="glsO"></a><h3 class="title">O</h3> <dt> <a name="annotation-glossterm-out%20callee-allocates"></a>out callee-allocates</dt> <dd><p>Out parameter, where caller must allocate storage.</p></dd> +<a name="glsS"></a><h3 class="title">S</h3> +<dt> +<a name="annotation-glossterm-scope%20notified"></a>scope notified</dt> +<dd><p>The callback is valid until the GDestroyNotify argument is called.</p></dd> </div> <div class="footer"> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/ch01.html new/grilo-0.2.5/doc/grilo/html/ch01.html --- old/grilo-0.2.4/doc/grilo/html/ch01.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/ch01.html 2013-03-19 13:09:55.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2891079"></a>Quick start guide</h2></div></div></div> +<a name="id2921161"></a>Quick start guide</h2></div></div></div> <div class="toc"><dl> <dt><span class="section"><a href="ch01.html#quick-start"></a></span></dt> <dd><dl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/ch02.html new/grilo-0.2.5/doc/grilo/html/ch02.html --- old/grilo-0.2.4/doc/grilo/html/ch02.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/ch02.html 2013-03-19 13:09:55.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2898039"></a>Environment Setup</h2></div></div></div> +<a name="id2929795"></a>Environment Setup</h2></div></div></div> <div class="toc"><dl> <dt><span class="section"><a href="ch02.html#environment-setup"></a></span></dt> <dd><dl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/ch03.html new/grilo-0.2.5/doc/grilo/html/ch03.html --- old/grilo-0.2.4/doc/grilo/html/ch03.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/ch03.html 2013-03-19 13:09:56.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2877546"></a>Writing applications with Grilo</h2></div></div></div> +<a name="id2911885"></a>Writing applications with Grilo</h2></div></div></div> <div class="toc"><dl> <dt><span class="section"><a href="ch03.html#writing-apps"></a></span></dt> <dd><dl> @@ -308,7 +308,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h4 class="title"> -<a name="id2930619"></a>Metadata keys</h4></div></div></div> +<a name="id2978024"></a>Metadata keys</h4></div></div></div> <p> Metadata keys identify pieces of information (metadata). They are often an input parameter for many operations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/ch04.html new/grilo-0.2.5/doc/grilo/html/ch04.html --- old/grilo-0.2.4/doc/grilo/html/ch04.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/ch04.html 2013-03-19 13:09:55.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2882557"></a>Writing plugins for Grilo</h2></div></div></div> +<a name="id2940456"></a>Writing plugins for Grilo</h2></div></div></div> <div class="toc"><dl> <dt><span class="section"><a href="ch04.html#writing-plugins"></a></span></dt> <dd><dl> @@ -1449,7 +1449,7 @@ </p> <div class="section"> <div class="titlepage"><div><div><h5 class="title"> -<a name="id2851716"></a>Simulating Network Replies</h5></div></div></div> +<a name="id2974682"></a>Simulating Network Replies</h5></div></div></div> <p> For offline testing of plug-ins, particularly in automated tests, it is useful to simulate and return predefined network replies. Therefore, Grilo @@ -1478,7 +1478,7 @@ </p> <div class="section"> <div class="titlepage"><div><div><h6 class="title"> -<a name="id2910454"></a>The Default Section</h6></div></div></div> +<a name="id2974721"></a>The Default Section</h6></div></div></div> <p> This section needs to be present in any mock reply configuration file. @@ -1504,7 +1504,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h6 class="title"> -<a name="id2910500"></a>The URL Sections</h6></div></div></div> +<a name="id2974768"></a>The URL Sections</h6></div></div></div> <p> The section title is used to map URLs to response files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/grilo.devhelp2 new/grilo-0.2.5/doc/grilo/html/grilo.devhelp2 --- old/grilo-0.2.4/doc/grilo/html/grilo.devhelp2 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/grilo.devhelp2 2013-03-19 13:09:55.000000000 +0100 @@ -34,7 +34,7 @@ <sub name="Asynchronous APIs" link="ch03.html#programming-with-grilo-async-apis"/> <sub name="Operation identifiers" link="ch03.html#programming-with-grilo-operation-identifiers"/> <sub name="Media objects" link="ch03.html#programmaing-with-grilo-media-objects"/> - <sub name="Metadata keys" link="ch03.html#id2930619"/> + <sub name="Metadata keys" link="ch03.html#id2978024"/> </sub> <sub name="Typical use cases explained" link="ch03.html#programming-with-grilo-use-cases-explained"> <sub name="Configuring your plugins" link="ch03.html#programming-with-grilo-configuring-plugins"/> @@ -48,7 +48,7 @@ <sub name="Writing plugins for Grilo" link="ch04.html"> <sub name="" link="ch04.html#writing-plugins"> <sub name="Source plugins" link="ch04.html#media-source-plugins"> - <sub name="" link="ch04.html#id2955088"> + <sub name="" link="ch04.html#id3001025"> <sub name="Introduction" link="ch04.html#source-plugins-intro"/> <sub name="Registering Plugins" link="ch04.html#source-plugins-basics"/> <sub name="Implementing Supported Keys" link="ch04.html#source-plugins-supported-keys"/> @@ -68,9 +68,9 @@ </sub> <sub name="Testing your plugins" link="ch04.html#testing-plugins"> <sub name="Testing your plugins" link="ch04.html#media-source-testing-plugins"> - <sub name="Simulating Network Replies" link="ch04.html#id2851716"> - <sub name="The Default Section" link="ch04.html#id2910454"/> - <sub name="The URL Sections" link="ch04.html#id2910500"/> + <sub name="Simulating Network Replies" link="ch04.html#id2974682"> + <sub name="The Default Section" link="ch04.html#id2974721"/> + <sub name="The URL Sections" link="ch04.html#id2974768"/> </sub> </sub> </sub> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/index.sgml new/grilo-0.2.5/doc/grilo/html/index.sgml --- old/grilo-0.2.4/doc/grilo/html/index.sgml 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/index.sgml 2013-03-19 13:09:55.000000000 +0100 @@ -698,5 +698,5 @@ <ANCHOR id="annotation-glossterm-transfer container" href="grilo/annotation-glossary.html#annotation-glossterm-transfer container"> <ANCHOR id="annotation-glossterm-transfer full" href="grilo/annotation-glossary.html#annotation-glossterm-transfer full"> <ANCHOR id="annotation-glossterm-type" href="grilo/annotation-glossary.html#annotation-glossterm-type"> -<ANCHOR id="annotation-glossterm-scope notified" href="grilo/annotation-glossary.html#annotation-glossterm-scope notified"> <ANCHOR id="annotation-glossterm-out callee-allocates" href="grilo/annotation-glossary.html#annotation-glossterm-out callee-allocates"> +<ANCHOR id="annotation-glossterm-scope notified" href="grilo/annotation-glossary.html#annotation-glossterm-scope notified"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/pr01.html new/grilo-0.2.5/doc/grilo/html/pr01.html --- old/grilo-0.2.4/doc/grilo/html/pr01.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/pr01.html 2013-03-19 13:09:55.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="preface"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2883241"></a>Overview</h2></div></div></div> +<a name="id2920207"></a>Overview</h2></div></div></div> <div class="section"> <div class="titlepage"></div> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/rn01.html new/grilo-0.2.5/doc/grilo/html/rn01.html --- old/grilo-0.2.4/doc/grilo/html/rn01.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/rn01.html 2013-03-19 13:09:56.000000000 +0100 @@ -22,7 +22,7 @@ <div class="reference"> <div class="titlepage"> <div><div><h1 class="title"> -<a name="id2883879"></a>Tutorial</h1></div></div> +<a name="id2929244"></a>Tutorial</h1></div></div> <hr> </div> <div class="toc"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/rn02.html new/grilo-0.2.5/doc/grilo/html/rn02.html --- old/grilo-0.2.4/doc/grilo/html/rn02.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/rn02.html 2013-03-19 13:09:55.000000000 +0100 @@ -22,7 +22,7 @@ <div class="reference"> <div class="titlepage"> <div><div><h1 class="title"> -<a name="id2877021"></a>Object Index</h1></div></div> +<a name="id2944665"></a>Object Index</h1></div></div> <hr> </div> <pre class="screen"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/rn03.html new/grilo-0.2.5/doc/grilo/html/rn03.html --- old/grilo-0.2.4/doc/grilo/html/rn03.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/rn03.html 2013-03-19 13:09:56.000000000 +0100 @@ -22,7 +22,7 @@ <div class="reference"> <div class="titlepage"> <div><div><h1 class="title"> -<a name="id2881706"></a>API Reference</h1></div></div> +<a name="id2934985"></a>API Reference</h1></div></div> <hr> </div> <div class="toc"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/doc/grilo/html/rn04.html new/grilo-0.2.5/doc/grilo/html/rn04.html --- old/grilo-0.2.4/doc/grilo/html/rn04.html 2012-11-30 16:19:40.000000000 +0100 +++ new/grilo-0.2.5/doc/grilo/html/rn04.html 2013-03-19 13:09:56.000000000 +0100 @@ -22,7 +22,7 @@ <div class="reference"> <div class="titlepage"> <div><div><h1 class="title"> -<a name="id2850118"></a>Grilo Libraries</h1></div></div> +<a name="id2932293"></a>Grilo Libraries</h1></div></div> <hr> </div> <div class="toc"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/libs/net/Makefile.am new/grilo-0.2.5/libs/net/Makefile.am --- old/grilo-0.2.4/libs/net/Makefile.am 2012-11-04 13:52:43.000000000 +0100 +++ new/grilo-0.2.5/libs/net/Makefile.am 2013-03-19 12:19:16.000000000 +0100 @@ -32,6 +32,11 @@ grl-net-soup-stable.c endif +if BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER +libgrlnet_@GRL_MAJORMINOR@_la_CFLAGS += \ + -DLIBSOUP_REQUESTER_DEPRECATED +endif + libgrlnet_@GRL_MAJORMINOR@_la_LIBADD = \ $(top_builddir)/src/lib@[email protected] \ $(DEPS_LIBS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/libs/net/Makefile.in new/grilo-0.2.5/libs/net/Makefile.in --- old/grilo-0.2.4/libs/net/Makefile.in 2012-11-30 16:17:48.000000000 +0100 +++ new/grilo-0.2.5/libs/net/Makefile.in 2013-03-19 13:08:21.000000000 +0100 @@ -69,8 +69,11 @@ @BUILD_GRILO_NET_WITH_CACHE_FALSE@am__append_3 = \ @BUILD_GRILO_NET_WITH_CACHE_FALSE@ grl-net-soup-stable.c -@BUILD_GRILO_NET_WITH_CACHE_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_4 = Gio-2.0 -@HAVE_INTROSPECTION_TRUE@am__append_5 = $(dist_gir_DATA) $(typelib_DATA) +@BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_TRUE@am__append_4 = \ +@BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER_TRUE@ -DLIBSOUP_REQUESTER_DEPRECATED + +@BUILD_GRILO_NET_WITH_CACHE_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_5 = Gio-2.0 +@HAVE_INTROSPECTION_TRUE@am__append_6 = $(dist_gir_DATA) $(typelib_DATA) subdir = libs/net DIST_COMMON = $(libgrlnet_@GRL_MAJORMINOR@include_HEADERS) \ $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -338,7 +341,7 @@ grl-net-mock.c $(am__append_2) $(am__append_3) libgrlnet_@GRL_MAJORMINOR@_la_CFLAGS = -I $(top_srcdir)/src -I \ $(top_srcdir)/src/data $(DEPS_CFLAGS) $(NET_CFLAGS) \ - $(am__append_1) + $(am__append_1) $(am__append_4) libgrlnet_@GRL_MAJORMINOR@_la_LIBADD = \ $(top_builddir)/src/lib@[email protected] \ $(DEPS_LIBS) \ @@ -365,7 +368,7 @@ *~ DISTCLEANFILES = $(MAINTAINERCLEANFILES) -CLEANFILES = $(am__append_5) +CLEANFILES = $(am__append_6) @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgrlnet_@GRL_MAJORMINOR@include_HEADERS)) @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgrlnet_@GRL_MAJORMINOR@_la_SOURCES)) @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = \ @@ -376,7 +379,7 @@ @HAVE_INTROSPECTION_TRUE@ $(gir_sources) @HAVE_INTROSPECTION_TRUE@GrlNet_@GRL_MAJORMINOR_NORM@_gir_INCLUDES = \ -@HAVE_INTROSPECTION_TRUE@ GObject-2.0 Soup-2.4 $(am__append_4) +@HAVE_INTROSPECTION_TRUE@ GObject-2.0 Soup-2.4 $(am__append_5) @HAVE_INTROSPECTION_TRUE@GrlNet_@GRL_MAJORMINOR_NORM@_gir_CFLAGS = -I $(top_srcdir)/src \ @HAVE_INTROSPECTION_TRUE@ -I $(top_srcdir)/src/data -I $(top_srcdir)/libs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/libs/net/grl-net-private.h new/grilo-0.2.5/libs/net/grl-net-private.h --- old/grilo-0.2.4/libs/net/grl-net-private.h 2012-10-30 21:01:04.000000000 +0100 +++ new/grilo-0.2.5/libs/net/grl-net-private.h 2013-01-15 12:29:31.000000000 +0100 @@ -46,7 +46,9 @@ GTimeVal last_request; /* last request time */ GQueue *pending; /* closure queue for delayed requests */ guint cache_size; /* cache size in Mb */ +#ifndef LIBSOUP_REQUESTER_DEPRECATED void *requester; +#endif gchar *previous_data; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/libs/net/grl-net-soup-unstable.c new/grilo-0.2.5/libs/net/grl-net-soup-unstable.c --- old/grilo-0.2.4/libs/net/grl-net-soup-unstable.c 2012-10-30 21:01:04.000000000 +0100 +++ new/grilo-0.2.5/libs/net/grl-net-soup-unstable.c 2013-03-19 12:19:16.000000000 +0100 @@ -33,9 +33,12 @@ #define LIBSOUP_USE_UNSTABLE_REQUEST_API #include <libsoup/soup-cache.h> -#include <libsoup/soup-requester.h> #include <libsoup/soup-request-http.h> +#ifndef LIBSOUP_REQUESTER_DEPRECATED +#include <libsoup/soup-requester.h> +#endif + #include "grl-net-private.h" #define GRL_LOG_DOMAIN_DEFAULT wc_log_domain @@ -47,11 +50,13 @@ void init_requester (GrlNetWc *self) { +#ifndef LIBSOUP_REQUESTER_DEPRECATED GrlNetWcPrivate *priv = self->priv; priv->requester = soup_requester_new (); soup_session_add_feature (priv->session, SOUP_SESSION_FEATURE (priv->requester)); +#endif init_dump_directory (); } @@ -62,7 +67,10 @@ cache_down (self); g_free (priv->previous_data); + +#ifndef LIBSOUP_REQUESTER_DEPRECATED g_object_unref (priv->requester); +#endif } void @@ -259,7 +267,14 @@ rr, NULL); +#ifdef LIBSOUP_REQUESTER_DEPRECATED + SoupURI *uri = soup_uri_new (url); + rr->request = soup_session_request_uri (priv->session, uri, NULL); + soup_uri_free (uri); +#else rr->request = soup_requester_request (priv->requester, url, NULL); +#endif + if (headers != NULL) { SoupMessage *message; GHashTableIter iter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/m4/gtk-doc.m4 new/grilo-0.2.5/m4/gtk-doc.m4 --- old/grilo-0.2.4/m4/gtk-doc.m4 2012-11-30 16:17:45.000000000 +0100 +++ new/grilo-0.2.5/m4/gtk-doc.m4 2013-03-19 13:08:18.000000000 +0100 @@ -37,7 +37,7 @@ dnl don't check for glib if we build glib if test "x$PACKAGE_NAME" != "xglib"; then dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/src/grl-operation.c new/grilo-0.2.5/src/grl-operation.c --- old/grilo-0.2.4/src/grl-operation.c 2012-10-17 10:49:03.000000000 +0200 +++ new/grilo-0.2.5/src/grl-operation.c 2013-01-04 13:04:56.000000000 +0100 @@ -22,6 +22,7 @@ #include "grl-operation.h" #include "grl-operation-priv.h" +#include "grl-log.h" typedef struct { @@ -121,6 +122,11 @@ OperationData *data = g_hash_table_lookup (operations, GUINT_TO_POINTER (operation_id)); + if (!data) { + GRL_WARNING ("Invalid operation %u", operation_id); + return; + } + g_return_if_fail (data != NULL); if (data->cancel_cb) { @@ -142,7 +148,10 @@ OperationData *data = g_hash_table_lookup (operations, GUINT_TO_POINTER (operation_id)); - g_return_val_if_fail (data != NULL, NULL); + if (!data) { + GRL_WARNING ("Invalid operation %u", operation_id); + return NULL; + } return data->user_data; } @@ -160,8 +169,10 @@ OperationData *data = g_hash_table_lookup (operations, GUINT_TO_POINTER (operation_id)); - g_return_if_fail (data != NULL); - - data->user_data = user_data; + if (!data) { + GRL_WARNING ("Invalid operation %u", operation_id); + } else { + data->user_data = user_data; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/src/grl-registry.c new/grilo-0.2.5/src/grl-registry.c --- old/grilo-0.2.4/src/grl-registry.c 2012-10-17 10:49:03.000000000 +0200 +++ new/grilo-0.2.5/src/grl-registry.c 2013-03-19 12:19:16.000000000 +0100 @@ -327,7 +327,7 @@ grl_plugin_get_id (plugin)); if (!grl_plugin_load (plugin, plugin_configs)) { - GRL_WARNING ("Failed to initialize plugin: '%s'", grl_plugin_get_filename (plugin)); + GRL_DEBUG ("Failed to initialize plugin: '%s'. Check if plugin is well configured", grl_plugin_get_filename (plugin)); g_set_error (error, GRL_CORE_ERROR, GRL_CORE_ERROR_LOAD_PLUGIN_FAILED, @@ -784,7 +784,7 @@ module = g_module_open (library_filename, G_MODULE_BIND_LOCAL); if (!module) { - GRL_WARNING ("Failed to open module: '%s'", library_filename); + GRL_WARNING ("Failed to open module: %s", g_module_error ()); g_set_error (error, GRL_CORE_ERROR, GRL_CORE_ERROR_LOAD_PLUGIN_FAILED, @@ -1227,6 +1227,7 @@ if (grl_plugin_get_module (plugin)) { g_module_close (grl_plugin_get_module (plugin)); + grl_plugin_set_module (plugin, NULL); } return TRUE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/src/grl-source.c new/grilo-0.2.5/src/grl-source.c --- old/grilo-0.2.4/src/grl-source.c 2012-11-28 18:18:10.000000000 +0100 +++ new/grilo-0.2.5/src/grl-source.c 2013-03-19 12:19:16.000000000 +0100 @@ -1024,6 +1024,7 @@ media_from_uri_spec_free (GrlSourceMediaFromUriSpec *spec) { g_object_unref (spec->source); + g_object_unref (spec->options); g_free (spec->uri); g_free (spec); } @@ -1198,6 +1199,10 @@ GList *_additional_keys = NULL; GrlSource *_source = (GrlSource *) iter->data; + if (_source == source) { + continue; + } + if (grl_source_may_resolve (_source, media, key, &_additional_keys)) { return _source; } @@ -1521,6 +1526,7 @@ } else { /* Try next node */ map_nodes = g_list_next (map_nodes); + continue; } } else { rs = g_hash_table_lookup (specs, node->source); @@ -1725,6 +1731,7 @@ GList *s, *sources; guint operation_id; GrlOperationOptions *decorate_options; + GrlOperationOptions *supported_options; GrlResolutionFlags flags; flags = grl_operation_options_get_flags (options); @@ -1749,8 +1756,13 @@ for (s = sources; s; s = g_list_next (s)) { if (grl_source_supported_operations (s->data) & GRL_OP_RESOLVE) { - operation_id = grl_source_resolve (s->data, media, keys, decorate_options, + grl_operation_options_obey_caps (decorate_options, + grl_source_get_caps (s->data, GRL_OP_RESOLVE), + &supported_options, + NULL); + operation_id = grl_source_resolve (s->data, media, keys, supported_options, media_decorate_cb, mdd); + g_object_unref (supported_options); if (operation_id > 0) { g_hash_table_insert (mdd->pending_callbacks, s->data, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/tools/grilo-inspect/grl-inspect.c new/grilo-0.2.5/tools/grilo-inspect/grl-inspect.c --- old/grilo-0.2.4/tools/grilo-inspect/grl-inspect.c 2012-10-17 10:49:03.000000000 +0200 +++ new/grilo-0.2.5/tools/grilo-inspect/grl-inspect.c 2013-01-15 11:59:40.000000000 +0100 @@ -56,7 +56,7 @@ }; static void -list_all_sources () +list_all_sources (void) { GList *sources = NULL; GList *sources_iter; @@ -92,7 +92,7 @@ } static void -print_version() +print_version (void) { g_print ("grl-inspect-" GRL_MAJORMINOR " version " VERSION "\n"); g_print ("Grilo " VERSION "\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/tools/grilo-test-ui/main.c new/grilo-0.2.5/tools/grilo-test-ui/main.c --- old/grilo-0.2.4/tools/grilo-test-ui/main.c 2012-11-04 13:21:20.000000000 +0100 +++ new/grilo-0.2.5/tools/grilo-test-ui/main.c 2013-03-18 17:11:10.000000000 +0100 @@ -374,6 +374,23 @@ return keys; } +static GrlTypeFilter +get_type_filter (void) +{ + GrlTypeFilter filter = GRL_TYPE_FILTER_NONE; + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_audio))) { + filter |= GRL_TYPE_FILTER_AUDIO; + } + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_video))) { + filter |= GRL_TYPE_FILTER_VIDEO; + } + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_image))) { + filter |= GRL_TYPE_FILTER_IMAGE; + } + + return filter; +} + static void browse_history_push (GrlSource *source, GrlMedia *media) { @@ -488,7 +505,7 @@ } static void -clear_ui () +clear_ui (void) { clear_panes (); clear_search_combo (); @@ -521,6 +538,24 @@ return g_strdup_value_contents (value); } +static char * +composed_value_description (GList *values) +{ + gint length = g_list_length (values); + GString *composed = g_string_new (""); + + while (values) { + composed = g_string_append (composed, + value_description ((GValue *) values->data)); + if (--length > 0) { + composed = g_string_append (composed, ", "); + } + values = g_list_next (values); + } + + return g_string_free (composed, FALSE); +} + static void resolve_cb (GrlSource *source, guint operation_id, @@ -565,17 +600,18 @@ key = GRLPOINTER_TO_KEYID (i->data); key_name = grl_metadata_key_get_name (key); if (grl_data_has_key (GRL_DATA (media), key)) { - const GValue *g_value = grl_data_get (GRL_DATA (media), key); GRL_DEBUG ("handling key %d (%s)", key, key_name); - gchar *value = value_description (g_value); + GList *values = grl_data_get_single_values_for_key (GRL_DATA (media), key); + gchar *composed_value = composed_value_description (values); + g_list_free (values); gtk_list_store_append (GTK_LIST_STORE (view->metadata_model), &iter); gtk_list_store_set (GTK_LIST_STORE (view->metadata_model), &iter, METADATA_MODEL_NAME, key_name, - METADATA_MODEL_VALUE, value, + METADATA_MODEL_VALUE, composed_value, -1); - GRL_DEBUG (" %s: %s", key_name, value); + GRL_DEBUG (" %s: %s", key_name, composed_value); } i = g_list_next (i); } @@ -693,18 +729,9 @@ if (state->count >= BROWSE_CHUNK_SIZE && state->offset < BROWSE_MAX_COUNT) { GrlOperationOptions *options = - grl_operation_options_copy (default_options); - GrlTypeFilter filter = GRL_TYPE_FILTER_NONE; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_audio))) { - filter |= GRL_TYPE_FILTER_AUDIO; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_video))) { - filter |= GRL_TYPE_FILTER_VIDEO; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_image))) { - filter |= GRL_TYPE_FILTER_IMAGE; - } - grl_operation_options_set_type_filter (options, filter); + grl_operation_options_copy (default_options); + grl_operation_options_set_type_filter (options, + get_type_filter ()); GRL_DEBUG ("operation (%d) requesting more data from source", op_id); state->count = 0; @@ -777,7 +804,11 @@ static void browse (GrlSource *source, GrlMedia *container) { + GrlOperationOptions *options; + GrlOperationOptions *supported_options; + guint browse_id; + if (source) { /* If we have an ongoing operation, cancel it first */ cancel_current_operation (); @@ -785,12 +816,22 @@ OperationState *state = g_new0 (OperationState, 1); state->type = OP_TYPE_BROWSE; + + options = grl_operation_options_copy (default_options); + grl_operation_options_set_type_filter (options, + get_type_filter ()); + grl_operation_options_obey_caps (options, + grl_source_get_caps (GRL_SOURCE (source), GRL_OP_BROWSE), + &supported_options, + NULL); + g_object_unref (options); browse_id = grl_source_browse (source, container, all_keys (), - default_options, + supported_options, browse_search_query_cb, state); + g_object_unref (supported_options); operation_started (source, browse_id, FALSE); } else { show_browsable_sources (); @@ -1144,7 +1185,6 @@ gboolean multiple = FALSE; GrlOperationOptions *options; GrlOperationOptions *supported_options; - GrlTypeFilter filter; /* If we have an operation ongoing, let's cancel it first */ cancel_current_operation (); @@ -1152,17 +1192,8 @@ state = g_new0 (OperationState, 1); state->text = (gchar *) text; options = grl_operation_options_copy (default_options); - filter = GRL_TYPE_FILTER_NONE; - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_audio))) { - filter |= GRL_TYPE_FILTER_AUDIO; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_video))) { - filter |= GRL_TYPE_FILTER_VIDEO; - } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->filter_image))) { - filter |= GRL_TYPE_FILTER_IMAGE; - } - grl_operation_options_set_type_filter (options, filter); + grl_operation_options_set_type_filter (options, + get_type_filter ()); if (source) { /* Normal search */ @@ -1264,51 +1295,6 @@ } static void -set_filter_cb (GtkComboBox *widget, - gpointer user_data) -{ - GrlCaps *caps; - GrlTypeFilter filter; - GrlSource *source; - GtkTreeIter iter; - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->filter_audio), TRUE); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->filter_image), TRUE); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->filter_video), TRUE); - - gtk_widget_set_sensitive (view->filter_audio, FALSE); - gtk_widget_set_sensitive (view->filter_video, FALSE); - gtk_widget_set_sensitive (view->filter_image, FALSE); - - if (!gtk_combo_box_get_active_iter (widget, &iter)) { - return; - } - - gtk_tree_model_get (gtk_combo_box_get_model (widget), - &iter, - SEARCH_MODEL_SOURCE, &source, - -1); - if (!source) { - return; - } - - caps = grl_source_get_caps (GRL_SOURCE (source), GRL_OP_SEARCH); - - - filter = grl_caps_get_type_filter (caps); - - if (filter & GRL_TYPE_FILTER_AUDIO) { - gtk_widget_set_sensitive (view->filter_audio, TRUE); - } - if (filter & GRL_TYPE_FILTER_VIDEO) { - gtk_widget_set_sensitive (view->filter_video, TRUE); - } - if (filter & GRL_TYPE_FILTER_IMAGE) { - gtk_widget_set_sensitive (view->filter_image, TRUE); - } -} - -static void query_combo_setup (void) { GrlRegistry *registry; @@ -1379,7 +1365,7 @@ } static gchar * -get_config_dir () +get_config_dir (void) { char *confdir; GFile *dir; @@ -1786,9 +1772,9 @@ view->filter_audio = gtk_check_button_new_with_label ("Audio"); view->filter_video = gtk_check_button_new_with_label ("Video"); view->filter_image = gtk_check_button_new_with_label ("Image"); - gtk_widget_set_sensitive (view->filter_audio, FALSE); - gtk_widget_set_sensitive (view->filter_video, FALSE); - gtk_widget_set_sensitive (view->filter_image, FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->filter_audio), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->filter_video), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->filter_image), TRUE); gtk_container_add_with_properties (GTK_CONTAINER (box), view->filter_audio, @@ -1802,9 +1788,6 @@ gtk_container_add_with_properties (GTK_CONTAINER (view->lpane), box, "expand", FALSE, NULL); - g_signal_connect (G_OBJECT (view->search_combo), - "changed", - G_CALLBACK (set_filter_cb), NULL); /* Toolbar buttons */ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -2207,7 +2190,7 @@ } static void -configure_plugins () +configure_plugins (void) { load_file_config(); set_flickr_config (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.2.4/tools/vala/grilo-test.c new/grilo-0.2.5/tools/vala/grilo-test.c --- old/grilo-0.2.4/tools/vala/grilo-test.c 2012-11-30 16:18:22.000000000 +0100 +++ new/grilo-0.2.5/tools/vala/grilo-test.c 2013-03-19 13:08:36.000000000 +0100 @@ -1,4 +1,4 @@ -/* grilo-test.c generated by valac 0.18.0.61-6fd95, the Vala compiler +/* grilo-test.c generated by valac 0.19.0.3-f335, the Vala compiler * generated from grilo-test.vala, do not modify */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
