[tracker/functions] Fix msword.h and don't wrap libtracker-common/tracker-utils.h for c++

[Mikael Ottela <mottela src gnome org>]

commit 9e4fb844fb612a8d5179fddd20b3fff0364c7dec
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jan 7 13:32:41 2010 +0000

    Fix msword.h and don't wrap libtracker-common/tracker-utils.h for c++

 src/tracker-extract/tracker-msword.cpp |    4 ----
 src/tracker-extract/tracker-msword.h   |   10 ++++++----
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/tracker-extract/tracker-msword.cpp b/src/tracker-extract/tracker-msword.cpp
index 943e833..e8a8a3d 100644
--- a/src/tracker-extract/tracker-msword.cpp
+++ b/src/tracker-extract/tracker-msword.cpp
@@ -31,11 +31,7 @@
 #include <wv2/word97_generated.h>
 #include <wv2/ustring.h>
 
-
-extern "C" {
 #include <libtracker-common/tracker-utils.h>
-}
-
 
 using namespace wvWare;
 
diff --git a/src/tracker-extract/tracker-msword.h b/src/tracker-extract/tracker-msword.h
index 3a8ab88..2128da6 100644
--- a/src/tracker-extract/tracker-msword.h
+++ b/src/tracker-extract/tracker-msword.h
@@ -22,9 +22,11 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C"
-#endif
-gchar* extract_msword_content (const gchar *uri, gint max_words);
+G_BEGIN_DECLS
+
+gchar* extract_msword_content (const gchar *uri, 
+                               gint         max_words);
+
+G_END_DECLS
 
 #endif /* __TRACKERD_MSWORD_H__ */