Blob Blame History Raw
From b5d91d28673c4633f369daa576761cfe0c0ee92b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 2 Dec 2015 11:20:31 +0100
Subject: [PATCH] build: Use grilo 0.3 for GNOME 3.20

https://bugzilla.gnome.org/show_bug.cgi?id=758942
---
 configure.ac        |  4 ++--
 gnomemusic/grilo.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index f8c34b8..654e4a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,8 +37,8 @@ PKG_CHECK_MODULES(MEDIAART, [libmediaart-2.0])
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
-GRL_MIN_VERSION=0.2.6
-PKG_CHECK_MODULES(GRL, grilo-0.2 >= $GRL_MIN_VERSION)
+GRL_MIN_VERSION=0.3.0
+PKG_CHECK_MODULES(GRL, grilo-0.3 >= $GRL_MIN_VERSION)
 
 AC_CONFIG_FILES([
   Makefile
diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py
index a810628..7943150 100644
--- a/gnomemusic/grilo.py
+++ b/gnomemusic/grilo.py
@@ -26,7 +26,7 @@
 # delete this exception statement from your version.
 
 import gi
-gi.require_version('Grl', '0.2')
+gi.require_version('Grl', '0.3')
 from gi.repository import GLib, GObject
 from gnomemusic.query import Query
 from gnomemusic import log, TrackerWrapper
@@ -73,12 +73,12 @@ class Grilo(GObject.GObject):
         if not (GLib.file_test(self.playlist_path, GLib.FileTest.IS_DIR)):
             GLib.mkdir_with_parents(self.playlist_path, int("0755", 8))
         self.options = Grl.OperationOptions()
-        self.options.set_flags(Grl.ResolutionFlags.FAST_ONLY |
-                               Grl.ResolutionFlags.IDLE_RELAY)
+        self.options.set_resolution_flags(Grl.ResolutionFlags.FAST_ONLY |
+                                          Grl.ResolutionFlags.IDLE_RELAY)
 
         self.full_options = Grl.OperationOptions()
-        self.full_options.set_flags(Grl.ResolutionFlags.FULL |
-                                    Grl.ResolutionFlags.IDLE_RELAY)
+        self.full_options.set_resolution_flags(Grl.ResolutionFlags.FULL |
+                                               Grl.ResolutionFlags.IDLE_RELAY)
 
         self.sources = {}
         self.blacklist = ['grl-filesystem', 'grl-bookmarks', 'grl-metadata-store', 'grl-podcasts']
-- 
2.5.0