diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-05 09:21:27 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-05 09:21:27 +0200 |
| commit | eae4faee4e20e88490824adddf75ccaef94dcde4 (patch) | |
| tree | 029fdf4124e662d68dfb3b8ebc6692aff6b4d4f8 /extensions | |
| parent | 13bfbc440c6f2009dc0fb2afe3443b1965e18552 (diff) | |
fts: Drop obsolete GLIB conditionals
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/fts++/indexer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/fts++/indexer.cpp b/extensions/fts++/indexer.cpp index 630af1fc..c94ad19c 100644 --- a/extensions/fts++/indexer.cpp +++ b/extensions/fts++/indexer.cpp @@ -710,7 +710,6 @@ bool Indexer::IndexActor (std::string const& actor, bool is_subject) tokenizer->index_text (display_name, name_weight, "A"); } -#if GLIB_CHECK_VERSION(2, 30, 0) val = g_desktop_app_info_get_generic_name (dai); if (val && val[0] != '\0') { @@ -723,7 +722,7 @@ bool Indexer::IndexActor (std::string const& actor, bool is_subject) tokenizer->index_text (generic_name_folded, name_weight); tokenizer->index_text (generic_name_folded, name_weight, "A"); } -#endif + if (!is_subject) return true; // the rest of the code only applies to events with application subject uris: // index the comment field, add category terms, index keywords @@ -735,7 +734,7 @@ bool Indexer::IndexActor (std::string const& actor, bool is_subject) tokenizer->index_text (comment, comment_weight); tokenizer->index_text (comment, comment_weight, "A"); } -#if GLIB_CHECK_VERSION(2, 30, 0) + val = g_desktop_app_info_get_categories (dai); if (val && val[0] != '\0') { @@ -751,7 +750,7 @@ bool Indexer::IndexActor (std::string const& actor, bool is_subject) } g_strfreev (categories); } -#endif + return true; } |