- drop ie locale, release 2

[packages/rhythmbox.git] / rhythmbox-grilo-0.3.0.patch

From af7aab21f2ed0d837ddf583126f7dbfd88a69627 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 17 Dec 2015 13:42:12 +0100
Subject: [PATCH] grilo: Port to 0.3.0

https://bugzilla.gnome.org/show_bug.cgi?id=759589
---
 configure.ac                    |  4 ++--
 plugins/grilo/rb-grilo-plugin.c |  2 +-
 plugins/grilo/rb-grilo-source.c | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4457182..1929905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ LIBSOUP_REQS=2.34.0
 GUDEV_REQS=143
 LIBMTP_REQS=0.3.0
 LIBPEAS_REQS=0.7.3
-GRILO_REQS=0.2.0
+GRILO_REQS=0.3.0
 LIBXML2_REQS=2.7.8
 LIBSECRET_REQS=0.18
 
@@ -714,7 +714,7 @@ AC_ARG_ENABLE(grilo,
 			     [Disable Grilo support]),,
 	      enable_grilo=auto)
 if test "x$enable_grilo" != "xno"; then
-	PKG_CHECK_MODULES(GRILO, grilo-0.2 >= $GRILO_REQS, have_grilo=yes, have_grilo=no)
+	PKG_CHECK_MODULES(GRILO, grilo-0.3 >= $GRILO_REQS, have_grilo=yes, have_grilo=no)
 	if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
 		AC_MSG_ERROR([Grilo support explicitly requested, but grilo couldn not be found])
 	fi
diff --git a/plugins/grilo/rb-grilo-plugin.c b/plugins/grilo/rb-grilo-plugin.c
index 2816be2..5c56b93 100644
--- a/plugins/grilo/rb-grilo-plugin.c
+++ b/plugins/grilo/rb-grilo-plugin.c
@@ -213,7 +213,7 @@ impl_activate (PeasActivatable *plugin)
 	pi->registry = grl_registry_get_default ();
 	g_signal_connect (pi->registry, "source-added", G_CALLBACK (grilo_source_added_cb), pi);
 	g_signal_connect (pi->registry, "source-removed", G_CALLBACK (grilo_source_removed_cb), pi);
-	if (grl_registry_load_all_plugins (pi->registry, &error) == FALSE) {
+	if (grl_registry_load_all_plugins (pi->registry, TRUE, &error) == FALSE) {
 		g_warning ("Failed to load Grilo plugins: %s", error->message);
 		g_clear_error (&error);
 	}
diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
index 103e06b..22a9d11 100644
--- a/plugins/grilo/rb-grilo-source.c
+++ b/plugins/grilo/rb-grilo-source.c
@@ -524,7 +524,7 @@ make_operation_options (RBGriloSource *source, GrlSupportedOps op, int position)
 	grl_operation_options_set_count (options,
 					 CONTAINER_FETCH_SIZE);
 	grl_operation_options_set_type_filter (options, GRL_TYPE_FILTER_AUDIO);
-	grl_operation_options_set_flags (options, GRL_RESOLVE_NORMAL);
+	grl_operation_options_set_resolution_flags (options, GRL_RESOLVE_NORMAL);
 
 	return options;
 }
@@ -684,7 +684,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, g
 		source->priv->browse_position++;
 	}
 
-	if (media && GRL_IS_MEDIA_BOX (media)) {
+	if (media && grl_media_is_container (media)) {
 
 		GtkTreeIter new_row;
 		if (source->priv->browse_container == NULL) {
@@ -724,7 +724,7 @@ grilo_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *media, g
 						   2, CONTAINER_MARKER,
 						   3, 0,
 						   -1);
-	} else if (media && GRL_IS_MEDIA_AUDIO (media)) {
+	} else if (media && grl_media_is_audio (media)) {
 		source->priv->browse_got_media = TRUE;
 	}
 
@@ -854,7 +854,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *me
 		source->priv->media_browse_got_results = TRUE;
 		source->priv->media_browse_position++;
 
-		if (GRL_IS_MEDIA_AUDIO (media)) {
+		if (grl_media_is_audio (media)) {
 			RhythmDBEntry *entry;
 			entry = create_entry_for_media (source->priv->db,
 							source->priv->entry_type,
@@ -863,7 +863,7 @@ grilo_media_browse_cb (GrlSource *grilo_source, guint operation_id, GrlMedia *me
 			if (entry != NULL) {
 				rhythmdb_query_model_add_entry (source->priv->query_model, entry, -1);
 			}
-		} else if (GRL_IS_MEDIA_BOX (media)) {
+		} else if (grl_media_is_container (media)) {
 			source->priv->media_browse_got_containers = TRUE;
 		}
 	}
-- 
2.5.0