Index: configure.in
===================================================================
--- configure.in	(revision 2079)
+++ configure.in	(working copy)
@@ -119,6 +119,17 @@
 AC_SUBST(DBUS_LIBS)
 
 #
+# Voice Notes require Gstreamer
+#
+PKG_CHECK_MODULES(GST, gstreamer-0.10, ENABLE_GST="yes", ENABLE_GST="no")
+AC_ARG_ENABLE(gstreamer, 
+	      [  --enable-gstreamer[[=no/yes]]  compile with Voice Notes addin [[default: yes]]],
+	      ENABLE_GST="$enableval")
+AM_CONDITIONAL(ENABLE_GST, test "$ENABLE_GST" = "yes")
+AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
+
+#
 # Check for external Mono.Addins
 #
 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= 0.3 \
@@ -291,6 +302,7 @@
 Tomboy/Addins/SshSyncService/Makefile
 Tomboy/Addins/StickyNoteImport/Makefile
 Tomboy/Addins/Tasque/Makefile
+Tomboy/Addins/VoiceNotes/Makefile
 Tomboy/Addins/WebDavSyncService/Makefile
 test/Makefile
 po/Makefile.in
Index: Tomboy.mdp
===================================================================
--- Tomboy.mdp	(revision 2079)
+++ Tomboy.mdp	(working copy)
@@ -206,6 +206,8 @@
     <File name="Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/RecentTreeView.cs" subtype="Code" buildaction="Compile" />
     <File name="Mono.Addins/Mono.Addins/Mono.Addins/InstanceExtensionNode.cs" subtype="Code" buildaction="Compile" />
+    <File name="Tomboy/Addins/VoiceNotes" subtype="Directory" buildaction="Compile" />
+    <File name="Tomboy/Addins/VoiceNotes/VoiceNote.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
Index: Tomboy/Tomboy.exe.config.in
===================================================================
--- Tomboy/Tomboy.exe.config.in	(revision 2079)
+++ Tomboy/Tomboy.exe.config.in	(working copy)
@@ -2,6 +2,7 @@
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>	
   <dllmap dll="libgtkspell" target="libgtkspell.so.0"/>
+  <dllmap dll="libgstreamer" target="libgstreamer-0.10.so" />
   <dllmap dll="libtomboy" target="libtomboy.so"/>
   <dllmap dll="panel-applet-2" target="libpanel-applet-2.so.0"/>
 </configuration>
Index: Tomboy/Addins/Makefile.am
===================================================================
--- Tomboy/Addins/Makefile.am	(revision 2079)
+++ Tomboy/Addins/Makefile.am	(working copy)
@@ -13,5 +13,7 @@
 	SshSyncService		\
 	StickyNoteImport	\
 	Tasque			\
+	VoiceNotes			\
 	WebDavSyncService
 
+