tracker r2319 - in trunk: . src/libtracker-common

[carlosg svn gnome org]

Author: carlosg
Date: Tue Oct  7 12:05:08 2008
New Revision: 2319
URL: http://svn.gnome.org/viewvc/tracker?rev=2319&view=rev

Log:
2008-10-07  Carlos Garnacho  <carlos imendio com>

        * src/libtracker-common/tracker-parser.[ch]: Do not expose the
        TrackerParser struct in the header, it was pulling pango.h
        unnecessarily.


Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-parser.c
   trunk/src/libtracker-common/tracker-parser.h

Modified: trunk/src/libtracker-common/tracker-parser.c
==============================================================================
--- trunk/src/libtracker-common/tracker-parser.c	(original)
+++ trunk/src/libtracker-common/tracker-parser.c	Tue Oct  7 12:05:08 2008
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <pango/pango.h>
 
 #include "tracker-parser.h"
 #include "tracker-log.h"
@@ -62,6 +63,39 @@
 	TRACKER_PARSER_WORD_NEWLINE
 } TrackerParserWordType;
 
+typedef enum {
+	TRACKER_PARSER_ENCODING_ASCII,
+	TRACKER_PARSER_ENCODING_LATIN,
+	TRACKER_PARSER_ENCODING_CJK,
+	TRACKER_PARSER_ENCODING_OTHER
+} TrackerParserEncoding;
+
+struct TrackerParser {
+	const gchar	      *txt;
+	gint		       txt_size;
+
+	TrackerLanguage       *language;
+	gboolean	       enable_stemmer;
+	gboolean	       enable_stop_words;
+	guint		       max_words_to_index;
+	guint		       max_word_length;
+	guint		       min_word_length;
+	gboolean	       delimit_words;
+	gboolean	       parse_reserved_words;
+
+	/* Private members */
+	gchar			*word;
+	gint			word_length;
+	guint			word_position;
+	TrackerParserEncoding	encoding;
+	const gchar		*cursor;
+
+	/* Pango members for CJK text parsing */
+	PangoLogAttr	      *attrs;
+	guint		       attr_length;
+	guint		       attr_pos;
+};
+
 static inline TrackerParserWordType
 get_word_type (gunichar c)
 {

Modified: trunk/src/libtracker-common/tracker-parser.h
==============================================================================
--- trunk/src/libtracker-common/tracker-parser.h	(original)
+++ trunk/src/libtracker-common/tracker-parser.h	Tue Oct  7 12:05:08 2008
@@ -23,7 +23,6 @@
 #define __TRACKERD_PARSER_H__
 
 #include <glib.h>
-#include <pango/pango.h>
 
 #include "tracker-language.h"
 
@@ -33,38 +32,7 @@
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-typedef enum {
-	TRACKER_PARSER_ENCODING_ASCII,
-	TRACKER_PARSER_ENCODING_LATIN,
-	TRACKER_PARSER_ENCODING_CJK,
-	TRACKER_PARSER_ENCODING_OTHER
-} TrackerParserEncoding;
-
-typedef struct {
-	const gchar	      *txt;
-	gint		       txt_size;
-
-	TrackerLanguage       *language;
-	gboolean	       enable_stemmer;
-	gboolean	       enable_stop_words;
-	guint		       max_words_to_index;
-	guint		       max_word_length;
-	guint		       min_word_length;
-	gboolean	       delimit_words;
-	gboolean	       parse_reserved_words;
-
-	/* Private members */
-	gchar			*word;
-	gint			word_length;
-	guint			word_position;
-	TrackerParserEncoding	encoding;
-	const gchar		*cursor;
-
-	/* Pango members for CJK text parsing */
-	PangoLogAttr	      *attrs;
-	guint		       attr_length;
-	guint		       attr_pos;
-} TrackerParser;
+typedef struct TrackerParser TrackerParser;
 
 TrackerParser *tracker_parser_new	      (TrackerLanguage *language,
 					       gint		max_word_length,