diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2023-03-02 13:42:55 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2023-03-02 15:44:59 +0100 |
| commit | 45c4695f4207919c4a9ada1d2758ec3c27ff8739 (patch) | |
| tree | 4220c92604651a036f57c7a6d2a4982b71a2788e /src/libtracker-common | |
| parent | 6c13e8767e77f38baf1265c63bf1cf0a33ba1612 (diff) | |
| download | tracker-45c4695f4207919c4a9ada1d2758ec3c27ff8739.tar.gz | |
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.
Diffstat (limited to 'src/libtracker-common')
| -rw-r--r-- | src/libtracker-common/tracker-parser-libicu.c | 8 | ||||
| -rw-r--r-- | src/libtracker-common/tracker-parser-libunistring.c | 8 | ||||
| -rw-r--r-- | src/libtracker-common/tracker-parser.h | 2 |
3 files changed, 7 insertions, 11 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, |