Merge lp:~manishsinha/zeitgeist-datasources/fix-tomboy-mimetype-mono-dependency into lp:zeitgeist-datasources/0.8

[Manish Sinha (मनीष सिन्हा)]

A working Tomboy dataprovider which logs the following events
* Open Note
* Close Note
* Add Note
* Delete Note

Uses zeitgeist-sharp 0.1.0.3 package which can be installed from
https://launchpad.net/zeitgeist-sharp/+milestone/0.1.0.1

1) Change the mimetype from x-tomboy to x-note
2) Remove the hard dependency on mono. The build script just checks for availability of mono

A working Tomboy dataprovider which logs the following events
* Open Note
* Close Note
* Add Note
* Delete Note

Uses zeitgeist-sharp 0.1.0.3 package which can be installed from
https://launchpad.net/zeitgeist-sharp/+milestone/0.1.0.1

1) Change the mimetype from x-tomboy to x-note
2) Remove the hard dependency on mono. The build script just checks for availability of mono

[lp:~manishsinha/zeitgeist-datasources/fix-tomboy-mimetype-mono-dependency]

101. By Manish Sinha (मनीष सिन्हा) on 2010-11-09

Added check for gtk-sharp and fixed indentation

102. By Manish Sinha (मनीष सिन्हा) on 2010-11-09

Changed compulsary checking of packages in tomboy section

[Michal Hruby (mhr3)]

I think the with/without-mono option isn't really necessary, with-mono is covered by --enable-all-plugins and without is detected automatically, and moreover if one specifies only --with-mono, configure will basically ignore it if mono dependencies are not installed.

The only question is what should happen if one would configure with "--enable-all-plugins --without-mono"

review: Needs Information

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

if you try to configure with "--enable-all-plugins --without-mono"
then the configure fails, since mono is required for tomboy. The output is
http://paste.ubuntu.com/529369/

[Michal Hruby (mhr3)]

Which further proves my point that the option is useless, please remove it.

review: Needs Fixing

[lp:~manishsinha/zeitgeist-datasources/fix-tomboy-mimetype-mono-dependency]

103. By Manish Sinha (मनीष सिन्हा) on 2010-11-10

Changed configure.ac for the configure script to not fail if mono is not available or --with-mono=no with --enable-all-plugins

[Michal Hruby (mhr3)]

Approving from the configure/make POV, if someone wants to take a close look on the DP itself, please go ahead...

review: Approve (build system)

[Seif Lotfy (seif)]

works like charm

[lp:~manishsinha/zeitgeist-datasources/fix-tomboy-mimetype-mono-dependency]

104. By Manish Sinha (मनीष सिन्हा) on 2010-11-12

Merge Markus Korn's (thekorn) tomboy local-install and local-uninstall implementation

[Seif Lotfy (seif)]

Tomboy crashes upon opening a note
------------------------------------

seif@Wumbo:~/Projects$ tomboy
[INFO 13:59:30.892] Initializing Mono.Addins
Zg#: init new
Zg#: init new
Zg#: Note window opened: Events
Operation AccessEvent successful
Exception in Gtk# callback delegate
  Note: Applications can use GLib.ExceptionManager.UnhandledException to handle the exception.
System.Exception: org.freedesktop.DBus.Error.NoReply: Message did not receive a reply (timeout by message bus)
  at Zeitgeist.Client.ILogProxy.InsertEvents (Zeitgeist.Datamodel.RawEvent[] events) [0x00000] in <filename unknown>:0
  at Zeitgeist.LogClient.InsertEvents (System.Collections.Generic.List`1 events) [0x00000] in <filename unknown>:0
  at Tomboy.Zeitgeist.ZeitgeistHandler.SendEvent (System.Collections.Generic.List`1 e) [0x00000] in <filename unknown>:0
  at Tomboy.Zeitgeist.ZeitgeistHandler+<SendEvent>c__AnonStorey0.<>m__0 () [0x00000] in <filename unknown>:0
  at GLib.Idle+IdleProxy.Handler () [0x00000] in <filename unknown>:0
   at GLib.ExceptionManager.RaiseUnhandledException(System.Exception e, Boolean is_terminal)
   at GLib.Idle+IdleProxy.Handler()
   at Gtk.Application.gtk_main()
   at Gtk.Application.Run()
   at Gnome.Program.Run()
   at Tomboy.GnomeApplication.StartMainLoop()
   at Tomboy.Application.StartMainLoop()
   at Tomboy.Tomboy.StartTrayIcon()
   at Tomboy.Tomboy.Main(System.String[] args)

[Seif Lotfy (seif)]

Scratch that invalid comment due testing a broken zeitgeist DB

> Tomboy crashes upon opening a note
> ------------------------------------
>
> seif@Wumbo:~/Projects$ tomboy
> [INFO 13:59:30.892] Initializing Mono.Addins
> Zg#: init new
> Zg#: init new
> Zg#: Note window opened: Events
> Operation AccessEvent successful
> Exception in Gtk# callback delegate
> Note: Applications can use GLib.ExceptionManager.UnhandledException to
> handle the exception.
> System.Exception: org.freedesktop.DBus.Error.NoReply: Message did not receive
> a reply (timeout by message bus)
> at Zeitgeist.Client.ILogProxy.InsertEvents (Zeitgeist.Datamodel.RawEvent[]
> events) [0x00000] in <filename unknown>:0
> at Zeitgeist.LogClient.InsertEvents (System.Collections.Generic.List`1
> events) [0x00000] in <filename unknown>:0
> at Tomboy.Zeitgeist.ZeitgeistHandler.SendEvent
> (System.Collections.Generic.List`1 e) [0x00000] in <filename unknown>:0
> at Tomboy.Zeitgeist.ZeitgeistHandler+<SendEvent>c__AnonStorey0.<>m__0 ()
> [0x00000] in <filename unknown>:0
> at GLib.Idle+IdleProxy.Handler () [0x00000] in <filename unknown>:0
> at GLib.ExceptionManager.RaiseUnhandledException(System.Exception e,
> Boolean is_terminal)
> at GLib.Idle+IdleProxy.Handler()
> at Gtk.Application.gtk_main()
> at Gtk.Application.Run()
> at Gnome.Program.Run()
> at Tomboy.GnomeApplication.StartMainLoop()
> at Tomboy.Application.StartMainLoop()
> at Tomboy.Tomboy.StartTrayIcon()
> at Tomboy.Tomboy.Main(System.String[] args)

=== modified file '.bzrignore'
--- .bzrignore	2010-05-12 06:44:01 +0000
+++ .bzrignore	2010-11-12 17:39:29 +0000
@@ -1,3 +1,9 @@
 firefox*/*.xpi
 firefox-libzg/extension/components/zeitgeist.h
 firefox-libzg/extension/components/zeitgeist.xpt
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo

=== modified file 'configure.ac'
--- configure.ac	2010-11-02 21:04:17 +0000
+++ configure.ac	2010-11-12 17:39:29 +0000
@@ -35,6 +35,20 @@
 AM_CONDITIONAL(ENABLE_VALA, test "x$with_vala" = "xyes")
 
 dnl ==============================================
+dnl Check for Mono
+dnl ==============================================
+
+AC_ARG_WITH([mono],
+	AS_HELP_STRING([--without-mono],
+		[Disables Mono plugins]),
+	[],[with_mono=yes])
+
+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
 dnl ==============================================
 
@@ -51,8 +65,8 @@
 AC_MSG_RESULT($all_plugins)
 
 # The full list of plugins
-allowed_plugins="bzr chrome eog firefox-libzg geany gedit rhythmbox totem-libzg vim emacs"
-# currently disabled = "epiphany tomboy"
+allowed_plugins="bzr chrome eog firefox-libzg geany gedit rhythmbox totem-libzg vim emacs tomboy"
+# 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
@@ -152,8 +166,36 @@
 			fi
 		;;
 		tomboy)
-			# not supported atm
-			continue
+			if test "${with_mono}" != "yes" ; then
+				continue
+			fi
+			PKG_CHECK_MODULES(ZEITGEIST_SHARP, zeitgeist-sharp,
+				ENABLE_ZEITGEIST_SHARP=yes, ENABLE_ZEITGEIST_SHARP=no)
+			PKG_CHECK_MODULES(TOMBOY_ADDINS, tomboy-addins)
+			PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0, 
+				HAS_GTK_SHARP=yes, HAS_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" = "xno"; then
+				plugin_error_or_ignore "You need to install tomboy"
+				continue
+			fi
+			if test "x$GMCS" = "xno"; then
+				plugin_error_or_ignore "You need to install gmcs"
+				continue
+			fi
+			if test "x$XBUILD" = "xno"; then
+			  plugin_error_or_ignore "You need to install xbuild"
+				continue
+			fi
+			if test "x$GTK_SHARP" = "xno"; then
+				plugin_error_or_ignore "You need to install gtk-sharp"
+				continue
+			fi
+			AC_SUBST(ZEITGEIST_SHARP_LIBS)
 		;;
 		totem*)
 			if test "${with_vala}" != "yes" ; then
@@ -241,6 +283,10 @@
                                         		AC_CONFIG_FILES([geany/Makefile])
                                         		continue 2
                                         	;;
+                                        	tomboy)
+                                        		AC_CONFIG_FILES([tomboy/Makefile])
+                                        		continue 2
+                                        	;;
                                         	gedit)
                                         		AC_CONFIG_FILES([gedit/Makefile])
                                         		continue 2

=== added file 'tomboy/AssemblyInfo.cs'
--- tomboy/AssemblyInfo.cs	1970-01-01 00:00:00 +0000
+++ tomboy/AssemblyInfo.cs	2010-11-12 17:39:29 +0000
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("ZeitgeistDataProvider")]
+[assembly: AssemblyDescription("Handles the pushing of Tomboy events to Zeitgeist")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+

=== added file 'tomboy/Makefile.am'
--- tomboy/Makefile.am	1970-01-01 00:00:00 +0000
+++ tomboy/Makefile.am	2010-11-12 17:39:29 +0000
@@ -0,0 +1,48 @@
+CSFLAGS = 		\
+	-debug 		\
+	-define:DEBUG 	\
+	-target:library
+
+ASSEMBLIES = 					\
+	$(TOMBOY_ADDINS_LIBS)			\
+	$(GTK_SHARP_LIBS)			\
+	$(ZEITGEIST_SHARP_LIBS)     \
+	-r:Mono.Posix
+
+ADDIN_NAME = ZeitgeistDataprovider
+TARGET = $(ADDIN_NAME).dll
+CSFILES = \
+	$(srcdir)/Zeitgeist.cs     \
+	$(srcdir)/ZeitgeistAddin.cs     \
+	$(srcdir)/NoteHandler.cs     \
+	$(srcdir)/AssemblyInfo.cs
+RESOURCES = \
+	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml
+
+$(TARGET): $(CSFILES)
+	$(GMCS) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+
+
+addinsdir = $(libdir)/tomboy/addins
+addins_DATA = 	$(TARGET)
+
+EXTRA_DIST =            	\
+	$(CSFILES) \
+	$(srcdir)/$(ADDIN_NAME).addin.xml
+	
+DISTCLEANFILES = \
+	$(TARGET) \
+	$(TARGET).mdb
+
+TOMBOY_ADDIN_HOME_DIR = ~/.config/tomboy/addins
+
+local-install: $(addins_DATA)
+	mkdir -p $(TOMBOY_ADDIN_HOME_DIR)
+	cp $(addins_DATA) $(TOMBOY_ADDIN_HOME_DIR)
+
+local-uninstall:
+	for f in $(addins_DATA); \
+	do \
+		echo remove $$f; \
+		rm -f $(TOMBOY_ADDIN_HOME_DIR)/$$f; \
+	done

=== added file 'tomboy/NoteHandler.cs'
--- tomboy/NoteHandler.cs	1970-01-01 00:00:00 +0000
+++ tomboy/NoteHandler.cs	2010-11-12 17:39:29 +0000
@@ -0,0 +1,69 @@
+using System;
+using Zeitgeist.Datamodel;
+using System.Collections.Generic;
+
+namespace Tomboy.Zeitgeist
+{
+	public class NoteHandler
+	{
+		public NoteHandler(Note note)
+		{
+			// Check if the Note has already been processes.
+			// Whent he note is being processed, event handlers are attached to
+			if (handledNotes.Contains(note) == false)
+			{
+				this._note = note;
+				
+				note.Opened += HandleNoteOpened;
+				if (note.HasWindow)
+				{
+					HandleNoteOpened();
+				}
+			}
+		}
+		
+		void HandleNoteOpened (object sender, EventArgs e)
+		{
+			HandleNoteOpened();
+		}
+		
+		void HandleNoteOpened()
+		{
+			this._note.Window.Hidden += HandleNoteWindowHidden;
+			this._note.Window.Shown += HandleNoteWindowShown;
+			this._note.Renamed += HandleNoteRenamed;
+			if (this._note.Window.Visible)
+			{
+				HandleNoteWindowShown();	
+			}
+		}
+		
+		void HandleNoteRenamed (Note sender, string old_title)
+		{
+			Console.WriteLine("Zg#: Renamed: " + this._note.Title);
+			ZeitgeistHandler.SendEvent(sender, Interpretation.Instance.EventInterpretation.ModifyEvent);
+		}
+		
+		void HandleNoteWindowShown (object sender, EventArgs e)
+		{
+			HandleNoteWindowShown();
+		}
+		
+		void HandleNoteWindowShown ()
+		{
+			Console.WriteLine("Zg#: Note window opened: " + this._note.Title);
+			ZeitgeistHandler.SendEvent(this._note, Interpretation.Instance.EventInterpretation.AccessEvent);
+		}
+		
+		void HandleNoteWindowHidden (object sender, EventArgs e)
+		{
+			Console.WriteLine("Zg#: Note window closed: " + this._note.Title);
+			ZeitgeistHandler.SendEvent(this._note, Interpretation.Instance.EventInterpretation.LeaveEvent);
+		}
+		
+		private Note _note;
+		
+		private static List<Note> handledNotes = new List<Note>();
+	}
+}
+

=== removed file 'tomboy/Zeitgeist.addin.xml'
--- tomboy/Zeitgeist.addin.xml	2010-08-16 11:07:09 +0000
+++ tomboy/Zeitgeist.addin.xml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<Addin id="Zeitgeist"
-    namespace="Tomboy"
-    name="Zeitgeist Integration"
-    author="Laszlo Pandy [e-mail]"
-    description="Logs usage data to Zeitgeist."
-    category="Desktop Integration"
-    defaultEnabled="true"
-    version="0.1">
-
-    <Runtime>
-        <Import assembly="Zeitgeist.dll" />
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="Tomboy" version="0.10" />
-    </Dependencies>
-
-    <Extension path="/Tomboy/ApplicationAddins">
-        <ApplicationAddin type="Tomboy.Zeitgeist.ZeitgeistAddin" />
-    </Extension>
-</Addin>

=== modified file 'tomboy/Zeitgeist.cs'
--- tomboy/Zeitgeist.cs	2010-08-19 10:33:11 +0000
+++ tomboy/Zeitgeist.cs	2010-11-12 17:39:29 +0000
@@ -1,200 +1,83 @@
-
 using System;
+using Zeitgeist.Datamodel;
+using Zeitgeist;
 using System.Collections.Generic;
 using Tomboy;
-using NDesk.DBus;
-using Gtk;
-using GLib;
-using Mono.Unix.Native;
 
 namespace Tomboy.Zeitgeist
 {
-	class NoteHandler 
-	{
-		private static List<string> handled_notes = new List<string>();
-		private Note note;
-		
-		public NoteHandler(Note note) {
-			if (handled_notes.Contains(note.Id) == false) {
-				this.note = note;
-				note.Opened += HandleNoteOpened;
-				if (note.HasWindow) {
-					HandleNoteOpened();
-				}
-			}
-		}
-		
-		void HandleNoteOpened (object sender, EventArgs e) {
-			HandleNoteOpened();
-		}
-		void HandleNoteOpened() {
-			note.Window.Hidden += HandleNoteWindowHidden;
-			note.Window.Shown += HandleNoteWindowShown;
-			note.Renamed += HandleNoteRenamed;
-			if (note.Window.Visible) {
-				HandleNoteWindowShown();	
-			}
-		}
-
-		void HandleNoteRenamed (Note sender, string old_title)
-		{
-			Console.WriteLine("Zg: Renamed: " + note.Title);
-			ZeitgeistDbus.SendToZeitgeist(note, ZeitgeistDbus.EventInterpretation.ModifyEvent);
-		}
-		
-		void HandleNoteWindowShown (object sender, EventArgs e) {
-			HandleNoteWindowShown();
-		}
-		void HandleNoteWindowShown ()
-		{
-			Console.WriteLine("Zg: Note window opened: " + note.Title);
-			ZeitgeistDbus.SendToZeitgeist(note, ZeitgeistDbus.EventInterpretation.OpenEvent);
-		}
-		
-		void HandleNoteWindowHidden (object sender, EventArgs e)
-		{
-			Console.WriteLine("Zg: Note window closed: " + note.Title);
-			ZeitgeistDbus.SendToZeitgeist(note, ZeitgeistDbus.EventInterpretation.CloseEvent);
-		}
-	}
-	
-	class ZeitgeistDbus
-	{
-		private static ILogger zeitgeist_proxy = 
-			Bus.Session.GetObject<ILogger>("org.gnome.zeitgeist.Engine", 
-			                               new ObjectPath("/org/gnome/zeitgeist/log/activity"));
-		
-		public enum EventInterpretation {
-			OpenEvent,
-			CloseEvent,
-			CreateEvent,
-			ModifyEvent,
-		}
-		
-		private static string GetEventInterpetation(EventInterpretation e) {
-			switch(e) {
-			case EventInterpretation.OpenEvent:
-				return "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AccessEvent";
-			case EventInterpretation.CloseEvent:
-				return "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#LeaveEvent";
-			case EventInterpretation.CreateEvent:
-				return "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#CreateEvent";
-			case EventInterpretation.ModifyEvent:
-				return "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ModifyEvent";
-			default:
-				return null;
-			}
-		}
-		
-		public static void SendToZeitgeist(Note note, EventInterpretation ev_interp) {
-			if (zeitgeist_proxy == null) {
-				Console.WriteLine("Zg: cannot connect to zeitgeist, dbus proxy is null");
-				return;	
-			}
-			
-			string ev_interp_string = GetEventInterpetation(ev_interp);
-			if (ev_interp_string == null) {
-				Console.WriteLine("Zg: unknown interpretation type: " + ev_interp.ToString());
-				return;
-			}
-			
-			Timeval t;
-			Syscall.gettimeofday(out t);
-			long millis_now = (t.tv_sec * 1000) + (t.tv_usec / 1000);
-			
-			Event e = new Event();
-			e.metadata = new string[5];
-			e.metadata[0] = ""; //id (filled in by Zeitgeist)
-			e.metadata[1] = millis_now.ToString();
-			e.metadata[2] = ev_interp_string;
-			e.metadata[3] = "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#UserActivity";
-			e.metadata[4] = "application://tomboy.desktop";
-			
-			string[] subject = new string[7];
-			subject[0] = note.Uri;
-			subject[1] = "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Document";
-			subject[2] = "http://www.semanticdesktop.org/ontologies/nfo#FileDataObject";
-			subject[3] = ""; //origin
-			subject[4] = "application/x-tomboy"; //mimetype
-			subject[5] = note.Title; 
-			subject[6] = ""; //storage id
-			
-			e.subjects = new string[][] { subject };
-			e.payload = new byte[0];
-			
-			GLib.Idle.Add(delegate() {
-				SendEvent(e);
+	public class ZeitgeistHandler
+	{
+		public static bool SendEvent(Note note, NameUri eventInterpretation)
+		{
+			NameUri eventManifestation = Manifestation.Instance.EventManifestation.UserActivity;
+			
+			NameUri subjectInterpretation = Interpretation.Instance.Document.Document;
+			NameUri subjectManifestation = Manifestation.Instance.FileDataObject.FileDataObject;
+			
+			Event ev = EventCreator.CreateEvent(note, eventInterpretation, eventManifestation, subjectInterpretation, subjectManifestation);
+			
+			
+			try
+			{
+				List<Event> listOfEvents = new List<Event>();
+				listOfEvents.Add(ev);
+				
+				GLib.Idle.Add(delegate()
+							{
+								SendEvent(listOfEvents);
+								return false;
+							});
+				
+				Console.WriteLine(string.Format("Operation {0} successful", ev.Interpretation.Name));
+				return true;
+			}
+			catch(Exception e)
+			{
+				Console.WriteLine(e.StackTrace);
+				
 				return false;
-			});
-		}
-			
-		private static void SendEvent(Event e) {
-			int[] inserted;
-			try {
-				inserted = zeitgeist_proxy.InsertEvents(new Event[] { e });	
-			} catch (Exception ex) {
-				Console.WriteLine("Zg: insertion failed: " + ex.Message);
-				return;
-			}
-			
-			if (inserted.Length > 0) {
-				Console.WriteLine("Zg: Inserted event: " + inserted[0]);
-			}
-			else {
-				Console.WriteLine("Zg: Insertion failed");
-			}
-			return;
-		}
-	}
-	
-	[NDesk.DBus.Interface ("org.gnome.zeitgeist.Log")]
-	interface ILogger {
-		int[] InsertEvents(Event[] events);
-	}
-		                   
-	struct Event {
-		public string[] metadata;
-		public string[][] subjects;
-		public byte[] payload;
-	}
-	
-	public class ZeitgeistAddin : ApplicationAddin
+			}
+		}
+		
+		private static void SendEvent(List<Event> e)
+		{
+			LogClient client = new LogClient();
+			client.InsertEvents(e);
+		}
+	}
+	
+	public class EventCreator
 	{
-		private bool _init = false;
-		public override bool Initialized {
-			get { return _init; }
-		}
-		
-		public override
-		void Initialize() {
-			Console.WriteLine("Zg: init new");
-			init_handlers();
-			_init = true;
-		}
-		
-		public override
-		void Shutdown() {
-			Console.WriteLine("Zg: shutdown");
-		}
-		
-		void HandleNoteAdded(object sender, Note new_note) {
-			Console.WriteLine("Zg: Note added: " + new_note.Title);
-			Console.WriteLine("\t" + new_note.Uri);
-			
-			new NoteHandler(new_note);
-			ZeitgeistDbus.SendToZeitgeist(new_note, ZeitgeistDbus.EventInterpretation.CreateEvent);
-		}
-		
-		public void init_handlers() {
-			foreach (Note note in Tomboy.DefaultNoteManager.Notes) {
-				new NoteHandler(note);
-			}
-			
-			Tomboy.DefaultNoteManager.NoteAdded -= HandleNoteAdded;
-			Tomboy.DefaultNoteManager.NoteAdded += HandleNoteAdded;
+		public static Event CreateEvent(Note note,
+		                          NameUri eventInterpretation, 
+		                          NameUri eventManifestation, 
+		                          NameUri subjectInterpretation, 
+		                          NameUri subjectManifestation)
+		{
+			Event ev = new Event();
+			
+			
+			ev.Id = 0;
+			ev.Timestamp = DateTime.Now;
+			ev.Interpretation = eventInterpretation;
+			ev.Manifestation = eventManifestation;
+			ev.Actor = ZeitgeistAddin.TomboyUri;
+			
+			Subject sub = new Subject();
+			
+			sub.Uri = note.Uri;
+			sub.Interpretation = subjectInterpretation;
+			sub.Manifestation = subjectManifestation;
+			sub.Origin = string.Empty;
+			sub.MimeType = ZeitgeistAddin.NoteMimetype;
+			sub.Text = note.Title;
+			sub.Storage = string.Empty;
+			
+			ev.Subjects.Add(sub);
+			
+			return ev;
 		}
 	}
-	
-
-
 }
+

=== removed file 'tomboy/Zeitgeist.mdp'
--- tomboy/Zeitgeist.mdp	2010-08-16 10:57:40 +0000
+++ tomboy/Zeitgeist.mdp	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<Project name="Zeitgeist" fileversion="2.0" DefaultNamespace="Zeitgeist" language="C#" targetFramework="2.0" ctype="DotNetProject">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Debug" assembly="Zeitgeist" />
-      <Build debugmode="True" target="Library" />
-      <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-    <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="Zeitgeist" />
-      <Build debugmode="False" target="Library" />
-      <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-  </Configurations>
-  <Contents>
-    <File subtype="Code" buildaction="Compile" name="Zeitgeist.cs" />
-    <File subtype="Code" buildaction="EmbedAsResource" name="Zeitgeist.addin.xml" />
-  </Contents>
-  <References>
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Assembly" localcopy="True" specificVersion="False" refto="/usr/lib/tomboy/Tomboy.exe" />
-  </References>
-</Project>

=== added file 'tomboy/ZeitgeistAddin.cs'
--- tomboy/ZeitgeistAddin.cs	1970-01-01 00:00:00 +0000
+++ tomboy/ZeitgeistAddin.cs	2010-11-12 17:39:29 +0000
@@ -0,0 +1,90 @@
+using System;
+using Tomboy;
+using System.Collections.Generic;
+using System.IO;
+using Zeitgeist.Datamodel;
+
+namespace Tomboy.Zeitgeist
+{
+	public class ZeitgeistAddin  : ApplicationAddin
+	{
+		public ZeitgeistAddin ()
+		{
+			notesList = new List<NoteHandler>();
+		}
+		
+		#region Overridden methods
+		
+		public override bool Initialized
+		{
+			get
+			{
+				return _init;
+			}
+		}
+		
+		public override void Initialize()
+		{
+			Console.WriteLine("Zg#: init new");
+			
+			// Initialize the handlers for hooking into Tomboy
+			InitHandlers();
+			
+			_init = true;
+		}
+		
+		public override void Shutdown()
+		{
+			Console.WriteLine("Zg#: shutdown");
+		}
+		
+		#endregion
+		
+		public void InitHandlers()
+		{
+			// For every note present in the store
+			
+			foreach (Note note in Tomboy.DefaultNoteManager.Notes)
+			{
+				notesList.Add(new NoteHandler(note));
+			}
+			
+			Tomboy.DefaultNoteManager.NoteAdded -= HandleNoteAdded;
+			Tomboy.DefaultNoteManager.NoteAdded += HandleNoteAdded;
+			
+			Tomboy.DefaultNoteManager.NoteDeleted -= HandleNoteDeleted;
+			Tomboy.DefaultNoteManager.NoteDeleted += HandleNoteDeleted;
+		}
+		
+		void HandleNoteAdded(object sender, Note new_note)
+		{
+			Console.WriteLine("Zg#: Note added: " + new_note.Title);
+			Console.WriteLine("\t" + new_note.Uri);
+			
+			notesList.Add(new NoteHandler(new_note));
+			
+			ZeitgeistHandler.SendEvent(new_note, Interpretation.Instance.EventInterpretation.CreateEvent);
+		}
+		
+		void HandleNoteDeleted(object sender, Note new_note)
+		{
+			Console.WriteLine("Zg#: Note deleted: " + new_note.Title);
+			Console.WriteLine("\t" + new_note.Uri);
+			
+			ZeitgeistHandler.SendEvent(new_note, Interpretation.Instance.EventInterpretation.DeleteEvent);
+		}
+		
+		List<NoteHandler> notesList;
+		
+		private bool _init = false;
+		
+		#region Public Constants
+		
+		public const string TomboyUri = "application://tomboy.desktop";
+		
+		public const string NoteMimetype = "application/x-note";
+		
+		#endregion
+	}
+}
+

=== added file 'tomboy/ZeitgeistDataprovider.addin.xml'
--- tomboy/ZeitgeistDataprovider.addin.xml	1970-01-01 00:00:00 +0000
+++ tomboy/ZeitgeistDataprovider.addin.xml	2010-11-12 17:39:29 +0000
@@ -0,0 +1,21 @@
+<Addin id="ZeitgeistDataprovider"
+	namespace="Tomboy"
+	name="Zeitgeist Dataprovider Add-in"
+	author="Manish Sinha"
+	description="Pushes Tomboy events like open/close/delete notes into Zeitgeist"
+	category="Logging"
+	defaultEnabled="false"
+	version="0.1">
+
+	<Runtime>
+		<Import assembly="ZeitgeistDataprovider.dll" />
+	</Runtime>
+
+	<Dependencies>
+		<Addin id="Tomboy" version="0.10" />
+	</Dependencies>
+
+	<Extension path="/Tomboy/ApplicationAddins">
+		<ApplicationAddin type="Tomboy.Zeitgeist.ZeitgeistAddin" />
+	</Extension>
+</Addin>

=== added file 'tomboy/ZeitgeistDataprovider.csproj'
--- tomboy/ZeitgeistDataprovider.csproj	1970-01-01 00:00:00 +0000
+++ tomboy/ZeitgeistDataprovider.csproj	2010-11-12 17:39:29 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7F5F22BD-EF5D-4A73-AD3A-BEFF422E5CD0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ZeitgeistDataProvider</RootNamespace>
+    <AssemblyName>ZeitgeistDataProvider</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="zeitgeist-sharp, Version=0.1.0.1, Culture=neutral, PublicKeyToken=e3e10a585a87d40c">
+      <Package>zeitgeist-sharp</Package>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ZeitgeistDataprovider.addin.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PushEvents.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Tomboy.csproj">
+      <Project>{315DBB30-1461-4A41-A23F-A888D84E1EA0}</Project>
+      <Name>Tomboy</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>

=== removed file 'tomboy/install.sh'
--- tomboy/install.sh	2010-02-03 16:06:55 +0000
+++ tomboy/install.sh	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-mkdir -p ~/.config/tomboy/addins/
-
-# Please install monodevelop to get mdtool.
-# Please edit Zeitgeist.mdp and change the local path of Tomboy.exe
-# to the correct one for your environment (so it can link to the 
-# correct version of Tomboy).
-mdtool build Zeitgeist.mdp
-
-cp bin/Debug/Zeitgeist.dll ~/.config/tomboy/addins/Zeitgeist.dll 
-
-