Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tracker-upnp: update for move to GNOME git, and merged patch

  • Loading branch information...
commit 7b1d96135c2e4b11f74100810ce87f6af3fd2483 1 parent 34ac54c
@rossburton rossburton authored
View
51 meta-guacamayo/recipes-support/tracker/tracker-upnp/rm-init-timeout-on-connect.patch
@@ -1,51 +0,0 @@
-From 20346f7a6115bc6b7010efa5bf403edb6a7d1066 Mon Sep 17 00:00:00 2001
-From: Tomas Frydrych <tomas@sleepfive.com>
-Date: Tue, 12 Jun 2012 10:16:14 +0100
-Subject: [PATCH] Remove init timeout when we successfully connect
-
-If the timeout is not removed on successful connection, all the upnp content
-is marked as unavailable.
----
- src/tracker-miner-upnp.vala | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/tracker-miner-upnp.vala b/src/tracker-miner-upnp.vala
-index 936885e..6a31fb9 100644
---- a/src/tracker-miner-upnp.vala
-+++ b/src/tracker-miner-upnp.vala
-@@ -40,7 +40,7 @@ public class Miner : Tracker.Miner, GLib.Initable {
- private HashTable<string, ContentDirectory?> mediaservers;
-
- private TimeVal init_time;
--
-+ private uint init_timeout_id;
- private bool _running = true;
- private bool running {
- get {
-@@ -204,6 +204,10 @@ public class Miner : Tracker.Miner, GLib.Initable {
- }
-
- private void on_context_available (Context context) {
-+ if (init_timeout_id != 0) {
-+ GLib.Source.remove (init_timeout_id);
-+ init_timeout_id = 0;
-+ }
- ControlPoint cp = new ControlPoint (context, MEDIASERVER_DEVICE);
-
- cp.device_proxy_available.connect (on_device_available);
-@@ -219,10 +223,11 @@ public class Miner : Tracker.Miner, GLib.Initable {
- /* mark everything unavailable if it doesn't appear in a few
- * seconds */
- init_time.get_current_time ();
-- GLib.Timeout.add_seconds (5, () =>
-+ init_timeout_id = GLib.Timeout.add_seconds (5, () =>
- {
- try
- {
-+ warning ("Connection attempt timed out");
- UPnPSparql.set_all_content_directories_unavailable (get_connection(),
- init_time);
- }
---
-1.7.10
-
View
7 meta-guacamayo/recipes-support/tracker/tracker-upnp_git.bb
@@ -4,15 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f0df8fd67dfa1db3cc0bd431837f0b89"
DEPENDS = "vala-native glib-2.0 tracker gupnp-vala"
HOMEPAGE = "http://gitorious.org/tracker-upnp"
-SRCREV = "7bfee9cadfdc06a53fe5921b6abf50c4e09948e0"
-PR = "r2"
+SRCREV = "685ab29c82809d77c2fddbf08ebd10d5f8274399"
+PR = "r3"
PV = "0.1.5+git${SRCPV}"
inherit autotools pkgconfig vala
-SRC_URI = "git://gitorious.org/tracker-upnp/tracker-upnp.git;proto=git \
+SRC_URI = "git://git.gnome.org/tracker-upnp;proto=git \
file://tracker-0.12.patch \
- file://rm-init-timeout-on-connect.patch \
"
S = "${WORKDIR}/git"
Please sign in to comment.
Something went wrong with that request. Please try again.