[tracker/tracker-0.12: 151/202] firefox: Don't try to load 0.10.x libraries, we're using APIs not available there



commit c78894650638025b77b31ce45bcc5980e811781d
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Sep 29 10:55:16 2011 +0100

    firefox: Don't try to load 0.10.x libraries, we're using APIs not available there
    
    Fixes GB#660123.

 src/plugins/firefox/chrome/content/bindings.js |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/firefox/chrome/content/bindings.js b/src/plugins/firefox/chrome/content/bindings.js
index 87c2756..1c5dff2 100644
--- a/src/plugins/firefox/chrome/content/bindings.js
+++ b/src/plugins/firefox/chrome/content/bindings.js
@@ -2,7 +2,7 @@ if (!org.bustany.TrackerFox.TrackerSparql || !org.bustany.TrackerFox.TrackerSpar
 org.bustany.TrackerFox.TrackerSparql = {
 	__initialized: true,
 
-	_trackerSparqlPath: "libtracker-sparql-0.10.so.0",
+	_trackerSparqlPath: "libtracker-sparql-0.12.so.0",
 	_lib: null,
 
 	init: function () {
@@ -18,14 +18,8 @@ org.bustany.TrackerFox.TrackerSparql = {
 		try {
 			tracker._lib = ctypes.open (tracker._trackerSparqlPath);
 		} catch (e) {
-			tracker._trackerSparqlPath = "libtracker-sparql-0.12.so.0";
-
-			try {
-				tracker._lib = ctypes.open (tracker._trackerSparqlPath);
-			} catch (e) {
-				dump("Could not load libtracker-sparql 0.10 or 0.12\n");
-				return false;
-			}
+			dump("Could not load libtracker-sparql 0.12\n");
+			return false;
 		}
 
 		// GLib types



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]