summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common.am2
-rw-r--r--configure.ac6
-rw-r--r--rygel-core-2.0.pc.in2
-rw-r--r--rygel-renderer-2.0.pc.in2
-rw-r--r--rygel-renderer-gst-2.0.pc.in2
-rw-r--r--rygel-server-2.0.pc.in2
-rw-r--r--src/librygel-core/rygel-core-2.0.deps2
-rw-r--r--src/librygel-core/rygel-plugin-loader.vala2
-rw-r--r--src/librygel-server/rygel-media-objects.vala2
-rw-r--r--src/librygel-server/rygel-server-2.0.deps2
-rw-r--r--src/librygel-server/rygel-transcode-manager.vala10
-rw-r--r--src/plugins/media-export/rygel-media-export-harvester.vala12
-rw-r--r--src/plugins/media-export/rygel-media-export-media-cache.vala2
-rw-r--r--src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala4
-rw-r--r--src/plugins/tracker/rygel-tracker-query-triplets.vala4
-rw-r--r--tests/Makefile.am2
16 files changed, 29 insertions, 29 deletions
diff --git a/common.am b/common.am
index 5a61b1ae..d2638f58 100644
--- a/common.am
+++ b/common.am
@@ -78,7 +78,7 @@ RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS = \
--vapidir=$(top_builddir)/src/librygel-renderer \
$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-RYGEL_COMMON_VALAFLAGS_PKG = --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0
+RYGEL_COMMON_VALAFLAGS_PKG = --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-0.8
RYGEL_COMMON_VALAFLAGS = \
--pkg rygel-build-config \
diff --git a/configure.ac b/configure.ac
index 59b22863..10685b45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ GUPNP_DLNA_REQUIRED=0.5.0
GSTREAMER_REQUIRED=0.10.36
GSTPBU_REQUIRED=0.10.35
GIO_REQUIRED=2.26
-GEE_REQUIRED=0.5.2
+GEE_REQUIRED=0.8.0
UUID_REQUIRED=1.41.3
LIBSOUP_REQUIRED=2.34.0
GTK_REQUIRED=2.90.3
@@ -58,7 +58,7 @@ PKG_CHECK_MODULES(LIBGSSDP, gssdp-1.0 >= $GSSDP_REQUIRED)
PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED)
PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
-PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
+PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED)
PKG_CHECK_MODULES(UUID, uuid >= $UUID_REQUIRED)
PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4 >= $LIBSOUP_REQUIRED)
@@ -123,7 +123,7 @@ RYGEL_CHECK_VALA([$VALA_REQUIRED],
[gupnp-1.0
gupnp-av-1.0
gio-2.0
- gee-1.0
+ gee-0.8
posix])
AS_IF([test "x$with_media_engine" = "xgstreamer"],
diff --git a/rygel-core-2.0.pc.in b/rygel-core-2.0.pc.in
index 88cdb35e..5017ce27 100644
--- a/rygel-core-2.0.pc.in
+++ b/rygel-core-2.0.pc.in
@@ -8,5 +8,5 @@ Description: GNOME (Mobile) UPnP/DLNA Media Server
Version: @VERSION@
Libs: -L${libdir} -lrygel-core-2.0
Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-1.0
+Requires: gupnp-av-1.0 gee-0.8
Requires.Private: uuid gmodule-2.0
diff --git a/rygel-renderer-2.0.pc.in b/rygel-renderer-2.0.pc.in
index 0ae6df9f..59da3d73 100644
--- a/rygel-renderer-2.0.pc.in
+++ b/rygel-renderer-2.0.pc.in
@@ -8,5 +8,5 @@ Description: GNOME (Mobile) UPnP/DLNA Media Renderer library
Version: @VERSION@
Libs: -L${libdir} -lrygel-renderer-2.0
Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-1.0 rygel-core-2.0
+Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.0
Requires.Private: uuid gmodule-2.0
diff --git a/rygel-renderer-gst-2.0.pc.in b/rygel-renderer-gst-2.0.pc.in
index fbc4fa84..501fb5b1 100644
--- a/rygel-renderer-gst-2.0.pc.in
+++ b/rygel-renderer-gst-2.0.pc.in
@@ -8,5 +8,5 @@ Description: GNOME (Mobile) UPnP/DLNA Media Renderer library
Version: @VERSION@
Libs: -L${libdir} -lrygel-renderer-gst-2.0
Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-1.0 gstreamer-0.10 rygel-core-2.0
+Requires: gupnp-av-1.0 gee-0.8 gstreamer-0.10 rygel-core-2.0
Requires.Private: uuid gmodule-2.0
diff --git a/rygel-server-2.0.pc.in b/rygel-server-2.0.pc.in
index 1263ada8..e8e1a5c0 100644
--- a/rygel-server-2.0.pc.in
+++ b/rygel-server-2.0.pc.in
@@ -8,5 +8,5 @@ Description: GNOME (Mobile) UPnP/DLNA Media server library
Version: @VERSION@
Libs: -L${libdir} -lrygel-server-2.0
Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-1.0 rygel-core-2.0
+Requires: gupnp-av-1.0 gee-0,8 rygel-core-2.0
Requires.Private: uuid gmodule-2.0
diff --git a/src/librygel-core/rygel-core-2.0.deps b/src/librygel-core/rygel-core-2.0.deps
index 2205b250..c65d41bb 100644
--- a/src/librygel-core/rygel-core-2.0.deps
+++ b/src/librygel-core/rygel-core-2.0.deps
@@ -1,4 +1,4 @@
-gee-1.0
+gee-0.8
gio-2.0
libxml-2.0
gupnp-1.0
diff --git a/src/librygel-core/rygel-plugin-loader.vala b/src/librygel-core/rygel-plugin-loader.vala
index 1c680080..7fb614c6 100644
--- a/src/librygel-core/rygel-plugin-loader.vala
+++ b/src/librygel-core/rygel-plugin-loader.vala
@@ -52,7 +52,7 @@ public class Rygel.PluginLoader : RecursiveModuleLoader {
base (path);
- this.plugin_hash = new HashMap<string,Plugin> (str_hash, str_equal);
+ this.plugin_hash = new HashMap<string,Plugin> ();
this.loaded_modules = new HashSet<string> ();
}
diff --git a/src/librygel-server/rygel-media-objects.vala b/src/librygel-server/rygel-media-objects.vala
index f61d3335..df7112e7 100644
--- a/src/librygel-server/rygel-media-objects.vala
+++ b/src/librygel-server/rygel-media-objects.vala
@@ -46,7 +46,7 @@ public class Rygel.MediaObjects : ArrayList<MediaObject> {
return;
}
- this.sort_with_data ((a, b) => {
+ this.sort ((a, b) => {
var object_a = a as MediaObject;
var object_b = b as MediaObject;
diff --git a/src/librygel-server/rygel-server-2.0.deps b/src/librygel-server/rygel-server-2.0.deps
index 79a97cd2..ed05e345 100644
--- a/src/librygel-server/rygel-server-2.0.deps
+++ b/src/librygel-server/rygel-server-2.0.deps
@@ -1,4 +1,4 @@
-gee-1.0
+gee-0.8
gupnp-1.0
gio-2.0
rygel-core-2.0
diff --git a/src/librygel-server/rygel-transcode-manager.vala b/src/librygel-server/rygel-transcode-manager.vala
index 3bea5ec1..538f53dc 100644
--- a/src/librygel-server/rygel-transcode-manager.vala
+++ b/src/librygel-server/rygel-transcode-manager.vala
@@ -33,12 +33,10 @@ using Gee;
*/
public abstract class Rygel.TranscodeManager : GLib.Object {
- private static bool protocol_equal_func (void *a, void *b) {
- var protocol_a = a as ProtocolInfo;
- var protocol_b = b as ProtocolInfo;
-
- return protocol_a.dlna_profile == protocol_b.dlna_profile &&
- protocol_a.mime_type == protocol_b.mime_type;
+ private static bool protocol_equal_func (GUPnP.ProtocolInfo a,
+ GUPnP.ProtocolInfo b) {
+ return a.dlna_profile == b.dlna_profile &&
+ a.mime_type == b.mime_type;
}
public TranscodeManager () { }
diff --git a/src/plugins/media-export/rygel-media-export-harvester.vala b/src/plugins/media-export/rygel-media-export-harvester.vala
index 7c9a06cd..02a7f163 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -43,7 +43,7 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
public Harvester (Cancellable cancellable,
ArrayList<File> locations) {
this.cancellable = cancellable;
- this.locations = new ArrayList<File> ((EqualFunc) File.equal);
+ this.locations = new ArrayList<File> ((EqualDataFunc<File>) File.equal);
foreach (var file in locations) {
if (file.query_exists ()) {
this.locations.add (file);
@@ -55,10 +55,12 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
this.monitor = new RecursiveFileMonitor (cancellable);
this.monitor.changed.connect (this.on_file_changed);
- this.tasks = new HashMap<File, HarvestingTask> (File.hash,
- (EqualFunc) File.equal);
- this.extraction_grace_timers = new HashMap<File, uint> (File.hash,
- (EqualFunc)File.equal);
+ this.tasks = new HashMap<File, HarvestingTask>
+ ((HashDataFunc<File>) File.hash,
+ (EqualDataFunc<File>) File.equal);
+ this.extraction_grace_timers = new HashMap<File, uint>
+ ((HashDataFunc<File>) File.hash,
+ (EqualDataFunc<File>) File.equal);
}
/**
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala b/src/plugins/media-export/rygel-media-export-media-cache.vala
index 19c2674c..257929a5 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -348,7 +348,7 @@ public class Rygel.MediaExport.MediaCache : Object {
public ArrayList<string> get_child_ids (string container_id)
throws DatabaseError {
- ArrayList<string> children = new ArrayList<string> (str_equal);
+ ArrayList<string> children = new ArrayList<string> ();
GLib.Value[] values = { container_id };
var cursor = this.exec_cursor (SQLString.CHILD_IDS, values);
diff --git a/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala b/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
index 6a2c686a..75035ab1 100644
--- a/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
+++ b/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
@@ -41,8 +41,8 @@ public class Rygel.MediaExport.RecursiveFileMonitor : Object {
}
this.cancellable = cancellable;
- this.monitors = new HashMap<File, FileMonitor> (File.hash,
- (EqualFunc) File.equal);
+ this.monitors = new HashMap<File, FileMonitor> ((HashDataFunc<File>) File.hash,
+ (EqualDataFunc<File>) File.equal);
if (cancellable != null) {
cancellable.cancelled.connect (this.cancel);
}
diff --git a/src/plugins/tracker/rygel-tracker-query-triplets.vala b/src/plugins/tracker/rygel-tracker-query-triplets.vala
index 89b678b8..2cf436cf 100644
--- a/src/plugins/tracker/rygel-tracker-query-triplets.vala
+++ b/src/plugins/tracker/rygel-tracker-query-triplets.vala
@@ -27,11 +27,11 @@ using Gee;
*/
public class Rygel.Tracker.QueryTriplets : ArrayList<QueryTriplet> {
public QueryTriplets () {
- base ((EqualFunc) QueryTriplet.equal_func);
+ base ((EqualDataFunc<QueryTriplet>) QueryTriplet.equal_func);
}
public QueryTriplets.clone (QueryTriplets triplets) {
- base ((EqualFunc) QueryTriplet.equal_func);
+ base ((EqualDataFunc<QueryTriplet>) QueryTriplet.equal_func);
foreach (var triplet in triplets) {
this.add (new QueryTriplet.clone (triplet));
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2928eaca..95f05c8b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,7 @@ LDADD = $(LIBGUPNP_LIBS) \
AM_VALAFLAGS = --disable-warnings \
--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
--pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gstreamer-base-0.10 \
- --pkg gio-2.0 --pkg gee-1.0 --pkg gstreamer-pbutils-0.10 \
+ --pkg gio-2.0 --pkg gee-0.8 --pkg gstreamer-pbutils-0.10 \
--pkg uuid --vapidir=$(top_srcdir)/src/librygel-core -g \
$(COVERAGE_VALAFLAGS)
View Lorry Controller Status