Merge lp:~manishsinha/zeitgeist-datasources/reworked-tomboy into lp:zeitgeist-datasources/0.8

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

Reimplemented Tomboy's data provider using zeitgeist-sharp
http://launchpad.net/zeitgeist-sharp

[Michal Hruby (mhr3)]

From a quick look (I'm not using Tomboy):
- 'TomboyUri' should be just application://tomboy.desktop
- please get rid of the install.sh script, everything is now done using Makefiles
- I really don't like the bundled dll library, isn't there another way to check for it?

review: Needs Fixing

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

> From a quick look (I'm not using Tomboy):
> - 'TomboyUri' should be just application://tomboy.desktop
Doing it.

> - please get rid of the install.sh script, everything is now done using
> Makefiles
Yeah. Have to get it working. I just kept the old way of building.
> - I really don't like the bundled dll library, isn't there another way to
> check for it?
Until zeitgeist-sharp is not made available in the PPA/Repo, till then we have to keep it here. Once it is made available, then we can get rid of this. BTW this bundled dll is just a workaround till zg-sharp makes it into APT repo

Unmerged revisions

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

Removed the old mdp based builds

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

Modified build to include tomboy too

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

Added Simple Makefile support with most common targets. The config script does the basic package dependency checking

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

Changed the App name to application://tomboy.desktop and created a sln file

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

Implemented Note open, closed, deleted, hidden and renamed

Zeitgeist.dll is added in the source control. Once it is packages and available in the APT repos, it can be removed from the source code

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

Created the basic infrastructure for using Zeitgeist.dll. At present Logging is not implemented

=== added file 'Makefile.include'
--- Makefile.include	1970-01-01 00:00:00 +0000
+++ Makefile.include	2010-09-19 19:02:39 +0000
@@ -0,0 +1,118 @@
+VALID_CULTURES =   ar bg ca zh-CHS cs da de el en es fi fr he hu is it ja ko nl no pl pt ro ru hr sk sq sv th tr id uk be sl et lv lt fa vi hy eu mk af ka fo hi sw gu ta te kn mr gl kok ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR en-US fi-FI fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT fa-IR vi-VN hy-AM eu-ES mk-MK af-ZA ka-GE fo-FO hi-IN sw-KE gu-IN ta-IN te-IN kn-IN mr-IN gl-ES kok-IN ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI ar-EG zh-HK de-AT en-AU es-ES fr-CA ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO en-NZ es-CR fr-LU ar-MA en-IE es-PA ar-TN en-ZA es-DO ar-OM es-VE ar-YE es-CO ar-SY es-PE ar-JO en-TT es-AR ar-LB en-ZW es-EC ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA es-BO es-SV es-HN es-NI es-PR zh-CHT
+
+s2q=$(subst \ ,?,$1)
+q2s=$(subst ?,\ ,$1)
+# use this when result will be quoted
+unesc2=$(subst ?, ,$1)
+
+build_sources = $(FILES) $(GENERATED_FILES)
+build_sources_esc= $(call s2q,$(build_sources))
+# use unesc2, as build_sources_embed is quoted
+build_sources_embed= $(call unesc2,$(build_sources_esc:%='$(srcdir)/%'))
+
+comma__=,
+get_resource_name = $(firstword $(subst $(comma__), ,$1))
+get_culture =  $(lastword $(subst ., ,$(basename $1)))
+is_cultured_resource = $(and $(word 3,$(subst ., ,$1)), $(filter $(VALID_CULTURES),$(lastword $(subst ., ,$(basename $1)))))
+
+RESOURCES_ESC=$(call s2q,$(RESOURCES))
+
+build_resx_list = $(foreach res, $(RESOURCES_ESC), $(if $(filter %.resx, $(call get_resource_name,$(res))),$(res),))
+build_non_culture_resx_list = $(foreach res, $(build_resx_list),$(if $(call is_cultured_resource,$(call get_resource_name,$(res))),,$(res)))
+build_non_culture_others_list = $(foreach res, $(filter-out $(build_resx_list),$(RESOURCES_ESC)),$(if $(call is_cultured_resource,$(call get_resource_name,$(res))),,$(res)))
+build_others_list = $(build_non_culture_others_list)
+build_xamlg_list = $(filter %.xaml.g.cs, $(FILES))
+
+# resgen all .resx resources
+build_resx_files = $(foreach res, $(build_resx_list), $(call get_resource_name,$(res)))
+build_resx_resources_esc = $(build_resx_files:.resx=.resources)
+build_resx_resources = $(call q2s,$(build_resx_resources_esc))
+
+# embed resources for the main assembly
+build_resx_resources_hack = $(subst .resx,.resources, $(build_non_culture_resx_list))
+# use unesc2, as build_resx_resources_embed is quoted
+build_resx_resources_embed = $(call unesc2,$(build_resx_resources_hack:%='-resource:%'))
+build_others_files = $(call q2s,$(foreach res, $(build_others_list),$(call get_resource_name,$(res))))
+build_others_resources = $(build_others_files)
+# use unesc2, as build_others_resources_embed is quoted
+build_others_resources_embed = $(call unesc2,$(build_others_list:%='-resource:$(srcdir)/%'))
+
+build_resources = $(build_resx_resources) $(build_others_resources)
+build_resources_embed = $(build_resx_resources_embed) $(build_others_resources_embed)
+
+# -usesourcepath is available only for resgen2
+emit_resgen_target_1=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1)); cd '$$(shell dirname '$$<')' && MONO_IOMAP=drive $$(RESGEN) '$$(shell basename '$$<')' '$$(shell basename '$$@')'
+emit_resgen_target_2=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1)); MONO_IOMAP=drive $$(RESGEN) -usesourcepath '$$<' '$$@'
+
+emit_resgen_target=$(if $(filter resgen2,$(RESGEN)),$(emit_resgen_target_2),$(emit_resgen_target_1))
+emit_resgen_targets=$(foreach res,$(build_resx_resources_esc),$(eval $(call emit_resgen_target,$(res))))
+
+build_references_ref = $(call q2s,$(foreach ref, $(call s2q,$(REFERENCES)), $(if $(filter -pkg:%, $(ref)), $(ref), $(if $(filter -r:%, $(ref)), $(ref), -r:$(ref)))))
+build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(DLL_REFERENCES)), -r:$(ref)))
+build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(PROJECT_REFERENCES)), -r:$(ref)))
+
+s2q2s=$(call unesc2,$(call s2q,$1))
+cp_actual=test -z $1 || cp $1 $2
+cp=$(call cp_actual,'$(call s2q2s,$1)','$(call s2q2s,$2)')
+
+rm_actual=test -z '$1' || rm -f '$2'
+rm=$(call rm_actual,$(call s2q2s,$1),$(call s2q2s,$2)/$(shell basename '$(call s2q2s,$1)'))
+
+EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) $(ASSEMBLY_WRAPPER_IN) $(EXTRAS) $(DATA_FILES) $(build_culture_res_files)
+CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list)
+DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
+
+pkglib_SCRIPTS = $(ASSEMBLY)
+bin_SCRIPTS = $(BINARIES)
+
+programfilesdir = @libdir@/@PACKAGE@
+programfiles_DATA = $(PROGRAMFILES)
+linuxpkgconfigdir = @libdir@/pkgconfig
+linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
+
+
+# macros
+
+# $(call emit-deploy-target,deploy-variable-name)
+define emit-deploy-target
+$($1): $($1_SOURCE)
+	mkdir -p '$$(shell dirname '$$@')'
+	cp '$$<' '$$@'
+endef
+
+# $(call emit-deploy-wrapper,wrapper-variable-name,wrapper-sourcefile,x)
+# assumes that for a wrapper foo.pc its source template is foo.pc.in
+# if $3 is non-empty then wrapper is marked exec
+define emit-deploy-wrapper
+$($1): $2 
+	mkdir -p '$$(shell dirname '$$@')'
+	cp '$$<' '$$@'
+	$(if $3,chmod +x '$$@')
+
+endef
+
+# generating satellite assemblies
+
+culture_resources = $(foreach res, $(RESOURCES_ESC), $(if $(call is_cultured_resource,$(call get_resource_name, $(res))),$(res)))
+cultures = $(sort $(foreach res, $(culture_resources), $(call get_culture,$(call get_resource_name,$(res)))))
+culture_resource_dependencies = $(call q2s,$(BUILD_DIR)/$1/$(SATELLITE_ASSEMBLY_NAME): $(subst .resx,.resources,$2))
+culture_resource_commandlines = $(call unesc2,cmd_line_satellite_$1 += '/embed:$(subst .resx,.resources,$2)')
+build_satellite_assembly_list = $(call q2s,$(cultures:%=$(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME)))
+build_culture_res_files = $(call q2s,$(foreach res, $(culture_resources),$(call get_resource_name,$(res))))
+install_satellite_assembly_list = $(subst $(BUILD_DIR),$(DESTDIR)$(libdir)/$(PACKAGE),$(build_satellite_assembly_list))
+
+$(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_dependencies,$(call get_culture,$(call get_resource_name,$(res))),$(call get_resource_name,$(res))))))
+$(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_commandlines,$(call get_culture,$(call get_resource_name,$(res))),$(res)))))
+
+$(build_satellite_assembly_list): $(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME):
+	mkdir -p '$(@D)'
+	$(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*)
+
+$(install_satellite_assembly_list):
+	mkdir -p '$(@D)'
+	cp $(subst $(DESTDIR)$(libdir)/$(PACKAGE), $(BUILD_DIR), $@) $@
+
+install-satellite-assemblies: $(install_satellite_assembly_list)
+	
+uninstall-satellite-assemblies:
+	rm -rf $(install_satellite_assembly_list)
 \ No newline at end of file
 
=== modified file 'configure.ac'
--- configure.ac	2010-08-05 20:45:47 +0000
+++ configure.ac	2010-09-19 19:02:39 +0000
@@ -51,8 +51,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 +152,31 @@
 			fi
 		;;
 		tomboy)
-			# not supported atm
-			continue
+			AC_PATH_PROG(GMCS, gmcs, no)
+			PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
+			if test "x$GMCS" = "xno"; then
+				AC_MSG_ERROR([gmcs Not found])
+			fi
+			AC_ARG_ENABLE(debug,
+				AC_HELP_STRING([--enable-debug],
+					[Use 'DEBUG' Configuration [default=NO]]),
+					enable_debug=yes, enable_debug=no)
+			AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes)
+			if test "x$enable_debug" = "xyes" ; then
+				CONFIG_REQUESTED="yes"
+			fi
+			AC_ARG_ENABLE(release,
+				AC_HELP_STRING([--enable-release],
+					[Use 'RELEASE' Configuration [default=YES]]),
+					enable_release=yes, enable_release=no)
+			AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
+			if test "x$enable_release" = "xyes" ; then
+				CONFIG_REQUESTED="yes"
+			fi
+			if test -z "$CONFIG_REQUESTED" ; then
+				AM_CONDITIONAL(ENABLE_RELEASE, true)
+				enable_release=yes
+			fi
 		;;
 		totem*)
 			if test "${with_vala}" != "yes" ; then
@@ -217,6 +240,7 @@
 totem-libzg/Makefile
 vim/Makefile
 emacs/Makefile
+tomboy/Makefile
 ])
 
 AC_MSG_NOTICE([Zeitgeist-dataproviders was configured with the following options:])
 
=== added file 'tomboy/AssemblyInfo.cs'
--- tomboy/AssemblyInfo.cs	1970-01-01 00:00:00 +0000
+++ tomboy/AssemblyInfo.cs	2010-09-19 19:02:39 +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("Tomboy.Zeitgeist")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Zeitgeist Sharp Developers")]
+[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("0.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-09-19 19:02:39 +0000
@@ -0,0 +1,103 @@
+
+EXTRA_DIST =  expansions.m4 /usr/lib/tomboy/Tomboy.exe Zeitgeist.dll
+
+#Warning: This is an automatically generated file, do not edit!
+if ENABLE_DEBUG
+ SUBDIRS =  . 
+endif
+if ENABLE_RELEASE
+ SUBDIRS =  . 
+endif
+
+
+
+# Warning: This is an automatically generated file, do not edit!
+
+if ENABLE_DEBUG
+ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
+ASSEMBLY = bin/Debug/Tomboy.Zeitgeist.dll
+ASSEMBLY_MDB = $(ASSEMBLY).mdb
+COMPILE_TARGET = library
+PROJECT_REFERENCES = 
+BUILD_DIR = bin/Debug
+
+ZEITGEIST_DLL_SOURCE=Zeitgeist.dll
+TOMBOY_ZEITGEIST_DLL_MDB_SOURCE=bin/Debug/Tomboy.Zeitgeist.dll.mdb
+TOMBOY_ZEITGEIST_DLL_MDB=$(BUILD_DIR)/Tomboy.Zeitgeist.dll.mdb
+
+endif
+
+if ENABLE_RELEASE
+ASSEMBLY_COMPILER_COMMAND = gmcs
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize-
+ASSEMBLY = bin/Release/Tomboy.Zeitgeist.dll
+ASSEMBLY_MDB = 
+COMPILE_TARGET = library
+PROJECT_REFERENCES = 
+BUILD_DIR = bin/Release
+
+ZEITGEIST_DLL_SOURCE=Zeitgeist.dll
+TOMBOY_ZEITGEIST_DLL_MDB=
+
+endif
+
+AL=al2
+SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
+
+PROGRAMFILES = \
+	$(ZEITGEIST_DLL) \
+	$(TOMBOY_ZEITGEIST_DLL_MDB)  
+
+LINUX_PKGCONFIG = \
+	$(TOMBOY_ZEITGEIST_PC)  
+
+
+RESGEN=resgen2
+	
+all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG) 
+
+FILES = \
+	AssemblyInfo.cs \
+	ZeitgeistAddin.cs \
+	NoteHandler.cs \
+	Zeitgeist.cs 
+
+DATA_FILES = 
+
+RESOURCES = \
+	Zeitgeist.addin.xml,Tomboy.Zeitgeist.Zeitgeist.addin.xml 
+
+EXTRAS = \
+	tomboy.zeitgeist.pc.in 
+
+REFERENCES =  \
+	System \
+	$(GTK_SHARP_20_LIBS) \
+	Mono.Posix \
+	$(GLIB_SHARP_20_LIBS)
+
+DLL_REFERENCES =  \
+	/usr/lib/tomboy/Tomboy.exe \
+	Zeitgeist.dll
+
+CLEANFILES = $(PROGRAMFILES) $(LINUX_PKGCONFIG) 
+
+include $(top_srcdir)/Makefile.include
+
+ZEITGEIST_DLL = $(BUILD_DIR)/Zeitgeist.dll
+TOMBOY_ZEITGEIST_PC = $(BUILD_DIR)/tomboy.zeitgeist.pc
+
+$(eval $(call emit-deploy-target,ZEITGEIST_DLL))
+$(eval $(call emit-deploy-wrapper,TOMBOY_ZEITGEIST_PC,tomboy.zeitgeist.pc))
+
+
+$(eval $(call emit_resgen_targets))
+$(build_xamlg_list): %.xaml.g.cs: %.xaml
+	xamlg '$<'
+
+$(ASSEMBLY_MDB): $(ASSEMBLY)
+
+$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
+	mkdir -p $(shell dirname $(ASSEMBLY))
+	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
 
=== added file 'tomboy/NoteHandler.cs'
--- tomboy/NoteHandler.cs	1970-01-01 00:00:00 +0000
+++ tomboy/NoteHandler.cs	2010-09-19 19:02:39 +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>();
+	}
+}
+
 
=== added file 'tomboy/Tomboy.Zeitgeist.csproj'
--- tomboy/Tomboy.Zeitgeist.csproj	1970-01-01 00:00:00 +0000
+++ tomboy/Tomboy.Zeitgeist.csproj	2010-09-19 19:02:39 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" 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>{4DC09956-B20D-4ECA-8ACD-17E7609BAE41}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Tomboy.Zeitgeist</RootNamespace>
+    <AssemblyName>Tomboy.Zeitgeist</AssemblyName>
+  </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="Tomboy, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>\usr\lib\tomboy\Tomboy.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="Mono.Posix" />
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>glib-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="Zeitgeist, Version=1.0.3914.35475, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Zeitgeist.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="ZeitgeistAddin.cs" />
+    <Compile Include="NoteHandler.cs" />
+    <Compile Include="Zeitgeist.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <EmbeddedResource Include="Zeitgeist.addin.xml" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
 
=== added file 'tomboy/Tomboy.Zeitgeist.sln'
--- tomboy/Tomboy.Zeitgeist.sln	1970-01-01 00:00:00 +0000
+++ tomboy/Tomboy.Zeitgeist.sln	2010-09-19 19:02:39 +0000
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tomboy.Zeitgeist", "Tomboy.Zeitgeist.csproj", "{2591D85F-7B39-486E-8260-D9022DE8BDE6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2591D85F-7B39-486E-8260-D9022DE8BDE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2591D85F-7B39-486E-8260-D9022DE8BDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2591D85F-7B39-486E-8260-D9022DE8BDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2591D85F-7B39-486E-8260-D9022DE8BDE6}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Tomboy.Zeitgeist.csproj
+	EndGlobalSection
+EndGlobal
 
=== modified file 'tomboy/Zeitgeist.addin.xml'
--- tomboy/Zeitgeist.addin.xml	2010-08-16 11:07:09 +0000
+++ tomboy/Zeitgeist.addin.xml	2010-09-19 19:02:39 +0000
@@ -1,14 +1,14 @@
 <Addin id="Zeitgeist"
     namespace="Tomboy"
     name="Zeitgeist Integration"
-    author="Laszlo Pandy [e-mail]"
+    author="Manish Sinha"
     description="Logs usage data to Zeitgeist."
     category="Desktop Integration"
     defaultEnabled="true"
     version="0.1">
 
     <Runtime>
-        <Import assembly="Zeitgeist.dll" />
+        <Import assembly="Tomboy.Zeitgeist.dll" />
     </Runtime>
 
     <Dependencies>
 
=== added file 'tomboy/Zeitgeist.cs'
--- tomboy/Zeitgeist.cs	1970-01-01 00:00:00 +0000
+++ tomboy/Zeitgeist.cs	2010-09-19 19:02:39 +0000
@@ -0,0 +1,83 @@
+using System;
+using Zeitgeist.Datamodel;
+using Zeitgeist;
+using System.Collections.Generic;
+using Tomboy;
+
+namespace Tomboy.Zeitgeist
+{
+	public class ZeitgeistHandler
+	{
+		public static bool SendEvent(Note note, KeyValuePair<string,string> eventInterpretation)
+		{
+			KeyValuePair<string,string> eventManifestation = Manifestation.Instance.EventManifestation.UserActivity;
+			
+			KeyValuePair<string,string> subjectInterpretation = Interpretation.Instance.Document.Document;
+			KeyValuePair<string,string> 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.Key));
+				return true;
+			}
+			catch(Exception e)
+			{
+				Console.WriteLine(e.StackTrace);
+				
+				return false;
+			}
+		}
+		
+		private static void SendEvent(List<Event> e)
+		{
+			LogClient client = new LogClient();
+			client.InsertEvents(e);
+		}
+	}
+	
+	public class EventCreator
+	{
+		public static Event CreateEvent(Note note,
+		                          KeyValuePair<string,string> eventInterpretation, 
+		                          KeyValuePair<string,string> eventManifestation, 
+		                          KeyValuePair<string,string> subjectInterpretation, 
+		                          KeyValuePair<string,string> 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.cs'
--- tomboy/Zeitgeist.cs	2010-08-19 10:33:11 +0000
+++ tomboy/Zeitgeist.cs	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-
-using System;
-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);
-				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 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;
-		}
-	}
-	
-
-
-}
 
=== added file 'tomboy/Zeitgeist.dll'
 Binary files tomboy/Zeitgeist.dll	1970-01-01 00:00:00 +0000 and tomboy/Zeitgeist.dll	2010-09-19 19:02:39 +0000 differ
=== 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-09-19 19:02:39 +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-tomboy";
+		
+		#endregion
+	}
+}
+
 
=== 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 
-
-
 
=== added file 'tomboy/tomboy.zeitgeist.pc'
--- tomboy/tomboy.zeitgeist.pc	1970-01-01 00:00:00 +0000
+++ tomboy/tomboy.zeitgeist.pc	2010-09-19 19:02:39 +0000
@@ -0,0 +1,6 @@
+Name: Tomboy.Zeitgeist
+Description: Tomboy.Zeitgeist
+Version: 0.1
+
+Requires: 
+Libs: -r:@expanded_libdir@/@PACKAGE@/Tomboy.Zeitgeist.dll