[tracker/urho-sync: 120/121] Merge branch 'master' into urho-sync
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/urho-sync: 120/121] Merge branch 'master' into urho-sync
- Date: Wed, 19 Aug 2009 13:31:57 +0000 (UTC)
commit a3eec4151daadc9c575edc0174e2e610e50e61e4
Merge: 82003a5... 377dc98...
Author: Philip Van Hoof <philip codeminded be>
Date: Wed Aug 19 15:16:18 2009 +0200
Merge branch 'master' into urho-sync
configure.ac | 30 +-
.../org.freedesktop.Tracker.Extract.service.in | 2 +-
.../org.freedesktop.Tracker.Miner.FS.service.in | 2 +-
data/dbus/org.freedesktop.Tracker.service.in | 2 +-
data/dbus/tracker-backup.xml | 2 +-
data/dbus/tracker-extract.xml | 6 +-
data/dbus/tracker-miner.xml | 2 +-
data/dbus/tracker-resources-class.xml | 3 +-
data/dbus/tracker-resources.xml | 4 +-
data/dbus/tracker-statistics.xml | 2 +-
data/ontologies/11-rdf.ontology | 2 +-
data/ontologies/32-nco.ontology | 2 +
data/ontologies/34-nmo.ontology | 18 -
data/ontologies/36-scal.ontology | 188 ++
data/ontologies/38-nmm.ontology | 15 +-
data/ontologies/39-mto.ontology | 12 +
data/ontologies/41-mfo.ontology | 186 ++
data/ontologies/Makefile.am | 1 +
po/POTFILES.in | 1 +
po/POTFILES.skip | 2 -
po/es.po | 145 +-
po/hu.po | 635 ++--
python/Makefile.am | 2 +-
python/deskbar-handler/tracker-handler.py | 10 +-
python/deskbar-handler/tracker-module.py | 16 +-
python/gtk-sparql/Makefile.am | 8 +
src/Makefile.am | 2 -
src/libstemmer/header.h | 4 +-
src/libtracker-common/posix.vapi | 2 +
src/libtracker-data/.gitignore | 1 +
src/libtracker-data/Makefile.am | 7 +-
src/libtracker-data/tracker-data-manager.c | 17 +-
src/libtracker-data/tracker-data-manager.h | 7 +-
src/libtracker-data/tracker-data-update.c | 64 +-
src/libtracker-data/tracker-sparql-query.vala | 2146 ++++++++++----
src/libtracker-data/tracker-sparql-scanner.vala | 901 ++++++
src/libtracker-db/tracker-db-interface.c | 19 +-
src/libtracker/tracker.c | 32 +-
...-freedesktop-Tracker-evolution-plugin.eplug.xml | 2 +-
src/plugins/evolution/tracker-evolution-common.h | 6 +-
src/plugins/evolution/tracker-evolution-plugin.c | 6 +-
.../evolution/tracker-evolution-registrar.c | 6 +-
src/plugins/kmail/tracker-kmail-common.h | 6 +-
src/plugins/kmail/tracker-kmail-registrar.c | 6 +-
src/rasqal/.gitignore | 11 -
src/rasqal/Makefile.am | 97 -
src/rasqal/fix-bison | 65 -
src/rasqal/fix-flex | 84 -
src/rasqal/rasqal.h | 1383 ---------
src/rasqal/rasqal.vapi | 228 --
src/rasqal/rasqal_algebra.c | 1403 ---------
src/rasqal/rasqal_config.h | 2 -
src/rasqal/rasqal_datetime.c | 802 -----
src/rasqal/rasqal_decimal.c | 941 ------
src/rasqal/rasqal_engine.c | 1783 -----------
src/rasqal/rasqal_engine_algebra.c | 398 ---
src/rasqal/rasqal_engine_sort.c | 375 ---
src/rasqal/rasqal_expr.c | 2572 ----------------
src/rasqal/rasqal_feature.c | 224 --
src/rasqal/rasqal_general.c | 1128 -------
src/rasqal/rasqal_graph.c | 459 ---
src/rasqal/rasqal_graph_pattern.c | 864 ------
src/rasqal/rasqal_internal.h | 1202 --------
src/rasqal/rasqal_literal.c | 3198 --------------------
src/rasqal/rasqal_map.c | 319 --
src/rasqal/rasqal_query.c | 2398 ---------------
src/rasqal/rasqal_query_results.c | 1425 ---------
src/rasqal/rasqal_query_transform.c | 1320 --------
src/rasqal/rasqal_raptor.c | 816 -----
src/rasqal/rasqal_redland.c | 474 ---
src/rasqal/rasqal_result_formats.c | 676 -----
src/rasqal/rasqal_row.c | 509 ----
src/rasqal/rasqal_rowsource.c | 712 -----
src/rasqal/rasqal_rowsource_empty.c | 194 --
src/rasqal/rasqal_rowsource_filter.c | 241 --
src/rasqal/rasqal_rowsource_join.c | 677 -----
src/rasqal/rasqal_rowsource_project.c | 410 ---
src/rasqal/rasqal_rowsource_rowsequence.c | 464 ---
src/rasqal/rasqal_rowsource_sort.c | 260 --
src/rasqal/rasqal_rowsource_triples.c | 720 -----
src/rasqal/rasqal_rowsource_union.c | 579 ----
src/rasqal/rasqal_skiplist.c | 604 ----
src/rasqal/rasqal_sparql_xml.c | 1067 -------
src/rasqal/rasqal_triples_source.c | 236 --
src/rasqal/rasqal_variable.c | 688 -----
src/rasqal/rasqal_xsd_datatypes.c | 981 ------
src/rasqal/rdql_common.h | 63 -
src/rasqal/rdql_lexer.l | 1238 --------
src/rasqal/rdql_parser.y | 937 ------
src/rasqal/sparql_common.h | 63 -
src/rasqal/sparql_lexer.l | 1619 ----------
src/rasqal/sparql_parser.y | 3190 -------------------
src/rasqal/strcasecmp.c | 118 -
src/rasqal/win32_rasqal_config.h | 129 -
src/tracker-explorer/explorer.vala | 8 +-
src/tracker-extract/tracker-albumart.c | 2 +-
src/tracker-extract/tracker-config.c | 6 +-
src/tracker-extract/tracker-dbus.c | 4 +-
src/tracker-extract/tracker-extract-jpeg.c | 2 +
src/tracker-extract/tracker-extract-mp3.c | 4 +-
src/tracker-extract/tracker-extract-tiff.c | 18 +-
src/tracker-extract/tracker-extract.h | 6 +-
src/tracker-extract/tracker-iptc.c | 10 +-
src/tracker-extract/tracker-iptc.h | 2 +-
src/tracker-extract/tracker-main.c | 1 +
src/tracker-fts/tracker-fts-config.c | 6 +-
src/tracker-fts/tracker-fts.c | 46 +-
src/tracker-miner-fs/tracker-config.c | 6 +-
src/tracker-miner-fs/tracker-dbus.c | 6 +-
src/tracker-miner-fs/tracker-indexer.h | 8 +-
src/tracker-miner-fs/tracker-main.c | 8 +-
src/tracker-miner-fs/tracker-miner.h | 6 +-
.../tracker-module-metadata-utils.c | 12 +-
src/tracker-miner-fs/tracker-removable-device.c | 26 +-
src/tracker-store/tracker-backup.h | 6 +-
src/tracker-store/tracker-config.c | 6 +-
src/tracker-store/tracker-dbus.c | 6 +-
src/tracker-store/tracker-events.c | 91 +-
src/tracker-store/tracker-events.h | 1 +
src/tracker-store/tracker-marshal.list | 1 +
src/tracker-store/tracker-resource-class.c | 135 +-
src/tracker-store/tracker-resource-class.h | 7 +-
src/tracker-store/tracker-resources.c | 15 +-
src/tracker-store/tracker-resources.h | 6 +-
src/tracker-store/tracker-statistics.h | 6 +-
src/tracker-utils/tracker-import.c | 2 +-
src/tracker-utils/tracker-processes.c | 1 +
src/tracker-utils/tracker-search.c | 4 +-
src/tracker-utils/tracker-sparql.c | 2 +-
src/tracker-utils/tracker-status.c | 2 +-
tests/libtracker-data/Makefile.am | 4 +-
tests/libtracker-data/algebra/Makefile.am | 38 +-
tests/libtracker-data/algebra/data-2.ontology | 20 +
tests/libtracker-data/algebra/data-2.ttl | 13 +
tests/libtracker-data/algebra/filter-nested-2.rq | 4 +
.../libtracker-data/algebra/filter-placement-1.out | 1 +
.../libtracker-data/algebra/filter-placement-1.rq | 7 +
.../libtracker-data/algebra/filter-placement-2.out | 1 +
.../libtracker-data/algebra/filter-placement-2.rq | 7 +
.../libtracker-data/algebra/filter-placement-3.out | 1 +
.../libtracker-data/algebra/filter-placement-3.rq | 9 +
tests/libtracker-data/algebra/filter-scope-1.out | 12 +
tests/libtracker-data/algebra/filter-scope-1.rq | 9 +
.../libtracker-data/algebra/opt-filter-3.ontology | 20 +
tests/libtracker-data/algebra/opt-filter-3.rq | 10 +
tests/libtracker-data/algebra/opt-filter-3.ttl | 13 +
.../libtracker-data/algebra/two-nested-opt-alt.out | 2 +
.../libtracker-data/algebra/two-nested-opt-alt.rq | 10 +
.../algebra/two-nested-opt.ontology | 20 +
tests/libtracker-data/algebra/two-nested-opt.out | 1 +
tests/libtracker-data/algebra/two-nested-opt.rq | 11 +
tests/libtracker-data/algebra/two-nested-opt.ttl | 11 +
.../algebra/var-scope-join-1.ontology | 28 +
tests/libtracker-data/algebra/var-scope-join-1.rq | 8 +
tests/libtracker-data/algebra/var-scope-join-1.ttl | 20 +
tests/libtracker-data/error/Makefile.am | 10 +
tests/libtracker-data/error/query-error-1.out | 1 +
tests/libtracker-data/error/query-error-1.rq | 6 +
tests/libtracker-data/error/query-error-2.ontology | 16 +
tests/libtracker-data/error/query-error-2.out | 1 +
tests/libtracker-data/error/query-error-2.rq | 10 +
tests/libtracker-data/error/query-error-2.ttl | 5 +
tests/libtracker-data/optional/Makefile.am | 8 +
.../optional/complex-data-1.ontology | 36 +
tests/libtracker-data/optional/complex-data-1.ttl | 21 +
tests/libtracker-data/optional/q-opt-complex-1.out | 2 +
tests/libtracker-data/optional/q-opt-complex-1.rq | 11 +
tests/libtracker-data/regex/regex-data-01.ttl | 2 +-
tests/libtracker-data/tracker-ontology-test.c | 6 +-
tests/libtracker-data/tracker-sparql-test.c | 76 +-
utils/services/ontology-validator.c | 12 +-
171 files changed, 4221 insertions(+), 41638 deletions(-)
---
diff --cc src/libtracker-data/tracker-data-manager.h
index b9b19a8,e0cfe40..2a7c7e9
--- a/src/libtracker-data/tracker-data-manager.h
+++ b/src/libtracker-data/tracker-data-manager.h
@@@ -36,13 -36,13 +36,14 @@@ G_BEGIN_DECL
gboolean tracker_data_manager_init (TrackerDBManagerFlags flags,
const gchar *test_schema,
- gboolean *first_time);
+ gboolean *first_time,
+ gboolean *need_journal);
void tracker_data_manager_shutdown (void);
- gint tracker_data_manager_get_db_option_int (const gchar *option);
- void tracker_data_manager_set_db_option_int (const gchar *option,
- gint value);
+ gint64 tracker_data_manager_get_db_option_int64 (const gchar *option);
+ void tracker_data_manager_set_db_option_int64 (const gchar *option,
+ gint64 value);
+
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
