[grilo] core: Check valid options in operations

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit c00110039430b6f359ba780b5b281b9f1b8eeae3
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Oct 18 16:57:09 2012 +0200

    core: Check valid options in operations
    
    This is the right fix bug #686033, instead of commit
    52da21f5443079f.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686033

 src/grl-source.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/grl-source.c b/src/grl-source.c
index 4814654..f1b21d9 100644
--- a/src/grl-source.c
+++ b/src/grl-source.c
@@ -3015,11 +3015,11 @@ grl_source_resolve (GrlSource *source,
   GRL_DEBUG (__FUNCTION__);
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
+  g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
   g_return_val_if_fail (keys != NULL, 0);
   g_return_val_if_fail (callback != NULL, 0);
   g_return_val_if_fail (grl_source_supported_operations (source) &
                         GRL_OP_RESOLVE, 0);
-  g_return_val_if_fail (options != NULL, 0);
   g_return_val_if_fail (check_options (source, GRL_OP_RESOLVE, options), 0);
 
   if (!media) {
@@ -3306,6 +3306,7 @@ grl_source_get_media_from_uri (GrlSource *source,
   GRL_DEBUG (__FUNCTION__);
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
+  g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
   g_return_val_if_fail (uri != NULL, 0);
   g_return_val_if_fail (keys != NULL, 0);
   g_return_val_if_fail (callback != NULL, 0);
@@ -3455,6 +3456,7 @@ grl_source_browse (GrlSource *source,
   GrlResolutionFlags flags;
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
+  g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
   g_return_val_if_fail (callback != NULL, 0);
   g_return_val_if_fail (grl_source_supported_operations (source) &
                         GRL_OP_BROWSE, 0);
@@ -3620,6 +3622,7 @@ grl_source_search (GrlSource *source,
   GrlResolutionFlags flags;
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
+  g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
   g_return_val_if_fail (callback != NULL, 0);
   g_return_val_if_fail (grl_source_supported_operations (source) &
                         GRL_OP_SEARCH, 0);
@@ -3779,6 +3782,7 @@ grl_source_query (GrlSource *source,
   GrlResolutionFlags flags;
 
   g_return_val_if_fail (GRL_IS_SOURCE (source), 0);
+  g_return_val_if_fail (GRL_IS_OPERATION_OPTIONS (options), 0);
   g_return_val_if_fail (query != NULL, 0);
   g_return_val_if_fail (callback != NULL, 0);
   g_return_val_if_fail (grl_source_supported_operations (source) &