libtracker-common: Move TrackerLanguage management to TrackerParser

This is only created to give it to the parser, have it created from there
and detach TrackerLanguage from the rest of the code.

4 files changed, 8 insertions, 15 deletions

diff --git a/src/libtracker-common/tracker-parser-libicu.c b/src/libtracker-common/tracker-parser-libicu.c
index ede943003..c0e4cec98 100644
--- a/src/libtracker-common/tracker-parser-libicu.c
+++ b/src/libtracker-common/tracker-parser-libicu.c
@@ -32,6 +32,7 @@
 #include <unicode/unorm.h>
 #include <unicode/ucol.h>
 
+#include "tracker-language.h"
 #include "tracker-debug.h"
 #include "tracker-parser.h"
 #include "tracker-parser-utils.h"
@@ -575,15 +576,12 @@ parser_next (TrackerParser *parser,
 }
 
 TrackerParser *
-tracker_parser_new (TrackerLanguage *language)
+tracker_parser_new (void)
 {
 	TrackerParser *parser;
 
-	g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
-
 	parser = g_new0 (TrackerParser, 1);
-
-	parser->language = g_object_ref (language);
+	parser->language = tracker_language_new (NULL);
 
 	return parser;
 }
diff --git a/src/libtracker-common/tracker-parser-libunistring.c b/src/libtracker-common/tracker-parser-libunistring.c
index 1477c8526..515521d19 100644
--- a/src/libtracker-common/tracker-parser-libunistring.c
+++ b/src/libtracker-common/tracker-parser-libunistring.c
@@ -30,6 +30,7 @@
 #include <unictype.h>
 #include <unicase.h>
 
+#include "tracker-language.h"
 #include "tracker-parser.h"
 #include "tracker-parser-utils.h"
 
@@ -427,15 +428,12 @@ parser_next (TrackerParser *parser,
 }
 
 TrackerParser *
-tracker_parser_new (TrackerLanguage *language)
+tracker_parser_new (void)
 {
 	TrackerParser *parser;
 
-	g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
-
 	parser = g_new0 (TrackerParser, 1);
-
-	parser->language = g_object_ref (language);
+	parser->language = tracker_language_new (NULL);
 
 	return parser;
 }
diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h
index cdf861989..78d67e21f 100644
--- a/src/libtracker-common/tracker-parser.h
+++ b/src/libtracker-common/tracker-parser.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 /* Parser */
 typedef struct TrackerParser TrackerParser;
 
-TrackerParser *tracker_parser_new             (TrackerLanguage *language);
+TrackerParser *tracker_parser_new             (void);
 
 void           tracker_parser_reset           (TrackerParser   *parser,
                                                const gchar     *txt,
diff --git a/src/libtracker-sparql/core/tracker-fts-tokenizer.c b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
index 66f68a069..e9dac1efa 100644
--- a/src/libtracker-sparql/core/tracker-fts-tokenizer.c
+++ b/src/libtracker-sparql/core/tracker-fts-tokenizer.c
@@ -38,7 +38,6 @@ typedef struct TrackerTokenizer TrackerTokenizer;
 typedef struct TrackerTokenizerFunctionData TrackerTokenizerFunctionData;
 
 struct TrackerTokenizerData {
-	TrackerLanguage *language;
 	TrackerDBManagerFlags flags;
 };
 
@@ -65,7 +64,7 @@ tracker_tokenizer_create (void           *data,
 
 	tokenizer = g_new0 (TrackerTokenizer, 1);
 	tokenizer->data = data;
-	tokenizer->parser = tracker_parser_new (tokenizer->data->language);
+	tokenizer->parser = tracker_parser_new ();
 
 	*tokenizer_out = (Fts5Tokenizer *) tokenizer;
 
@@ -159,7 +158,6 @@ tracker_tokenizer_data_new (TrackerDBManagerFlags flags)
 	TrackerTokenizerData *p;
 
 	p = g_new0 (TrackerTokenizerData, 1);
-	p->language = tracker_language_new (NULL);
 	p->flags = flags;
 
 	return p;
@@ -170,7 +168,6 @@ tracker_tokenizer_data_free (gpointer user_data)
 {
 	TrackerTokenizerData *data = user_data;
 
-	g_object_unref (data->language);
 	g_free (data);
 }