Removed Firefox 4.0 datasource and updated the configure.ac file

18 files changed, 15 insertions, 886 deletions

diff --git a/configure.ac b/configure.ac
index bb5611f..0912e8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([zeitgeist-datasources],
-	[0.8.0],
+	[0.8.1],
 	[https://bugs.launchpad.net/zeitgeist-datasources/])
 
 AC_PREFIX_DEFAULT([/usr])
@@ -45,8 +45,6 @@ AC_ARG_WITH([mono],
 
 AM_CONDITIONAL(ENABLE_MONO, test "x$with_mono" = "xyes")
 
-AC_PATH_PROG(GMCS, gmcs, no)
-AC_PATH_PROG(XBUILD, xbuild, no)
 
 dnl ==============================================
 dnl Check commonly used packages
@@ -66,7 +64,7 @@ AC_MSG_NOTICE([Requested to enable all plugins: ${all_plugins}])
 
 # The full list of plugins
 allowed_plugins="bzr chrome eog geany gedit vim emacs tomboy telepathy xchat rhythmbox firefox totem-libzg firefox-36-libzg"
-# currently disabled = "epiphany firefox-40-libzg"
+# currently disabled = "epiphany"
 
 # npapi-plugin has a template Makefile.am, but don't use it directly
 #   - see chrome's Makefile.am for how to compile it
@@ -88,6 +86,9 @@ else
 	error_on_bad_plugin="0"
 fi
 
+AC_PATH_PROG(GMCS, gmcs, no)
+AC_PATH_PROG(XBUILD, xbuild, no)
+
 # Check for plugin-specific requirements and error if necessary
 for plugin in ${used_plugins}; do
 	add_plugin="1"
@@ -133,23 +134,6 @@ for plugin in ${used_plugins}; do
 		;;
 		firefox)
 		;;
-		firefox-40-libzg)
-			if test "${HAVE_LIBZG}" != "yes" ; then
-				plugin_error_or_ignore "libzeitgeist not found"
-				continue
-			fi
-			PKG_CHECK_MODULES(LIBXUL_2_0, libxul >= 2.0,
-				[HAVE_LIBXUL=yes], [HAVE_LIBXUL=no])
-			if test "${HAVE_LIBXUL}" != "yes" ; then
-				plugin_error_or_ignore "libxul 2.0+ for firefox-40-libzg not found"
-				continue
-			fi
-			XPIDL_BIN="`$PKG_CONFIG --variable=sdkdir libxul`/bin/xpidl"
-			AC_SUBST(XPIDL_BIN)
-			XUL_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`"
-			AC_SUBST(XUL_IDLDIR)
-                        AC_DEFINE(MOZ_NO_MOZALLOC, ["For Mozilla Firefox 4"])
-		;;
 		firefox-36-libzg)
 			if test "${HAVE_LIBZG}" != "yes" ; then
 				plugin_error_or_ignore "libzeitgeist not found"
@@ -198,10 +182,12 @@ for plugin in ${used_plugins}; do
                			 HAS_TOMBOY_ADDINS=yes, HAS_TOMBOY_ADDINS=no)
 			PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0, 
 				HAS_GTK_SHARP=yes, GTK_SHARP=no)
+
 			if test "${ENABLE_ZEITGEIST_SHARP}" = "no" ; then
 				plugin_error_or_ignore "zeitgeist-sharp package not found"
 				continue
 			fi
+
 			AC_PATH_PROG(TOMBOY, tomboy, no)
 			if test "x$TOMBOY_ADDINS" = "xno"; then
 				plugin_error_or_ignore "You need to install tomboy"
@@ -215,7 +201,7 @@ for plugin in ${used_plugins}; do
 			  plugin_error_or_ignore "You need to install xbuild for tomboy"
 				continue
 			fi
-			if test "x$GTK_SHARP" = "xno"; then
+			if test "x$HAS_GTK_SHARP" = "xno"; then
 				plugin_error_or_ignore "You need to install gtk-sharp"
 				continue
 			fi
@@ -304,21 +290,13 @@ if test "x${PLUGINS}" != "x" ; then
                                         		continue 2
                                         	;;
                                         	firefox)
-												AC_CONFIG_FILES([
-													firefox/Makefile
-													firefox/extension/Makefile
-												])
-												continue 2
-											;;
-                                        	firefox-40-libzg)
-                                        		AC_CONFIG_FILES([
-                                        			firefox-40-libzg/Makefile
-                                        			firefox-40-libzg/extension/Makefile
-                                        			firefox-40-libzg/extension/components/Makefile
-                                        		])
-                                        		continue 2
-                                        	;;
-											firefox-36-libzg)
+							AC_CONFIG_FILES([
+								firefox/Makefile
+								firefox/extension/Makefile
+							])
+							continue 2
+						;;
+						firefox-36-libzg)
                                         		AC_CONFIG_FILES([
                                         			firefox-36-libzg/Makefile
                                         			firefox-36-libzg/extension/Makefile
diff --git a/firefox-40-libzg/Makefile.am b/firefox-40-libzg/Makefile.am
deleted file mode 100644
index 3f10b12..0000000
--- a/firefox-40-libzg/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS = extension
-
-# identifier for the FF profile in which 'make install' installs this extension
-TARGET_PROFILE = *default*
-
-local-install: all
-	$(MAKE) -C extension $@
-	unzip -o ZeitgeistDataprovider.xpi -d ~/xpcom_firefox\@zeitgeist-project.com
-	cd ~/.mozilla/firefox/$(TARGET_PROFILE)/ && mkdir -p extensions
-	cp -r ~/xpcom_firefox\@zeitgeist-project.com/ ~/.mozilla/firefox/$(TARGET_PROFILE)/extensions/
-
-local-uninstall:
-	$(MAKE) -C extension $@
-	-rm -rf ~/.mozilla/firefox/$(TARGET_PROFILE)/extensions/xpcom_firefox\@zeitgeist-project.com
-	-rm -rf ~/.mozilla/firefox/$(TARGET_PROFILE)/extensions/ZeitgeistDataprovider.xpi
-
diff --git a/firefox-40-libzg/README b/firefox-40-libzg/README
deleted file mode 100644
index 0aa57ea..0000000
--- a/firefox-40-libzg/README
+++ /dev/null
@@ -1,43 +0,0 @@
-Links
-=====
-
-Code is based on:
-	http://www.ibm.com/developerworks/opensource/library/os-xpcomfirefox/index.html
-
-Other useful ressources:
-	https://developer.mozilla.org/en/XPCOM_Glue
-	http://www.iosart.com/firefox/xpcom/
-	http://www.ibm.com/developerworks/webservices/library/co-xpcom5.html (with link to the complete series)
-	http://blog.lazytech.info/2007/05/26/xpcom-javascript-function-call/ (about implementing JS callbacks)
-
-
-Unknown symbols in ubuntu lucid
-===============================
-
-On ubuntu lucid `ldd -r *.so` shows libxpcom as unknown symbol, to fix this create 
-
-	/etc/ld.so.conf.d/libxpcom.conf
-
-with this content: 
-
-	# for xpcom
-	/usr/lib/xulrunner-1.9.2.3
-
-
-And rebuild the cache
-	$ sudo ldconfig
-
-You have to do the same for libzeitgeist!
-
-
-Component UUID
-==============
-
-the uuid for the component is
-	d879c08c-517d-44f0-83e1-3ef75a527ddf
-
-
-TODO
-====
-	* add JS callback to .insert() so user can be notified of issues while inserting event
-	* add events for downloads, see https://developer.mozilla.org/en/nsIDownloadProgressListener
diff --git a/firefox-40-libzg/extension/Makefile.am b/firefox-40-libzg/extension/Makefile.am
deleted file mode 100644
index af52cf9..0000000
--- a/firefox-40-libzg/extension/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-SUBDIRS = components
-
-extensiondir = $(datadir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-EXTENSIONS_SYMLINK = $(extensiondir)/xpcom_firefox@zeitgeist-project.com
-
-xul_extdir = $(datadir)/xul-ext-zeitgeist
-dist_xul_ext_DATA = \
-	license.txt \
-	chrome.manifest \
-	install.rdf \
-	$(NULL)
-
-contentdir = $(xul_extdir)/chrome/content
-dist_content_DATA = \
-	chrome/content/zeitgeist.xul \
-	chrome/content/zeitgeist.png \
-	$(NULL)
-
-prefsdir = $(xul_extdir)/defaults/preferences
-dist_prefs_DATA = \
-	defaults/preferences/zeitgeist.js \
-	$(NULL)
-
-install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)$(extensiondir)
-	test -h "$(DESTDIR)$(EXTENSIONS_SYMLINK)" || $(LN_S) -f "$(DESTDIR)$(xul_extdir)" "$(DESTDIR)$(EXTENSIONS_SYMLINK)"
-
-# we want to allow also local install
-EXTENSION_CONTENT = \
-	$(dist_xul_ext_DATA) \
-	defaults \
-	chrome \
-	components/libzeitgeist_xpcom.so \
-	components/zeitgeist.xpt \
-	$(NULL)
-
-local-install: all
-	$(MAKE) -C components $@
-	zip -r ../ZeitgeistDataprovider.xpi $(EXTENSION_CONTENT)
-
-local-uninstall:
-	$(MAKE) -C components $@
diff --git a/firefox-40-libzg/extension/chrome.manifest b/firefox-40-libzg/extension/chrome.manifest
deleted file mode 100644
index 8a8d814..0000000
--- a/firefox-40-libzg/extension/chrome.manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-binary-component	components/libzeitgeist_xpcom.so
-interfaces	components/zeitgeist.xpt
-content		zeitgeist				chrome/content/
-overlay		chrome://browser/content/browser.xul	chrome://zeitgeist/content/zeitgeist.xul
diff --git a/firefox-40-libzg/extension/chrome/content/zeitgeist.png b/firefox-40-libzg/extension/chrome/content/zeitgeist.png
deleted file mode 100644
index 4ae18f0..0000000
--- a/firefox-40-libzg/extension/chrome/content/zeitgeist.png
+++ /dev/null
diff --git a/firefox-40-libzg/extension/chrome/content/zeitgeist.xul b/firefox-40-libzg/extension/chrome/content/zeitgeist.xul
deleted file mode 100644
index ce1a27e..0000000
--- a/firefox-40-libzg/extension/chrome/content/zeitgeist.xul
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<overlay id="zeitgeist" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<script type="application/x-javascript"><![CDATA[
-		var zeitgeistgluexpcominterface = null;
-
-		var enable_googlemail = false;
-		var googlemail_view_regex = new RegExp("mail\\.google\\.com");
-		var pbs = Components.classes["@mozilla.org/privatebrowsing;1"]
-				.getService(Components.interfaces.nsIPrivateBrowsingService);
-
-		var debug = function (aMessage) {
-			var consoleService = Components.classes["@mozilla.org/consoleservice;1"]
-				.getService(Components.interfaces.nsIConsoleService);
-			consoleService.logStringMessage("Zeitgeist Extension: " + aMessage);
-			window.dump("Zeitgeist Extension:" + aMessage + "\n");
-		}
-
-		var make_pattern = function(pattern) {
-			for (item in pattern) {
-				// alert(pattern[item]);
-				pattern[item] = new RegExp(pattern[item]);
-			};
-			return pattern;
-		};
-
-		var ZeitgeistPrefObserver = {
-			register: function() {
-				// First we'll need the preference services to look for preferences.
-				var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-					.getService(Components.interfaces.nsIPrefService);
-
-				// For this._branch we ask that the preferences for extensions.myextension. and children
-				this._branch = prefService.getBranch("extensions.zeitgeist.");
-
-				// Now we queue the interface called nsIPrefBranch2. This interface is described as:  
-				// "nsIPrefBranch2 allows clients to observe changes to pref values."
-				this._branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
-
-				// Finally add the observer.
-				this._branch.addObserver("", this, false);
-			},
-
-			unregister: function() {
-				if(!this._branch) return;
-				this._branch.removeObserver("", this);
-			},
-
-			observe: function(aSubject, aTopic, aData) {
-				if(aTopic != "nsPref:changed") return;
-					// aSubject is the nsIPrefBranch we're observing (after appropriate QI)
-					// aData is the name of the pref that's been changed (relative to aSubject)
-					switch (aData) {
-						case "ignored_uris":
-							// extensions.zeitgeist.ignored_uris was changed
-							pattern = this.get_string(aData);
-							// alert(pattern);
-							ignored_uris = make_pattern(pattern);
-							break;
-						case "enable_googlemail":
-							enable_googlemail = this.get_bool(aData);
-							//alert("changed gmail to"+enable_googlemail);
-							break
-					}
-			},
-			get_string: function(key) {
-				try {
-					return JSON.parse(this._branch.getCharPref(key));
-				} catch(err) {
-					// this means there is no such config value
-					// ignoring this error
-					//alert(key + " : " + err);
-				};
-			},
-			get_bool: function(key) {
-				try {
-					return this._branch.getBoolPref(key);
-				} catch(err) {
-					// this means there is no such config value
-					// ignoring this error
-					//alert(key + " : " + err);
-				};
-			}
-		}
-		ZeitgeistPrefObserver.register();
-		ignored_uris = make_pattern(ZeitgeistPrefObserver.get_string("ignored_uris"));
-		debug("We are ignoring this uris: " + ignored_uris);
-		var enable_googlemail = ZeitgeistPrefObserver.get_bool("enable_googlemail");
-		debug("the googlemail handler extension is activated? ["+enable_googlemail+"]");
-
-		ignore_uri = function(uri) {
-			for (pattern in ignored_uris) {
-				if (ignored_uris[pattern].test(uri)) {
-					// alert("ignored " + uri);
-					return true;
-				};
-			};
-			return false;
-		};
-
-		try {
-			if(zeitgeistgluexpcominterface == null) {
-				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-				zeitgeistgluexpcominterface = Components.
-					classes["@zeitgeist-project.com/DATAPROVIDER/firefox-xpcom;1"].
-					createInstance(Components.interfaces.zeitgeist);
-			}
-		} catch(err) {
-			alert(err);
-		}
-		
-		var ZeitgeistProgressListener = {
-			onStateChange: function(aBrowser, aProgress, aRequest, aStateFlags) {
-				var inPrivateBrowsingMode = pbs.privateBrowsingEnabled;
-				if (inPrivateBrowsingMode) return;                               
-				if (aStateFlags & Components.interfaces.nsIWebProgressListener.STATE_STOP) {
-					var uri = aBrowser.currentURI.spec;
-					var mimetype = aBrowser.contentDocument.contentType;
-					if (aRequest.name == uri && !ignore_uri(uri)) {
-						var origin;
-						var parts = uri.split("://", 2);
-						if (parts[0] == "file") {
-							// Local file URI, we just trim it to directory in which the file is
-							origin = uri.substring(0, uri.lastIndexOf('/') + 1);
-						} else {
-							// HTTP(S), FTP or any other URI, we only take up to the domain name
-							origin = parts[0] + "://" + parts[1].split("/")[0] + "/";
-						}
-						zeitgeistgluexpcominterface.insert(
-							uri,
-							mimetype,
-							aBrowser.contentTitle,
-							origin
-						);
-						//alert("THATS WHAT WE HAVE "+enable_googlemail+" | "+uri+" | "+(enable_googlemail & googlemail_view_regex.test(uri)));
-						if (enable_googlemail & googlemail_view_regex.test(uri)) {
-							debug("let's begin the google fun'");
-							var dmt = aBrowser.contentDocument;
-							var head = dmt.getElementsByTagName("title")[0];
-							head.addEventListener("DOMSubtreeModified", function(event){
-								if (dmt.title) {
-									zeitgeistgluexpcominterface.insert(
-										dmt.location.href,
-										dmt.contentType,
-										dmt.title,
-										"http://mail.google.com/"
-									);
-								};
-							}, false);
-						}
-					}
-				}
-			},
-			// we don't implement this methods
-			onStatusChange: function(){},
-			onLocationChange: function(){},
-			onSecurityChange: function(){},
-			onProgressChange: function(){},
-		};
-
-
-		var zeitgeist = {
-			init: function() {
-				gBrowser.addTabsProgressListener(ZeitgeistProgressListener);
-			},
-			uninit: function() {
-				gBrowser.removeTabsProgressListener(ZeitgeistProgressListener);
-			},
-		};
-
-		window.addEventListener("load", function() {zeitgeist.init()}, false);
-		window.addEventListener("unload", function() {zeitgeist.uninit()}, false);
-		
-	]]></script>
-</overlay>
diff --git a/firefox-40-libzg/extension/components/Makefile.am b/firefox-40-libzg/extension/components/Makefile.am
deleted file mode 100644
index 1249931..0000000
--- a/firefox-40-libzg/extension/components/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-zeitgeistmoduledir = $(libdir)/xul-ext-zeitgeist
-zeitgeistmodule_LTLIBRARIES = libzeitgeist_xpcom.la
-zeitgeistmodule_DATA = zeitgeist.xpt
-
-xul_extdir = $(datadir)/xul-ext-zeitgeist
-
-libzeitgeist_xpcom_la_SOURCES = \
-	ZeitgeistComponent.cpp \
-	ZeitgeistModule.cpp \
-	$(NULL)
-
-libzeitgeist_xpcom_la_CXXFLAGS = \
-	-include "xpcom-config.h" \
-	$(ZEITGEIST_CFLAGS) \
-	$(LIBXUL_2_0_CFLAGS) \
-	$(NULL)
-
-libzeitgeist_xpcom_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
-	$(LIBXUL_2_0_LIBS) \
-	$(NULL)
-
-libzeitgeist_xpcom_la_LDFLAGS = \
-        -module -avoid-version \
-        $(NULL)
-
-BUILT_SOURCES = \
-	zeitgeist-library.h \
-	zeitgeist.h \
-	zeitgeist.xpt \
-	$(NULL)
-	
-EXTRA_DIST = \
-	zeitgeist.idl \
-	zeitgeistextend.h \
-	$(NULL)
-	
-DISTCLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(NULL)
-	
-
-zeitgeist.h: zeitgeist.idl
-	$(AM_V_GEN)$(XPIDL_BIN) -m header -I $(XUL_IDLDIR) -o zeitgeist $<
-
-zeitgeist.xpt: zeitgeist.idl
-	$(AM_V_GEN)$(XPIDL_BIN) -m typelib -I $(XUL_IDLDIR) -o zeitgeist $<
-
-zeitgeist-library.h:
-	$(AM_V_GEN)$(LN_S) "`$(PKG_CONFIG) --variable includedir zeitgeist-1.0`/zeitgeist-1.0/zeitgeist.h" $@
-
-install-exec-hook:
-	test -d $(DESTDIR)$(xul_extdir) || $(MKDIR_P) $(DESTDIR)$(xul_extdir)
-	test -h $(DESTDIR)$(xul_extdir)/components || $(LN_S) -f $(DESTDIR)$(zeitgeistmoduledir) $(DESTDIR)$(xul_extdir)/components
-
-# small helper with local install
-local-install: all
-	cp .libs/libzeitgeist_xpcom.so ./
-
-local-uninstall: ;
diff --git a/firefox-40-libzg/extension/components/ZeitgeistComponent.cpp b/firefox-40-libzg/extension/components/ZeitgeistComponent.cpp
deleted file mode 100644
index 6e8ae76..0000000
--- a/firefox-40-libzg/extension/components/ZeitgeistComponent.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ZeitgeistComponent.cpp
- * This file is part of zeitgeist dataprovider for firefox 
- *
- * Copyright (C) 2010 - Markus Korn <thekorn@gmx.de>
- *
- * zeitgeist dataprovider for firefox is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * 
- * zeitgeist dataprovider for firefox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
- 
-#include "mozilla/ModuleUtils.h"
-#include "zeitgeist.h"
-#include "zeitgeistextend.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(zeitgeistextend)
-
-NS_DEFINE_NAMED_CID(ZEITGEIST_COMPONENT_CID);
-
-static const mozilla::Module::CIDEntry kZeitgeistCIDs[] = {
-  { &kZEITGEIST_COMPONENT_CID, false, NULL, zeitgeistextendConstructor },
-  { NULL }
-};
-
-static const mozilla::Module::ContractIDEntry kZeitgeistContracts[] = {
-  { ZEITGEIST_COMPONENT_CONTRACTID, &kZEITGEIST_COMPONENT_CID },
-  { NULL }
-};
-
-static const mozilla::Module kZeitgeistModule = {
-  mozilla::Module::kVersion,
-  kZeitgeistCIDs,
-  kZeitgeistContracts,
-  NULL
-};
-
-NSMODULE_DEFN(ZeitgeistModule) = &kZeitgeistModule;
-
-NS_IMPL_MOZILLA192_NSGETMODULE(&kZeitgeistModule)
diff --git a/firefox-40-libzg/extension/components/ZeitgeistModule.cpp b/firefox-40-libzg/extension/components/ZeitgeistModule.cpp
deleted file mode 100644
index e06cfa2..0000000
--- a/firefox-40-libzg/extension/components/ZeitgeistModule.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * ZeitgeistModule.cpp
- * This file is part of zeitgeist dataprovider for firefox 
- *
- * Copyright (C) 2010 - Markus Korn <thekorn@gmx.de>
- * Copyright (C) 2010 - Michal Hruby <michal.mhr@gmail.com>
- * Copyright (C) 2011 - Collabora Ltd.
- *                      By Siegfried-A. Gevatter <siegfried@gevatter.com>
- *
- * zeitgeist dataprovider for firefox is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * 
- * zeitgeist dataprovider for firefox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
- 
-#include "zeitgeist.h"
-#include "zeitgeistextend.h"
-
-#include <nsStringAPI.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <zeitgeist.h>
-
-
-using namespace std;
-
-NS_IMPL_ISUPPORTS1(zeitgeistextend, zeitgeist)
-
-zeitgeistextend::zeitgeistextend()
-{
-	g_debug("constructor of zeitgeistextend");
-	g_type_init ();
-
-	log = (ZeitgeistLog *)g_object_new (ZEITGEIST_TYPE_LOG, NULL);
-}
-
-zeitgeistextend::~zeitgeistextend()
-{
-	g_debug("destructor of zeitgeistextend");
-}
-
-NS_IMETHODIMP zeitgeistextend::Insert(const char *url,
-                                      const char *mimetype,
-                                      const nsACString &title_str,
-                                      const char *origin)
-{
-	ZeitgeistEvent		*event;
-	gchar				*title = NULL;
-	bool				local_file;
-
-	g_debug("zeitgeist start - creating event");
-
-	if (!title_str.IsEmpty ())
-	{
-		gsize title_len = title_str.EndReading () - title_str.BeginReading ();
-		title = g_strndup (title_str.BeginReading (), title_len);
-	}
-
-	gchar **uri_parts = g_strsplit(url, "://", 2);
-	local_file = g_strcmp0 (uri_parts[0], "file") == 0;
-	g_strfreev(uri_parts);
-
-	event = zeitgeist_event_new_full (
-			ZEITGEIST_ZG_ACCESS_EVENT,
-			ZEITGEIST_ZG_USER_ACTIVITY,
-			"application://firefox.desktop",
-			zeitgeist_subject_new_full (
-				url,
-				ZEITGEIST_NFO_WEBSITE,
-				(local_file) ? ZEITGEIST_NFO_FILE_DATA_OBJECT : ZEITGEIST_NFO_REMOTE_DATA_OBJECT,
-				mimetype,
-				origin,
-				title,
-				"net"),
-	NULL);
-
-	if (title) g_free (title);
-	g_debug("inserting event");
-	zeitgeist_log_insert_events_no_reply(log, event, NULL);
-	g_debug("zeitgeist end");
-
-	return NS_OK;
-}
-
diff --git a/firefox-40-libzg/extension/components/zeitgeist-library.h b/firefox-40-libzg/extension/components/zeitgeist-library.h
deleted file mode 120000
index e0b4578..0000000
--- a/firefox-40-libzg/extension/components/zeitgeist-library.h
+++ /dev/null
@@ -1 +0,0 @@
-/usr/include/zeitgeist-1.0/zeitgeist.h
\ No newline at end of file
diff --git a/firefox-40-libzg/extension/components/zeitgeist.h b/firefox-40-libzg/extension/components/zeitgeist.h
deleted file mode 100644
index eded263..0000000
--- a/firefox-40-libzg/extension/components/zeitgeist.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM zeitgeist.idl
- */
-
-#ifndef __gen_zeitgeist_h__
-#define __gen_zeitgeist_h__
-
-
-#ifndef __gen_nsISupports_h__
-#include "nsISupports.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-
-/* starting interface:    zeitgeist */
-#define ZEITGEIST_IID_STR "d879c08c-517d-44f0-83e1-3ef75a527ddf"
-
-#define ZEITGEIST_IID \
-  {0xd879c08c, 0x517d, 0x44f0, \
-    { 0x83, 0xe1, 0x3e, 0xf7, 0x5a, 0x52, 0x7d, 0xdf }}
-
-class NS_NO_VTABLE NS_SCRIPTABLE zeitgeist : public nsISupports {
- public: 
-
-  NS_DECLARE_STATIC_IID_ACCESSOR(ZEITGEIST_IID)
-
-  /* void insert (in string url, in string mimetype, in AUTF8String title, in string origin); */
-  NS_SCRIPTABLE NS_IMETHOD Insert(const char *url, const char *mimetype, const nsACString & title, const char *origin) = 0;
-
-};
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(zeitgeist, ZEITGEIST_IID)
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_ZEITGEIST \
-  NS_SCRIPTABLE NS_IMETHOD Insert(const char *url, const char *mimetype, const nsACString & title, const char *origin); 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_ZEITGEIST(_to) \
-  NS_SCRIPTABLE NS_IMETHOD Insert(const char *url, const char *mimetype, const nsACString & title, const char *origin) { return _to Insert(url, mimetype, title, origin); } 
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_ZEITGEIST(_to) \
-  NS_SCRIPTABLE NS_IMETHOD Insert(const char *url, const char *mimetype, const nsACString & title, const char *origin) { return !_to ? NS_ERROR_NULL_POINTER : _to->Insert(url, mimetype, title, origin); } 
-
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class _MYCLASS_ : public zeitgeist
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_ZEITGEIST
-
-  _MYCLASS_();
-
-private:
-  ~_MYCLASS_();
-
-protected:
-  /* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(_MYCLASS_, zeitgeist)
-
-_MYCLASS_::_MYCLASS_()
-{
-  /* member initializers and constructor code */
-}
-
-_MYCLASS_::~_MYCLASS_()
-{
-  /* destructor code */
-}
-
-/* void insert (in string url, in string mimetype, in AUTF8String title, in string origin); */
-NS_IMETHODIMP _MYCLASS_::Insert(const char *url, const char *mimetype, const nsACString & title, const char *origin)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-
-#endif /* __gen_zeitgeist_h__ */
diff --git a/firefox-40-libzg/extension/components/zeitgeist.idl b/firefox-40-libzg/extension/components/zeitgeist.idl
deleted file mode 100644
index 497781e..0000000
--- a/firefox-40-libzg/extension/components/zeitgeist.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * zeitgeist.idl
- * This file is part of zeitgeist dataprovider for firefox 
- *
- * Copyright (C) 2010 - Markus Korn <thekorn@gmx.de>
- * Copyright (C) 2010 - Michal Hruby <michal.mhr@gmail.com>
- * Copyright (C) 2011 - Collabora Ltd.
- *                      By Siegfried-A. Gevatter <siegfried@gevatter.com>
- *
- * zeitgeist dataprovider for firefox is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * 
- * zeitgeist dataprovider for firefox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
- 
-#include "nsISupports.idl"
-[scriptable, uuid(d879c08c-517d-44f0-83e1-3ef75a527ddf)]
-interface zeitgeist : nsISupports
-{
-	void		insert(in string url, in string mimetype, in AUTF8String title, in string origin);
-};
-
diff --git a/firefox-40-libzg/extension/components/zeitgeist.xpt b/firefox-40-libzg/extension/components/zeitgeist.xpt
deleted file mode 100644
index f10e032..0000000
--- a/firefox-40-libzg/extension/components/zeitgeist.xpt
+++ /dev/null
diff --git a/firefox-40-libzg/extension/components/zeitgeistextend.h b/firefox-40-libzg/extension/components/zeitgeistextend.h
deleted file mode 100644
index 77ed50c..0000000
--- a/firefox-40-libzg/extension/components/zeitgeistextend.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * zeitgeistextend.h
- * This file is part of zeitgeist dataprovider for firefox 
- *
- * Copyright (C) 2010 - Markus Korn <thekorn@gmx.de>
- *
- * zeitgeist dataprovider for firefox is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * 
- * zeitgeist dataprovider for firefox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
- 
-#ifndef _ZEITGEISTEXTEND_H_
-#define _ZEITGEISTEXTEND_H_
-
-#include "zeitgeist.h"
-#include "zeitgeist-library.h"
-
-#define ZEITGEIST_COMPONENT_CONTRACTID "@zeitgeist-project.com/DATAPROVIDER/firefox-xpcom;1"
-#define ZEITGEIST_COMPONENT_CLASSNAME "zeitgeist dataprovider for firefox"
-#define ZEITGEIST_COMPONENT_CID  { 0xd879c08c, 0x517d, 0x44f0, { 0x83, 0xe1, 0x3e, 0xf7, 0x5a, 0x52, 0x7d, 0xdf } }
-
-//d879c08c-517d-44f0-83e1-3ef75a527ddf
-class zeitgeistextend : public zeitgeist
-{
-	public:
-		NS_DECL_ISUPPORTS
-		NS_DECL_ZEITGEIST
-
-		zeitgeistextend();
-		virtual ~zeitgeistextend();
-		ZeitgeistLog	*log;
-	
-};
-#endif
diff --git a/firefox-40-libzg/extension/defaults/preferences/zeitgeist.js b/firefox-40-libzg/extension/defaults/preferences/zeitgeist.js
deleted file mode 100644
index b9b8b93..0000000
--- a/firefox-40-libzg/extension/defaults/preferences/zeitgeist.js
+++ /dev/null
@@ -1,2 +0,0 @@
-pref("extensions.zeitgeist.ignored_uris", "[\"^about:*\"]");
-pref("extensions.zeitgeist.enable_googlemail", false);
diff --git a/firefox-40-libzg/extension/install.rdf b/firefox-40-libzg/extension/install.rdf
deleted file mode 100644
index b212e81..0000000
--- a/firefox-40-libzg/extension/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>xpcom_firefox@zeitgeist-project.com</em:id>
-    <em:version>0.3</em:version>
-    <em:type>2</em:type>
-   
-    <!-- Target Application this extension can install into, 
-         with minimum and maximum supported versions. --> 
-    <em:targetApplication>
-      <Description>
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>4.0.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-   
-    <!-- Front End MetaData -->
-    <em:name>zeitgeist</em:name>
-    <em:description>dataprovider for the zeitgeist framework, using xpcom and libzeitgeist</em:description>
-    <em:creator>Markus Korn</em:creator>
-    <em:homepageURL>http://launchpad.net/zeitgeist</em:homepageURL>
-    <em:iconURL>chrome://zeitgeist/content/zeitgeist.png</em:iconURL>
-  </Description>      
-</RDF>
diff --git a/firefox-40-libzg/extension/license.txt b/firefox-40-libzg/extension/license.txt
deleted file mode 100644
index f463a23..0000000
--- a/firefox-40-libzg/extension/license.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-