[tracker/whitespace: 1/2] Removed all trailing whitespace
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/whitespace: 1/2] Removed all trailing whitespace
- Date: Fri, 11 Dec 2009 11:55:50 +0000 (UTC)
commit 6fa47cd2b93600873633a40b9f6b7e0ef978b6b1
Author: Martyn Russell <martyn lanedo com>
Date: Thu Dec 10 15:13:33 2009 +0000
Removed all trailing whitespace
README | 8 +-
TODO | 6 +-
configure.ac | 116 ++++----
data/Makefile.am | 2 +-
data/db/sqlite-contents.sql | 8 +-
data/db/sqlite-tracker.sql | 2 +-
data/dbus/Makefile.am | 2 +-
data/dbus/tracker-extract.xml | 2 +-
data/dbus/tracker-resources-class.xml | 2 +-
data/dbus/tracker-resources.xml | 4 +-
data/dbus/tracker-statistics.xml | 20 +-
data/languages/Makefile.am | 2 +-
data/ontologies/10-xsd.description | 2 +-
data/ontologies/11-rdf.description | 2 +-
data/ontologies/12-nrl.description | 2 +-
data/ontologies/20-dc.description | 2 +-
data/ontologies/30-nie.description | 4 +-
data/ontologies/32-nco.ontology | 2 +-
data/ontologies/33-nfo.ontology | 2 +-
data/ontologies/34-nmo.ontology | 26 +-
data/ontologies/36-scal.ontology | 10 +-
data/ontologies/38-nmm.description | 2 +-
data/ontologies/38-nmm.ontology | 2 +-
data/ontologies/39-mto.ontology | 24 +-
data/ontologies/40-mlo.ontology | 2 +-
data/ontologies/41-mfo.ontology | 10 +-
data/ontologies/89-mtp.ontology | 4 +-
data/tracker-stop-words.txt | 6 +-
docs/design/tracker-miner-fs.dia | Bin 6598 -> 6597 bytes
docs/manpages/tracker-control.1 | 12 +-
docs/manpages/tracker-extract.1 | 2 +-
docs/manpages/tracker-search-bar.1 | 4 +-
docs/manpages/tracker-search-tool.1 | 4 +-
docs/manpages/tracker-search.1 | 4 +-
docs/manpages/tracker-sparql.1 | 30 +-
docs/manpages/tracker-stats.1 | 6 +-
docs/manpages/tracker-status-icon.1 | 4 +-
docs/manpages/tracker-status.1 | 4 +-
docs/manpages/tracker-store.1 | 10 +-
docs/manpages/tracker-tag.1 | 18 +-
docs/ontologies/README.ontologiesdoc | 14 +-
docs/ontologies/nie/explanation.html | 14 +-
docs/ontologies/nmm/images-overview.dia | Bin 5152 -> 5151 bytes
docs/ontologies/nmm/radio-overview.dia | Bin 3564 -> 3560 bytes
docs/ontologies/nmo/explanation.html | 8 +-
docs/reference/README | 4 +-
examples/libtracker-miner/tracker-main.c | 12 +-
python/FUSE/trackerfs.py | 22 +-
python/SearchTool/README | 2 +-
python/gtk-sparql/store.py | 6 +-
python/music/lyrics.py | 4 +-
python/rss_reader/signaler.py | 16 +-
src/libtracker-client/tracker.c | 120 ++++----
src/libtracker-client/tracker.h | 6 +-
src/libtracker-common/tracker-config-file.c | 8 +-
src/libtracker-common/tracker-file-utils.c | 26 +-
src/libtracker-common/tracker-keyfile-object.c | 24 +-
src/libtracker-common/tracker-log.c | 8 +-
src/libtracker-common/tracker-statement-list.c | 2 +-
src/libtracker-common/tracker-storage-hal.c | 34 +-
src/libtracker-common/tracker-type-utils.c | 2 +-
src/libtracker-common/tracker-utils.c | 2 +-
src/libtracker-data/tracker-data-backup.c | 20 +-
src/libtracker-data/tracker-data-manager.c | 2 +-
src/libtracker-data/tracker-data-query.c | 2 +-
src/libtracker-data/tracker-data-update.c | 48 ++--
src/libtracker-data/tracker-data-update.h | 4 +-
src/libtracker-data/tracker-sparql-query.vala | 8 +-
src/libtracker-db/tracker-db-backup.c | 16 +-
src/libtracker-db/tracker-db-backup.h | 2 +-
src/libtracker-db/tracker-db-dbus.c | 34 +-
src/libtracker-db/tracker-db-interface-sqlite.c | 16 +-
src/libtracker-db/tracker-db-interface.h | 8 +-
src/libtracker-db/tracker-db-manager.c | 30 +-
src/libtracker-fts/tracker-fts-config.c | 52 ++--
src/libtracker-fts/tracker-fts-hash.c | 12 +-
src/libtracker-fts/tracker-fts.c | 282 ++++++++--------
src/libtracker-miner/tracker-crawler.c | 6 +-
src/libtracker-miner/tracker-miner-fs.c | 8 +-
src/libtracker-miner/tracker-miner-manager.c | 2 +-
src/libtracker-miner/tracker-miner.c | 4 +-
src/libtracker-miner/tracker-monitor.c | 38 +-
...-freedesktop-Tracker-evolution-plugin.eplug.xml | 2 +-
src/plugins/evolution/tracker-evolution-plugin.c | 286 ++++++++--------
src/plugins/kmail/tracker-kmail-registrar.c | 64 ++--
src/plugins/kmail/tracker-kmail-registrar.h | 18 +-
src/tracker-control/tracker-control.c | 62 ++--
src/tracker-extract/dummy.c | 4 +-
src/tracker-extract/tracker-albumart-dummy.c | 2 +-
src/tracker-extract/tracker-albumart-generic.h | 4 +-
src/tracker-extract/tracker-albumart-pixbuf.c | 12 +-
src/tracker-extract/tracker-albumart-quill.cpp | 2 +-
src/tracker-extract/tracker-albumart.c | 180 +++++-----
src/tracker-extract/tracker-config.c | 48 ++--
src/tracker-extract/tracker-exif.c | 2 +-
src/tracker-extract/tracker-extract-abw.c | 2 +-
src/tracker-extract/tracker-extract-gstreamer.c | 44 ++--
src/tracker-extract/tracker-extract-imagemagick.c | 4 +-
src/tracker-extract/tracker-extract-mp3.c | 100 +++---
src/tracker-extract/tracker-extract-mplayer.c | 8 +-
src/tracker-extract/tracker-extract-msoffice.c | 8 +-
src/tracker-extract/tracker-extract-oasis.c | 2 +-
src/tracker-extract/tracker-extract-pdf.c | 2 +-
src/tracker-extract/tracker-extract-playlist.c | 6 +-
src/tracker-extract/tracker-extract-png.c | 12 +-
src/tracker-extract/tracker-extract-ps.c | 14 +-
src/tracker-extract/tracker-extract-tiff.c | 50 ++--
src/tracker-extract/tracker-extract-vorbis.c | 12 +-
src/tracker-extract/tracker-extract-xmp.c | 20 +-
src/tracker-extract/tracker-extract.c | 30 +-
src/tracker-extract/tracker-fts-config.c | 52 ++--
src/tracker-extract/tracker-iptc.h | 2 +-
src/tracker-extract/tracker-main.c | 18 +-
src/tracker-extract/tracker-msword.cpp | 30 +-
src/tracker-extract/tracker-topanalyzer.cpp | 94 +++---
src/tracker-extract/tracker-topanalyzer.h | 4 +-
src/tracker-extract/tracker-xmp.c | 48 ++--
src/tracker-extract/tracker-xmp.h | 4 +-
src/tracker-miner-fs/tracker-config.c | 174 +++++-----
src/tracker-miner-fs/tracker-miner-applications.c | 4 +-
src/tracker-miner-fs/tracker-miner-files.c | 40 ++--
src/tracker-miner-fs/tracker-thumbnailer.c | 40 ++--
src/tracker-miner-fs/tracker-volume-cleanup.c | 10 +-
src/tracker-preferences/tracker-preferences.vala | 8 +-
src/tracker-search-bar/tracker-applet.c | 66 ++--
src/tracker-search-bar/tracker-results-window.c | 38 +-
src/tracker-search-tool/tracker-category-view.gs | 62 ++--
src/tracker-search-tool/tracker-metadata-tile.gs | 140 ++++----
src/tracker-search-tool/tracker-query.gs | 62 ++--
src/tracker-search-tool/tracker-result-grid.gs | 82 +++---
src/tracker-search-tool/tracker-search-tool.gs | 42 ++--
src/tracker-search-tool/tracker-utils.gs | 78 +++---
src/tracker-status-icon/eggaccelerators.c | 68 ++--
src/tracker-status-icon/tomboykeybinder.c | 74 ++--
src/tracker-status-icon/tracker-status-icon.c | 12 +-
src/tracker-store/tracker-backup.c | 6 +-
src/tracker-store/tracker-config.c | 66 ++--
src/tracker-store/tracker-dbus.c | 44 ++--
src/tracker-store/tracker-events.c | 36 +-
src/tracker-store/tracker-main.c | 22 +-
src/tracker-store/tracker-push-registrar.c | 6 +-
src/tracker-store/tracker-push-registrar.h | 10 +-
src/tracker-store/tracker-push.c | 22 +-
src/tracker-store/tracker-resource-class.c | 4 +-
src/tracker-store/tracker-resources.c | 6 +-
src/tracker-store/tracker-statistics.c | 22 +-
src/tracker-store/tracker-statistics.h | 2 +-
src/tracker-store/tracker-store.c | 6 +-
src/tracker-store/tracker-writeback.c | 20 +-
src/tracker-utils/tracker-info.c | 22 +-
src/tracker-utils/tracker-search.c | 78 +++---
src/tracker-utils/tracker-sparql.c | 32 +-
src/tracker-utils/tracker-status.c | 62 ++--
src/tracker-utils/tracker-tag.c | 48 ++--
src/tracker-writeback/tracker-writeback-consumer.c | 2 +-
src/tracker-writeback/tracker-writeback-mp3.c | 12 +-
src/tracker-writeback/tracker-writeback-xmp.c | 28 +-
tests/Makefile.am | 2 +-
tests/functional-tests/tests.xml | 10 +-
tests/libtracker-common/Makefile.am | 8 +-
tests/libtracker-common/mock-dbus-gproxy.c | 4 +-
tests/libtracker-common/mock-dbus-gproxy.h | 4 +-
tests/libtracker-common/mock-thumbnailer-dbus.c | 16 +-
tests/libtracker-common/tracker-dbus-test.c | 6 +-
.../libtracker-data/algebra/filter-placement-1.rq | 6 +-
.../libtracker-data/algebra/filter-placement-2.rq | 6 +-
.../libtracker-data/algebra/filter-placement-3.rq | 4 +-
tests/libtracker-data/bnode-coreference/query.rq | 2 +-
tests/libtracker-data/dawg-testcases | 2 +-
tests/libtracker-data/expr-ops/query-ge-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-le-1.rq | 8 +-
tests/libtracker-data/expr-ops/query-minus-1.rq | 12 +-
tests/libtracker-data/expr-ops/query-mul-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-plus-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-unminus-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-unplus-1.rq | 10 +-
tests/libtracker-data/optional/q-opt-complex-1.rq | 14 +-
tests/libtracker-data/sort/query-sort-4.rq | 2 +-
tests/libtracker-data/sort/query-sort-5.rq | 6 +-
tests/libtracker-data/tracker-ontology-test.c | 12 +-
tests/libtracker-data/tracker-sparql-test.c | 10 +-
tests/libtracker-data/turtle/turtle-query-001.rq | 4 +-
tests/libtracker-db/Makefile.am | 4 +-
tests/libtracker-db/tracker-db-dbus-test.c | 22 +-
tests/tracker-extract/data/avi/create_avi_testdata | 2 +-
tests/tracker-extract/data/mp3/access_1.mp3 | Bin 19776 -> 19771 bytes
tests/tracker-extract/data/mp3/access_2.mp3 | Bin 19776 -> 19771 bytes
tests/tracker-extract/data/mp3/access_3.mp3 | Bin 19776 -> 19771 bytes
tests/tracker-extract/data/mp3/access_4.mp3 | Bin 19776 -> 19771 bytes
.../tracker-extract-gstreamer-test.c | 4 +-
tests/tracker-extract/tracker-extract-mp3-test.c | 4 +-
tests/tracker-extract/tracker-extract-test-utils.c | 30 +-
.../tracker-extract-testsuite-avi.c | 6 +-
.../tracker-extract-testsuite-jpeg.c | 28 +-
.../tracker-extract-testsuite-mp3.c | 42 ++--
.../tracker-extract-testsuite-png.c | 14 +-
.../tracker-extract-testsuite-tiff.c | 18 +-
tests/tracker-miner-fs/Makefile.am | 4 +-
tests/tracker-store/tracker-events-test.c | 6 +-
utils/data-generators/README | 18 +-
utils/data-generators/barnum/README | 24 +-
utils/data-generators/barnum/convert_data.py | 12 +-
utils/data-generators/barnum/gen_data.py | 10 +-
utils/data-generators/barnum/gencc.py | 16 +-
utils/data-generators/barnum/genpw.py | 38 +-
utils/data-generators/generate-all-and-import.sh | 2 +-
.../generate-data-for-contact-messages.py | 44 ++--
utils/data-generators/generate-data-for-music.py | 54 ++--
utils/data-generators/id32nmmTurtle.py | 344 ++++++++++----------
utils/data-generators/id32ttl.py | 48 ++--
utils/playlists/Makefile.am | 4 +-
utils/playlists/playlist2ttl.c | 14 +-
utils/services/data-validator.c | 24 +-
utils/services/gen-doc.sh | 12 +-
utils/services/ontology-validator.c | 38 +-
utils/services/qname-test.c | 8 +-
utils/services/qname.c | 24 +-
utils/services/qname.h | 2 +-
utils/services/rdfxml2metadatasample.xsl | 2 +-
utils/services/rdfxml2servicesample.xsl | 2 +-
utils/services/rdfxml2unittest_data.xsl | 2 +-
utils/services/rdfxml2unittest_query.xsl | 2 +-
utils/services/rdfxmlsample.xsl | 8 +-
utils/services/resources/LICENSE.txt | 2 +-
utils/services/resources/nepomuk-logo.png | Bin 11107 -> 11106 bytes
utils/services/sample.xsl | 4 +-
utils/services/service2rdf-xml.py | 2 +-
utils/services/ttl2graphviz.c | 6 +-
utils/services/ttl2html.c | 6 +-
utils/services/ttl_html.c | 24 +-
utils/services/ttl_loader.c | 42 ++--
utils/services/ttl_model.c | 4 +-
utils/tracker-fts/tracker-fts-test.c | 26 +-
233 files changed, 2675 insertions(+), 2675 deletions(-)
---
diff --git a/README b/README
index bd8f800..435c33e 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@
All discussion related to tracker happens on the Tracker
mailing list
-
+
http://mail.gnome.org/mailman/listinfo/tracker-list
IRC channel #tracker on:
@@ -85,7 +85,7 @@
* Very memory efficient. Unlike some other indexers, Tracker is
designed and built to run well on mobile and desktop systems with
- lower memory (256MB or less).
+ lower memory (256MB or less).
* Non-bloated and written in C for maximum efficiency.
@@ -174,7 +174,7 @@
5.1 Usage
Tracker normally starts itself when users log in. You can indexing by running:
-
+
$prefix/libexec/tracker-miner-fs
You can configure how this works using:
@@ -182,7 +182,7 @@
$prefix/bin/tracker-preferences
You can monitor data miners using:
-
+
$prefix/bin/tracker-status-icon
You can do simple searching using an applet:
diff --git a/TODO b/TODO
index 8c6a047..8e2f35b 100644
--- a/TODO
+++ b/TODO
@@ -62,16 +62,16 @@ Internal:
o widget should allow watermarking of background (use cairo) with a
definable pixmap
o widget should allow an optional popup preview when moused over for
- a few seconds (kind of like knoqueror does)
+ a few seconds (kind of like knoqueror does)
* RDF Query widget
o mockup: http://bugzilla.gnome.org/attachment.cgi?id=80132&action=view
- o The Rhythmbox automatic playlist may also serve useful as inspiration
+ o The Rhythmbox automatic playlist may also serve useful as inspiration
4. Better KDE Integration
* Improve basic GUI with corresponding features from the GNOME GUI
(tags, metadata tile, thumbnails)
- * add ability to index KContacts and KNotes
+ * add ability to index KContacts and KNotes
5. Add XMP Sidecar and IPTC support to tracker
diff --git a/configure.ac b/configure.ac
index 9e3282b..4503171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,8 +99,8 @@ CFLAGS="$CFLAGS"
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h sitdlib.h string.h sys/time.h unistd.h linux/unistd.h])
-AC_CHECK_HEADER([zlib.h],
- [],
+AC_CHECK_HEADER([zlib.h],
+ [],
[AC_MSG_ERROR([You must have zlib.h and zlib installed])])
# Can posix_fadvise be used
@@ -123,8 +123,8 @@ printf ("%s", __FUNCTION__);
)
if test "x$have_function" = "xno" ; then
- AC_DEFINE(__FUNCTION__,
- __func__,
+ AC_DEFINE(__FUNCTION__,
+ __func__,
[Defined for compilers not supporting __FUNCTION__])
fi
@@ -243,8 +243,8 @@ OLD_LIBS="$LIBS"
CFLAGS=""
LIBS=""
-AC_ARG_ENABLE(id3lib,
- AS_HELP_STRING([--enable-id3lib],
+AC_ARG_ENABLE(id3lib,
+ AS_HELP_STRING([--enable-id3lib],
[enable writeback for MP3 data [[default=auto]]]),,
[enable_id3lib=auto])
@@ -285,9 +285,9 @@ AC_ARG_ENABLE(libstreamanalyzer,
[enable_libstreamanalyzer=no])
if test "x$enable_libstreamanalyzer" != "xno"; then
- PKG_CHECK_MODULES(LIBSTREAMANALYZER,
- [libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED],
- [have_libstreamanalyzer=yes],
+ PKG_CHECK_MODULES(LIBSTREAMANALYZER,
+ [libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED],
+ [have_libstreamanalyzer=yes],
[have_libstreamanalyzer=no])
AC_SUBST(LIBSTREAMANALYZER_CFLAGS)
AC_SUBST(LIBSTREAMANALYZER_LIBS)
@@ -313,7 +313,7 @@ AM_CONDITIONAL(HAVE_LIBSTREAMANALYZER, test "$have_libstreamanalyzer" = "yes")
dnl DBus services dir
AC_ARG_WITH([session_bus_services_dir],
- AS_HELP_STRING([--with-session-bus-services-dir],
+ AS_HELP_STRING([--with-session-bus-services-dir],
[Path to DBus services directory]))
if test "x$with_session_bus_services_dir" = "x" ; then
@@ -400,15 +400,15 @@ fi
# Check for HAL
##################################################################
-AC_ARG_ENABLE(hal,
+AC_ARG_ENABLE(hal,
AS_HELP_STRING([--disable-hal],
[disable HAL support for AC power detection [[default=yes]]]),,
[enable_hal=yes])
if test "x$enable_hal" != "xno"; then
- PKG_CHECK_MODULES(HAL,
- [hal >= $HAL_REQUIRED hal-storage],
- [have_hal=yes] ,
+ PKG_CHECK_MODULES(HAL,
+ [hal >= $HAL_REQUIRED hal-storage],
+ [have_hal=yes] ,
[have_hal=no])
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
@@ -464,13 +464,13 @@ AM_CONDITIONAL(HAVE_DEVKIT_POWER, test "x$have_devkit_power" = "xyes")
# Check for libxml2
##################################################################
-AC_ARG_ENABLE(libxml2,
+AC_ARG_ENABLE(libxml2,
AS_HELP_STRING([--disable-libxml2],
[disable HTML/XML extractors [[default=yes]]]),,
[enable_libxml2=yes])
if test "x$enable_libxml2" != "xno"; then
- PKG_CHECK_MODULES(LIBXML2,
+ PKG_CHECK_MODULES(LIBXML2,
[libxml-2.0 >= $LIBXML2_REQUIRED],
[have_libxml2=yes],
[have_libxml2=no])
@@ -496,7 +496,7 @@ AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
# Check for GdkPixbuf, needed for the MP3 album art extractor
##################################################################
-AC_ARG_ENABLE(gdkpixbuf,
+AC_ARG_ENABLE(gdkpixbuf,
AS_HELP_STRING([--enable-gdkpixbuf],
[enable GdkPixbuf support, (MP3 album art) [[default=auto]]]),,
[enable_gdkpixbuf=auto])
@@ -647,15 +647,15 @@ fi
# Check for Helixbin for GStreamer
##################################################################
-AC_ARG_ENABLE(gstreamer-helix,
+AC_ARG_ENABLE(gstreamer-helix,
AS_HELP_STRING([--enable-gstreamer-helix],
[enable GStreamer helix extractor for Real Media [[default=no]]]),,
[enable_gstreamer_helix=no])
if test "x$enable_gstreamer_helix" != "xno"; then
- if test "x$have_libgstreamer" = "xyes"; then
+ if test "x$have_libgstreamer" = "xyes"; then
have_gstreamer_helix="yes"
- else
+ else
have_gstreamer_helix="no"
fi
else
@@ -714,7 +714,7 @@ AC_SUBST(SQLITE3_LIBS)
# Enable UNAC support?
##################################################################
-AC_ARG_ENABLE(unac,
+AC_ARG_ENABLE(unac,
AS_HELP_STRING([--enable-unac],
[enable UNAC support, required for stripping accents [[default=auto]]]),,
[enable_unac=auto])
@@ -766,7 +766,7 @@ AM_CONDITIONAL(USING_KMAIL_MINER, test "x$enable_kmail_miner" = "xyes")
####################################################################
AC_ARG_ENABLE([deskbar_applet],
- AS_HELP_STRING([--enable-deskbar-applet],
+ AS_HELP_STRING([--enable-deskbar-applet],
[enable support for Deskbar applet [[default=auto]]]),,
[enable_deskbar_applet=auto])
@@ -790,7 +790,7 @@ AM_CONDITIONAL(HAVE_DESKBAR_APPLET_HANDLER, test "x$have_deskbar_applet" = "xhan
AM_CONDITIONAL(HAVE_DESKBAR_APPLET_MODULE, test "x$have_deskbar_applet" = "xmodule")
AC_ARG_WITH([deskbar_applet_dir],
- AS_HELP_STRING([--with-deskbar-applet-dir],
+ AS_HELP_STRING([--with-deskbar-applet-dir],
[Path to Deskbar handler/module directory [[default=pkgconfig]]]))
if test "x$have_deskbar_applet" = "xhandler"; then
@@ -859,8 +859,8 @@ AC_SUBST(TRACKER_VALA_LIBS)
# Enable building libtracker-gtk?
##################################################################
-AC_ARG_ENABLE([libtrackergtk],
- AS_HELP_STRING([--enable-libtrackergtk],
+AC_ARG_ENABLE([libtrackergtk],
+ AS_HELP_STRING([--enable-libtrackergtk],
[enable libtrackergtk [[default=auto]]]),,
[enable_libtrackergtk=auto])
@@ -939,8 +939,8 @@ AM_CONDITIONAL(HAVE_TRACKER_SEARCH_BAR, test "$have_tracker_search_bar" = "yes")
# Check for GNOME/GTK dependencies to build tracker search tool
##################################################################
-AC_ARG_ENABLE(tracker-search-tool,
- AS_HELP_STRING([--enable-tracker-search-tool],
+AC_ARG_ENABLE(tracker-search-tool,
+ AS_HELP_STRING([--enable-tracker-search-tool],
[enable tracker-search-tool [[default=auto]]]),,
[enable_tracker_search_tool=auto])
@@ -962,7 +962,7 @@ AM_CONDITIONAL(HAVE_TRACKER_SEARCH_TOOL, test "$have_tracker_search_tool" = "yes
##################################################################
AC_ARG_ENABLE([tracker-preferences],
- AS_HELP_STRING([--enable-tracker-preferences],
+ AS_HELP_STRING([--enable-tracker-preferences],
[enable the tracker preferences dialog [[default=auto]]]),,
[enable_tracker_preferences=auto])
@@ -995,13 +995,13 @@ fi
# Check for poppler's glib bingings
##################################################################
-AC_ARG_ENABLE(poppler-glib,
- AS_HELP_STRING([--enable-poppler-glib],
+AC_ARG_ENABLE(poppler-glib,
+ AS_HELP_STRING([--enable-poppler-glib],
[enable extractor for PDF data [[default=auto]]]),,
[enable_poppler_glib=auto])
if test "x$enable_poppler_glib" != "xno" ; then
- PKG_CHECK_MODULES(POPPLER_GLIB,
+ PKG_CHECK_MODULES(POPPLER_GLIB,
[poppler-glib >= $POPPLER_GLIB_REQUIRED
cairo >= $CAIRO_REQUIRED
gdk-2.0 >= $GDK_REQUIRED],
@@ -1030,13 +1030,13 @@ AM_CONDITIONAL(HAVE_POPPLER_GLIB, test "x$have_poppler_glib" = "xyes")
# Check for libexif
##################################################################
-AC_ARG_ENABLE(libexif,
+AC_ARG_ENABLE(libexif,
AS_HELP_STRING([--enable-libexif],
[enable extractor for exif data [[default=auto]]]),,
[enable_libexif=auto])
if test "x$enable_libexif" != "xno" ; then
- PKG_CHECK_MODULES(LIBEXIF,
+ PKG_CHECK_MODULES(LIBEXIF,
[libexif >= $LIBEXIF_REQUIRED],
[have_libexif=yes],
[have_libexif=no])
@@ -1063,13 +1063,13 @@ AM_CONDITIONAL(HAVE_EXIF, test "x$have_libexif" = "xyes")
# Check for libiptcdata
##################################################################
-AC_ARG_ENABLE(libiptcdata,
+AC_ARG_ENABLE(libiptcdata,
AS_HELP_STRING([--enable-libiptcdata],
[enable extractor for iptc data [[default=auto]]]),,
[enable_libiptcdata=auto])
if test "x$enable_libiptcdata" != "xno" ; then
- PKG_CHECK_MODULES(LIBIPTCDATA,
+ PKG_CHECK_MODULES(LIBIPTCDATA,
[libiptcdata],
[have_libiptcdata=yes],
[have_libiptcdata=no])
@@ -1096,8 +1096,8 @@ AM_CONDITIONAL(HAVE_IPTC, test "x$have_libiptcdata" = "xyes")
# Check for libgsf
##################################################################
-AC_ARG_ENABLE(libgsf,
- AS_HELP_STRING([--enable-libgsf],
+AC_ARG_ENABLE(libgsf,
+ AS_HELP_STRING([--enable-libgsf],
[enable extractor for GSF data [[default=auto]]]),,
[enable_libgsf=auto])
@@ -1183,8 +1183,8 @@ OLD_LIBS="$LIBS"
CFLAGS=""
LIBS=""
-AC_ARG_ENABLE(libjpeg,
- AS_HELP_STRING([--enable-libjpeg],
+AC_ARG_ENABLE(libjpeg,
+ AS_HELP_STRING([--enable-libjpeg],
[enable extractor for JPEG data [[default=auto]]]),,
[enable_libjpeg=auto])
@@ -1230,8 +1230,8 @@ OLD_LIBS="$LIBS"
CFLAGS=""
LIBS=""
-AC_ARG_ENABLE(libtiff,
- AS_HELP_STRING([--enable-libtiff],
+AC_ARG_ENABLE(libtiff,
+ AS_HELP_STRING([--enable-libtiff],
[enable extractor for TIFF data [[default=auto]]]),,
[enable_libtiff=auto])
@@ -1269,15 +1269,15 @@ LIBS="$OLD_LIBS"
# Check for vorbis
##################################################################
-AC_ARG_ENABLE(libvorbis,
- AS_HELP_STRING([--enable-libvorbis],
+AC_ARG_ENABLE(libvorbis,
+ AS_HELP_STRING([--enable-libvorbis],
[enable extractor for vorbis data (ogg) [[default=no]]]),,
[enable_libvorbis=no])
if test "x$enable_libvorbis" != "xno" ; then
PKG_CHECK_MODULES(LIBVORBIS,
[vorbisfile >= $LIBVORBIS_REQUIRED],
- [have_libvorbis=yes],
+ [have_libvorbis=yes],
[have_libvorbis=no])
AC_SUBST(LIBVORBIS_CFLAGS)
@@ -1309,9 +1309,9 @@ AC_CACHE_CHECK([if we have ioprio],[tracker_cv_have_ioprio],
#include <errno.h>
#include <sys/syscall.h>
#include <unistd.h>
- ]],
+ ]],
[[
- inline int ioprio_get (int which, int who)
+ inline int ioprio_get (int which, int who)
{
return syscall (__NR_ioprio_get, which, who);
}
@@ -1334,15 +1334,15 @@ fi
# Check for exempi
##################################################################
-AC_ARG_ENABLE(exempi,
- AS_HELP_STRING([--enable-exempi],
+AC_ARG_ENABLE(exempi,
+ AS_HELP_STRING([--enable-exempi],
[enable extractor for XMP data [[default=auto]]]),,
[enable_exempi=auto])
if test "x$enable_exempi" != "xno" ; then
PKG_CHECK_MODULES(EXEMPI,
[exempi-2.0 >= $EXEMPI_REQUIRED],
- [have_exempi=yes],
+ [have_exempi=yes],
[have_exempi=no])
AC_SUBST(EXEMPI_CFLAGS)
@@ -1367,15 +1367,15 @@ AM_CONDITIONAL(HAVE_EXEMPI, test "x$have_exempi" = "xyes")
# Checking totem-pl-parser
####################################################################
-AC_ARG_ENABLE(playlist,
+AC_ARG_ENABLE(playlist,
AS_HELP_STRING([--enable-playlist],
[enable playlist support [[default=auto]]]),,
[enable_playlist=auto])
if test "x$enable_playlist" != "xno" ; then
- PKG_CHECK_MODULES(TOTEM_PL_PARSER,
- [totem-plparser],
- [have_playlist=yes],
+ PKG_CHECK_MODULES(TOTEM_PL_PARSER,
+ [totem-plparser],
+ [have_playlist=yes],
[have_playlist=no])
AC_SUBST(TOTEM_PL_PARSER_CFLAGS)
@@ -1411,8 +1411,8 @@ AM_CONDITIONAL(HAVE_MOCKUP, test "x$have_mockup" = "xyes")
if test "x$enable_evolution_miner" != "xno" ; then
PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [
evolution-plugin >= $EVO_REQUIRED
- evolution-data-server-1.2 >= $EDS_REQUIRED],
- have_evolution_plugin=yes,
+ evolution-data-server-1.2 >= $EDS_REQUIRED],
+ have_evolution_plugin=yes,
have_evolution_plugin=no)
AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
@@ -1421,7 +1421,7 @@ if test "x$enable_evolution_miner" != "xno" ; then
if test x$have_evolution_plugin == "xyes"; then
dnl Evolution plugins dir
AC_ARG_WITH([evolution_plugins_dir],
- AS_HELP_STRING([--with-evolution-plugins-dir],
+ AS_HELP_STRING([--with-evolution-plugins-dir],
[Path to Evolution plugins directory]))
if test "x$with_evolution_plugins_dir" = "x" ; then
evolution_plugins_dir=`$PKG_CONFIG evolution-plugin --variable=plugindir`
@@ -1455,8 +1455,8 @@ AM_CONDITIONAL(HAVE_EVOLUTION_PLUGIN, test "$have_evolution_plugin" = "yes")
####################################################################
# Include/Exclude functional tests
####################################################################
-AC_ARG_ENABLE([functional-tests],
- AS_HELP_STRING([--enable-functional-tests],
+AC_ARG_ENABLE([functional-tests],
+ AS_HELP_STRING([--enable-functional-tests],
[enable functional tests [[default=no]]]),,
[enable_functional_tests=no])
diff --git a/data/Makefile.am b/data/Makefile.am
index 4e3ab76..ee00bd2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = db dbus languages icons ontologies miners
-# Should do this for *.desktop.in.in
+# Should do this for *.desktop.in.in
tracker-status-icon.desktop.in: tracker-status-icon.desktop.in.in
@sed -e "s|@bindir[ ]|${bindir}|" \
-e "s|@VERSION[ ]|${VERSION}|" $< > $@
diff --git a/data/db/sqlite-contents.sql b/data/db/sqlite-contents.sql
index 3c87a82..0c12e82 100644
--- a/data/db/sqlite-contents.sql
+++ b/data/db/sqlite-contents.sql
@@ -1,8 +1,8 @@
-CREATE TABLE ServiceContents
+CREATE TABLE ServiceContents
(
- ServiceID Int not null,
- MetadataID Int not null,
- Content Text,
+ ServiceID Int not null,
+ MetadataID Int not null,
+ Content Text,
primary key (ServiceID, MetadataID)
);
\ No newline at end of file
diff --git a/data/db/sqlite-tracker.sql b/data/db/sqlite-tracker.sql
index 3712866..eb661db 100644
--- a/data/db/sqlite-tracker.sql
+++ b/data/db/sqlite-tracker.sql
@@ -1,5 +1,5 @@
-CREATE TABLE Options (
+CREATE TABLE Options (
OptionKey Text COLLATE NOCASE PRIMARY KEY not null,
OptionValue Text COLLATE NOCASE
);
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 8522516..8a62c21 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -27,4 +27,4 @@ EXTRA_DIST = \
$(service_in_files) \
$(config_DATA)
-CLEANFILES = $(service_DATA)
+CLEANFILES = $(service_DATA)
diff --git a/data/dbus/tracker-extract.xml b/data/dbus/tracker-extract.xml
index 0301008..3ad78b0 100644
--- a/data/dbus/tracker-extract.xml
+++ b/data/dbus/tracker-extract.xml
@@ -10,7 +10,7 @@
-->
<node name="/">
- <interface name="org.freedesktop.Tracker1.Extract">
+ <interface name="org.freedesktop.Tracker1.Extract">
<method name="GetPid">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="i" name="value" direction="out" />
diff --git a/data/dbus/tracker-resources-class.xml b/data/dbus/tracker-resources-class.xml
index 9212e43..1e4e8e0 100644
--- a/data/dbus/tracker-resources-class.xml
+++ b/data/dbus/tracker-resources-class.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<node name="/">
- <interface name="org.freedesktop.Tracker1.Resources.Class">
+ <interface name="org.freedesktop.Tracker1.Resources.Class">
<!-- Signal for changed subjects -->
diff --git a/data/dbus/tracker-resources.xml b/data/dbus/tracker-resources.xml
index dc06b42..df08272 100644
--- a/data/dbus/tracker-resources.xml
+++ b/data/dbus/tracker-resources.xml
@@ -5,14 +5,14 @@
<!-- Load statements from Turtle file -->
<method name="Load">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+ <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="s" name="uri" direction="in" />
</method>
<!-- SPARQL Query without updates -->
<method name="SparqlQuery">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0"
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0"
value="QVector<QStringList>"/>
<arg type="s" name="query" direction="in" />
<arg type="aas" name="result" direction="out" />
diff --git a/data/dbus/tracker-statistics.xml b/data/dbus/tracker-statistics.xml
index 0303dd4..8efea99 100644
--- a/data/dbus/tracker-statistics.xml
+++ b/data/dbus/tracker-statistics.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
The "id" input parameters can represent, in the case of a file, the
full path and name of the file. In other cases, "id" can also be a
- unique name or URI for the specified service.
-
+ unique name or URI for the specified service.
+
The "id" field uniquely identifies an entity in Tracker regardless
of its service type. The live_query_id parameters in some search
and retrieval methods is used to indicate whether the query should
@@ -13,24 +13,24 @@
are. These signals are emitted in response to file or volume
notifications. A value of -1 should be passed if live query
functionality is not desired. A live_query_id can be obtained in
- the future from the LiveQuery Interface.
+ the future from the LiveQuery Interface.
-->
<node name="/">
<interface name="org.freedesktop.Tracker1.Statistics">
-
+
<!-- Get statistics for services that have been indexed. Output is
- in string array format: [service, no of entities]
- -->
+ in string array format: [service, no of entities]
+ -->
<method name="Get">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0"
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0"
value="QVector<QStringList>"/>
<arg type="aas" name="service_stats" direction="out" />
</method>
-
+
<!-- Signal whenever the count of a category changed. Look at GetStats for
- the format of service_stats.
+ the format of service_stats.
-->
<signal name="Updated">
<arg type="aas" name="statistics"/>
diff --git a/data/languages/Makefile.am b/data/languages/Makefile.am
index 4d8ab3b..48e846d 100644
--- a/data/languages/Makefile.am
+++ b/data/languages/Makefile.am
@@ -15,6 +15,6 @@ config_DATA = \
stopwords.nl \
stopwords.pt \
stopwords.ru \
- stopwords.sv
+ stopwords.sv
EXTRA_DIST = $(config_DATA)
diff --git a/data/ontologies/10-xsd.description b/data/ontologies/10-xsd.description
index 341768a..339d731 100644
--- a/data/ontologies/10-xsd.description
+++ b/data/ontologies/10-xsd.description
@@ -8,7 +8,7 @@
dsc:editor "Tracker developers (translation into turtle)" ;
dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/10-xsd.ontology";;
- dsc:localPrefix "xsd" ;
+ dsc:localPrefix "xsd" ;
dsc:baseUrl "http://www.w3.org/2001/XMLSchema#"; ;
dsc:relativePath "./10-xsd.ontology" ;
diff --git a/data/ontologies/11-rdf.description b/data/ontologies/11-rdf.description
index 8c233ca..2078e65 100644
--- a/data/ontologies/11-rdf.description
+++ b/data/ontologies/11-rdf.description
@@ -6,6 +6,6 @@
dsc:editor "Tracker developers (translation into turtle)" ;
dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/11-rdf.ontology";;
- dsc:localPrefix "rdf" ;
+ dsc:localPrefix "rdf" ;
dsc:baseUrl "http://www.w3.org/2000/01/rdf-schema#"; ;
dsc:relativePath "./11-rdf.ontology" .
diff --git a/data/ontologies/12-nrl.description b/data/ontologies/12-nrl.description
index 8e15935..87fb60b 100644
--- a/data/ontologies/12-nrl.description
+++ b/data/ontologies/12-nrl.description
@@ -6,6 +6,6 @@
dsc:editor "Tracker developers (translation into turtle)" ;
dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/12-nrl.ontology";;
- dsc:localPrefix "nrl" ;
+ dsc:localPrefix "nrl" ;
dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#"; ;
dsc:relativePath "./12-nrl.ontology" .
diff --git a/data/ontologies/20-dc.description b/data/ontologies/20-dc.description
index 2aaea14..118d44a 100644
--- a/data/ontologies/20-dc.description
+++ b/data/ontologies/20-dc.description
@@ -6,6 +6,6 @@
dsc:editor "Tracker developers (translation into turtle)" ;
dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/20-dc.ontology";;
- dsc:localPrefix "dc" ;
+ dsc:localPrefix "dc" ;
dsc:baseUrl "http://purl.org/dc/elements/1.1/";;
dsc:relativePath "./20-dc.ontology" .
diff --git a/data/ontologies/30-nie.description b/data/ontologies/30-nie.description
index 741d40f..9e7e063 100644
--- a/data/ontologies/30-nie.description
+++ b/data/ontologies/30-nie.description
@@ -12,8 +12,8 @@
dsc:contributor "Evgeny 'phreedom' Egorochkin, KDE Strigi Developer, <stexx mail ru>";
dsc:contributor "Christiaan Fluit, Aduna, <christiaan fluit aduna-software com>";
- dsc:localPrefix "nie" ;
- dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#";;
+ dsc:localPrefix "nie" ;
+ dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#";;
dsc:relativePath "./30-nie.ontology" ;
dsc:copyright "Copyright © 2007 <a href=\"http://www.dfki.de/\";>DFKI</a> © 2009 <a href=\"http://www.nokia.com/\";>Nokia</a><sup>®</sup> The ontologies are made available under the terms of NEPOMUK <a href=\"../resources/LICENSE.txt\">software license</a> (FIXME verify)".
diff --git a/data/ontologies/32-nco.ontology b/data/ontologies/32-nco.ontology
index e36b934..f79d2e0 100644
--- a/data/ontologies/32-nco.ontology
+++ b/data/ontologies/32-nco.ontology
@@ -698,7 +698,7 @@ nco:imContactStatusMessage a rdf:Property ;
rdfs:range xsd:string .
nco:PresenceStatus a rdfs:Class ;
- rdfs:label "Presence statuses";
+ rdfs:label "Presence statuses";
rdfs:comment "Predefined set of status level instances" ;
rdfs:subClassOf rdfs:Resource .
diff --git a/data/ontologies/33-nfo.ontology b/data/ontologies/33-nfo.ontology
index 846d8de..44a4344 100644
--- a/data/ontologies/33-nfo.ontology
+++ b/data/ontologies/33-nfo.ontology
@@ -828,7 +828,7 @@ nfo:softwareCmdLine a rdf:Property ;
rdfs:range xsd:string ;
tracker:weight 3 .
-# Also added
+# Also added
nfo:Orientation a rdfs:Class ;
rdfs:label "Orientation enum" ;
diff --git a/data/ontologies/34-nmo.ontology b/data/ontologies/34-nmo.ontology
index cef8cd6..a9d0e50 100644
--- a/data/ontologies/34-nmo.ontology
+++ b/data/ontologies/34-nmo.ontology
@@ -20,7 +20,7 @@ nmo:MimePart a rdfs:Class ;
nmo:Multipart a rdfs:Class ;
rdfs:subClassOf nfo:DataContainer .
-# FIXME Extension requested in Nepomuk
+# FIXME Extension requested in Nepomuk
nmo:partBoundary a rdf:Property ;
rdfs:domain nmo:Multipart ;
rdfs:range xsd:string .
@@ -30,17 +30,17 @@ nmo:Message a rdfs:Class ;
rdfs:subClassOf nfo:TextDocument ;
tracker:notify true .
-# FIXME Extension requested in Nepomuk
+# FIXME Extension requested in Nepomuk
nmo:Email a rdfs:Class;
rdfs:subClassOf nmo:Message .
-# FIXME Extension requested in Nepomuk
+# FIXME Extension requested in Nepomuk
nmo:hasContent a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:Email ;
rdfs:range nmo:MimePart .
-# FIXME Extension requested in Nepomuk
+# FIXME Extension requested in Nepomuk
nmo:Attachment a rdfs:Class ;
rdfs:subClassOf nmo:MimePart ;
rdfs:subClassOf nfo:Attachment .
@@ -177,7 +177,7 @@ nmo:contentDisposition a rdf:Property ;
rdfs:domain nmo:MimePart ;
rdfs:range xsd:string .
-# FIXME Extension requested in Nepomuk
+# FIXME Extension requested in Nepomuk
nmo:mimeHeader a rdf:Property ;
rdfs:domain nmo:MimePart ;
rdfs:range rdfs:Resource .
@@ -242,48 +242,48 @@ nmo:duration a rdf:Property ;
rdfs:domain nmo:Call ;
rdfs:range xsd:integer .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:accountName a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:MailAccount ;
rdfs:range xsd:string ;
tracker:weight 3 .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:accountDisplayName a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:MailAccount ;
rdfs:range xsd:string ;
tracker:weight 3 .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:fromAddress a rdf:Property ;
rdfs:comment "From address of an account" ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:MailAccount ;
rdfs:range nco:EmailAddress .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:signature a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:MailAccount ;
rdfs:range xsd:string ;
tracker:weight 2 .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:folderName a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:MailFolder ;
rdfs:range xsd:string ;
tracker:weight 4 .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:status a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:Email ;
rdfs:range xsd:string .
-# FIXME Extension to nepomuk
+# FIXME Extension to nepomuk
nmo:responseType a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain nmo:Email ;
@@ -361,7 +361,7 @@ nmo:smsFolderId a rdf:Property ;
rdfs:domain nmo:SMSFolder ;
rdfs:range xsd:string ;
rdfs:subPropertyOf nie:identifier .
-
+
nmo:containsSMSFolder a rdf:Property ;
rdfs:label "contains SMS Folder";
diff --git a/data/ontologies/36-scal.ontology b/data/ontologies/36-scal.ontology
index 002124f..404e777 100644
--- a/data/ontologies/36-scal.ontology
+++ b/data/ontologies/36-scal.ontology
@@ -24,7 +24,7 @@ scal:CalendarItem a rdfs:Class ;
# FIXME Should we define the inverse property?
scal:belongsToCalendar a rdf:Property ;
rdfs:label "Belongs to calentar" ;
- rdfs:comment "Relation between a calendar item and a calendar." ;
+ rdfs:comment "Relation between a calendar item and a calendar." ;
rdfs:subPropertyOf nie:isLogicalPartOf ;
rdfs:domain scal:CalendarItem ;
rdfs:range scal:Calendar .
@@ -273,7 +273,7 @@ scal:journalStatus a rdf:Property ;
#
# Alarms:
#
-# FIXME fix the hierarchy to support generic alarms
+# FIXME fix the hierarchy to support generic alarms
# (This one is always linked with an Event)
#
scal:CalendarAlarm a rdfs:Class ;
@@ -387,7 +387,7 @@ scal:isAllDay a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain scal:CalendarItem ;
rdfs:range xsd:boolean .
-
+
#
# General Calendar item properties
@@ -421,7 +421,7 @@ scal:rrule a rdf:Property ;
#
# This is going to be pretty conflictive and non-semantic... but
-# improve a lot the performance. Study a better solution (maybe keeping the
+# improve a lot the performance. Study a better solution (maybe keeping the
# multiple properties in parallel)
#
scal:recurrencePattern a rdf:Property ;
@@ -463,7 +463,7 @@ scal:exceptionRDate a rdf:Property ;
#
# TODO
-#
+#
# equivalent of ncal:Action, including ncal:repeat and ncal:duration
#
#
diff --git a/data/ontologies/38-nmm.description b/data/ontologies/38-nmm.description
index 1cc973e..9f9d8a2 100644
--- a/data/ontologies/38-nmm.description
+++ b/data/ontologies/38-nmm.description
@@ -10,6 +10,6 @@
dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/38-nmm.ontology";;
- dsc:localPrefix "nmm" ;
+ dsc:localPrefix "nmm" ;
dsc:baseUrl "http://www.tracker-project.org/temp/nmm#"; ;
dsc:relativePath "./38-nmm.ontology" .
diff --git a/data/ontologies/38-nmm.ontology b/data/ontologies/38-nmm.ontology
index 71cabc2..622f382 100644
--- a/data/ontologies/38-nmm.ontology
+++ b/data/ontologies/38-nmm.ontology
@@ -305,7 +305,7 @@ nmm:skipCounter a rdf:Property ;
## Image ontology
nmm:ImageList a rdfs:Class ;
- rdfs:subClassOf nfo:MediaList ;
+ rdfs:subClassOf nfo:MediaList ;
rdfs:label "Image album" ;
rdfs:comment "An album of images" .
diff --git a/data/ontologies/39-mto.ontology b/data/ontologies/39-mto.ontology
index fc1392f..fe7e711 100644
--- a/data/ontologies/39-mto.ontology
+++ b/data/ontologies/39-mto.ontology
@@ -11,10 +11,10 @@
mto: a tracker:Namespace ;
tracker:prefix "mto" .
-
-mto:TransferElement a rdfs:Class ;
- rdfs:label "Transfer element" ;
- rdfs:comment "Gives information about the transfer of a single element - typically a file. The properties in this class would need to be changed if it has to handle sync elements as well" ;
+
+mto:TransferElement a rdfs:Class ;
+ rdfs:label "Transfer element" ;
+ rdfs:comment "Gives information about the transfer of a single element - typically a file. The properties in this class would need to be changed if it has to handle sync elements as well" ;
tracker:notify true ;
rdfs:subClassOf nie:InformationElement .
@@ -53,7 +53,7 @@ mto:destination a rdf:Property ;
rdfs:comment "The destination of the transfer. If the transfer is an download, it would be the URI for a file on the device. If the transfer is a (web) upload, it will be a URL, which will be filled once the upload is completed." ;
nrl:maxCardinality 1 ;
rdfs:domain mto:TransferElement ;
- rdfs:range rdfs:Resource .
+ rdfs:range rdfs:Resource .
mto:startedTime a rdf:Property ;
rdfs:label "Started" ;
@@ -104,7 +104,7 @@ mto:TransferMethod a rdfs:Class ;
mto:transfer-method-bluetooth a mto:TransferMethod .
mto:transfer-method-web a mto:TransferMethod .
-mto:method a rdf:Property ;
+mto:method a rdf:Property ;
rdfs:label "Method" ;
rdfs:comment "The method of transfer - Bluetooth, Web upload etc" ;
nrl:maxCardinality 1 ;
@@ -118,22 +118,22 @@ mto:created a rdf:Property ;
rdfs:domain mto:Transfer ;
rdfs:range xsd:dateTime .
-mto:transferList a rdf:Property ;
+mto:transferList a rdf:Property ;
rdfs:label "Transfer List" ;
rdfs:comment "A list of transfer elements" ;
rdfs:domain mto:Transfer ;
- rdfs:range mto:TransferElement .
+ rdfs:range mto:TransferElement .
-# unknown range - will need to be defined by the Account management guys
+# unknown range - will need to be defined by the Account management guys
# FIXME FIXME FIXME FIXME: At the moment xsd:string so the transfer app guys can start working.
-# Waiting for a holistic accounts solution
+# Waiting for a holistic accounts solution
# It could also be a ContactMedium
mto:account a rdf:Property ;
rdfs:label "Account" ;
rdfs:comment "A reference to the account to which the web upload is to be done. This should at least contain information about the account and the service which is being used. For instance, Google/YouTube or Google/Picassa" ;
nrl:maxCardinality 1 ;
rdfs:domain mto:Transfer ;
- rdfs:range xsd:string .
+ rdfs:range xsd:string .
mto:starter a rdf:Property ;
rdfs:label "Starter" ;
@@ -142,7 +142,7 @@ mto:starter a rdf:Property ;
rdfs:domain mto:Transfer ;
rdfs:range nfo:Software .
-mto:agent a rdf:Property ;
+mto:agent a rdf:Property ;
rdfs:label "Agent" ;
rdfs:comment "The application processing the transfer - e.g. Upload Engine etc" ;
nrl:maxCardinality 1 ;
diff --git a/data/ontologies/40-mlo.ontology b/data/ontologies/40-mlo.ontology
index 78bea37..f8daf77 100644
--- a/data/ontologies/40-mlo.ontology
+++ b/data/ontologies/40-mlo.ontology
@@ -90,7 +90,7 @@ mlo:routeDetails a rdf:Property ;
rdfs:label "Pointer to a file containing route details (e.g. KML file)." ;
rdfs:comment "FIXME Domain can be resource if we handle map-files correctly in the ontology";
rdfs:domain mlo:Route ;
- rdfs:range xsd:string .
+ rdfs:range xsd:string .
# FIXME Domain rdfs:Resource?? to link files and not only content?
diff --git a/data/ontologies/41-mfo.ontology b/data/ontologies/41-mfo.ontology
index 361c7c2..f4c014d 100644
--- a/data/ontologies/41-mfo.ontology
+++ b/data/ontologies/41-mfo.ontology
@@ -19,7 +19,7 @@ mfo:FeedElement a rdfs:Class;
mfo:FeedChannel a rdfs:Class ;
tracker:notify true ;
- rdfs:label "Feed channel" ;
+ rdfs:label "Feed channel" ;
rdfs:comment "Represents feed channel transfer, typically a download of RSS or ATOM. It is also a communication channel of Nepomuk Messaging Ontology so that feed sources could be treated as message sources" ;
rdfs:subClassOf nmo:CommunicationChannel, mfo:FeedElement .
@@ -79,11 +79,11 @@ mfo:downloadedTime a rdf:Property ;
rdfs:domain mfo:FeedMessage ;
rdfs:range xsd:dateTime .
-mfo:enclosureList a rdf:Property ;
+mfo:enclosureList a rdf:Property ;
rdfs:label "Enclosure List" ;
rdfs:comment "A list of enclosures" ;
rdfs:domain mfo:FeedMessage ;
- rdfs:range mfo:Enclosure .
+ rdfs:range mfo:Enclosure .
# String? Resource? RemoteDataObject?
mfo:remoteLink a rdf:Property ;
@@ -101,9 +101,9 @@ mfo:localLink a rdf:Property ;
nrl:maxCardinality 1 .
mfo:optional a rdf:Property ;
- rdfs:label "Optional";
+ rdfs:label "Optional";
rdfs:comment "The enclosure is mandatory to download or only optional" ;
- rdfs:domain mfo:Enclosure;
+ rdfs:domain mfo:Enclosure;
rdfs:range xsd:boolean ;
nrl:maxCardinality 1 .
diff --git a/data/ontologies/89-mtp.ontology b/data/ontologies/89-mtp.ontology
index 2792ce3..49cf653 100644
--- a/data/ontologies/89-mtp.ontology
+++ b/data/ontologies/89-mtp.ontology
@@ -29,10 +29,10 @@ mtp:scantype-FieldInterleavedLowerFirst a mtp:ScanType ;
nie:description "Line interleaved frames with the Lower field on the first line." .
mtp:scantype-FieldSingleUpperFirst a mtp:ScanType;
nie:description "Fields are sent as independent samples. The field is indicated (on a per sample basis)".
-mtp:scantype-FieldSingleLowerFirst a mtp:ScanType ;
+mtp:scantype-FieldSingleLowerFirst a mtp:ScanType ;
nie:description "Fields are sent as independent samples. The field is indicated (on a per sample basis".
mtp:scantype-MixedInterlace a mtp:ScanType;
- nie:description "The content may contain a mix of interlaced modes".
+ nie:description "The content may contain a mix of interlaced modes".
mtp:scantype-MixedInterlaceAndProgressive a mtp:ScanType ;
nie:description "The content may contain a mix of interlaced and progressive modes.".
diff --git a/data/tracker-stop-words.txt b/data/tracker-stop-words.txt
index 6b6a737..b586d00 100644
--- a/data/tracker-stop-words.txt
+++ b/data/tracker-stop-words.txt
@@ -3,7 +3,7 @@ accordingly across actually after afterwards
again against ain't all allow
allows almost alone along already
also although always am among
-amongst an and
+amongst an and
anybody anyhow anyone anything anyway
anyways anywhere apart appear appreciate
appropriate are aren't around as
@@ -43,7 +43,7 @@ i'm i've ie if ignored
immediate in inasmuch inc indeed
indicate indicated indicates inner insofar
instead int into inward is isn't
-it it'd it'll it's its
+it it'd it'll it's its
itself just keep keeps kept
know knows known last lately
later latter latterly least less
@@ -106,4 +106,4 @@ why will willing wish with
within without won't wonder would
would wouldn't yes yet you
you'd you'll you're you've your
-yours yourself yourselves zero
+yours yourself yourselves zero
diff --git a/docs/design/tracker-miner-fs.dia b/docs/design/tracker-miner-fs.dia
index 66d1b51..75a4be7 100644
Binary files a/docs/design/tracker-miner-fs.dia and b/docs/design/tracker-miner-fs.dia differ
diff --git a/docs/manpages/tracker-control.1 b/docs/manpages/tracker-control.1
index 3f044b6..59fb7f7 100644
--- a/docs/manpages/tracker-control.1
+++ b/docs/manpages/tracker-control.1
@@ -19,7 +19,7 @@ Show summary of options.
.B \-k, \-\-kill
This uses SIGKILL to stop all Tracker processes found. This is not
advised unless you are having problems stopping Tracker in the first
-place. This
+place. This
.B GUARANTEES
death.
.TP
@@ -29,17 +29,17 @@ recommended over \-\-kill because it gives the processes time to
shutdown cleanly.
.TP
.B \-r, \-\-hard-reset
-This kills all processes in the same way that
+This kills all processes in the same way that
.B \-\-kill
-does but it also removes all databases. Restarting
+does but it also removes all databases. Restarting
.B tracker-store
re-creates the databases.
.TP
.B \-e, \-\-soft-reset
-A soft reset works exactly the same way that
-.B \-\-hard-reset
+A soft reset works exactly the same way that
+.B \-\-hard-reset
does, with the exception that the backup and journal are not removed.
-These are restored when
+These are restored when
.B tracker-store
is restarted.
.TP
diff --git a/docs/manpages/tracker-extract.1 b/docs/manpages/tracker-extract.1
index a908ff5..4aeebf2 100644
--- a/docs/manpages/tracker-extract.1
+++ b/docs/manpages/tracker-extract.1
@@ -12,7 +12,7 @@ reads the file and mimetype provided in stdin and extract the metadata from this
file; then it displays the metadata on the standard output.
.B NOTE:
-If a \fIFILE\fR is not provided then
+If a \fIFILE\fR is not provided then
.B tracker-extract
will run for 30 seconds waiting for DBus calls before quitting.
diff --git a/docs/manpages/tracker-search-bar.1 b/docs/manpages/tracker-search-bar.1
index 49dc71b..a962959 100644
--- a/docs/manpages/tracker-search-bar.1
+++ b/docs/manpages/tracker-search-bar.1
@@ -11,10 +11,10 @@ tracker-search-bar \- Search applet for the GNOME panel
is a graphical front end applet for the GNOME panel which allows basic
searching of common categories using Full Text Searching (FTS). This
means, that searching for \fIcar\fR will find files like
-\fIcarlos.png\fR, \fIcar-tax.pdf\fR, etc.
+\fIcarlos.png\fR, \fIcar-tax.pdf\fR, etc.
.B tracker-search-bar
-currently extends to images, videos, music, folders and documents. The
+currently extends to images, videos, music, folders and documents. The
applet is meant to quickly be able to access the top hits associated
with your search terms from the desktop at any time.
diff --git a/docs/manpages/tracker-search-tool.1 b/docs/manpages/tracker-search-tool.1
index 7b7f7f8..874806a 100644
--- a/docs/manpages/tracker-search-tool.1
+++ b/docs/manpages/tracker-search-tool.1
@@ -7,9 +7,9 @@ tracker-search-tool \- Gnome Tracker Search Tool
\fBtracker-search-tool\fR [\fIoptions\fR] [\fIEXPRESSION\fR]
.SH DESCRIPTION
-.B tracker-search-tool
+.B tracker-search-tool
is a graphical search front end for Gnome.
-It uses
+It uses
.B tracker-store
to get instant search results.
diff --git a/docs/manpages/tracker-search.1 b/docs/manpages/tracker-search.1
index 8dd6cba..a07d1f8 100644
--- a/docs/manpages/tracker-search.1
+++ b/docs/manpages/tracker-search.1
@@ -14,14 +14,14 @@ searches all indexed content for \fIEXPRESSION\fR.
One or more terms to search. The default operation is a logical AND.
For logical OR operations, see -r.
-The search terms can also be applied to the following options:
+The search terms can also be applied to the following options:
.B \-\-files,
.B \-\-folders,
.B \-\-music-albums,
.B \-\-music-artists,
.B \-\-music,
.B \-\-images,
-.B \-\-videos
+.B \-\-videos
and
.B \-\-documents.
diff --git a/docs/manpages/tracker-sparql.1 b/docs/manpages/tracker-sparql.1
index b61e5c5..cf491ca 100644
--- a/docs/manpages/tracker-sparql.1
+++ b/docs/manpages/tracker-sparql.1
@@ -10,10 +10,10 @@ tracker-sparql \- Use SparQL to query the Tracker databases.
.B tracker-sparql
allows the caller to run an RDF query on the database. This can be
done two ways. Either by providing a \fIFILE\fR with the query or by
-providing a string with the \fIQUERY\fR string.
+providing a string with the \fIQUERY\fR string.
The \fIFILE\fR argument can be either a local path or a URI. It also
-does not have to be an absolute path.
+does not have to be an absolute path.
.SH OPTIONS
.TP
@@ -31,7 +31,7 @@ This has to be used with \-\-query. This tells
.B tracker-sparql
to use the SPARQL update extensions so it knows it isn't a regular
data lookup request. So if your query is intended to change data in
-the database, this option is needed.
+the database, this option is needed.
.TP
.B \-c, \-\-list-classes
Returns a list of classes which describe the ontology used for storing
@@ -44,7 +44,7 @@ Returns a list of classes and their related prefixes. Prefixes are
used to make querying a lot simpler and are much like an alias. For
example,
.B http://www.w3.org/2000/01/rdf-schema#Resource
-has the prefix
+has the prefix
.B rdfs
so queries can be cut down to:
@@ -90,9 +90,9 @@ List all properties for the Resources class (see \-\-list-properties)
.BR
.NF
-$ tracker-sparql -q "SELECT ?prop WHERE {
- ?prop a rdf:Property ;
- rdfs:domain <http://www.w3.org/2000/01/rdf-schema#Resource>
+$ tracker-sparql -q "SELECT ?prop WHERE {
+ ?prop a rdf:Property ;
+ rdfs:domain <http://www.w3.org/2000/01/rdf-schema#Resource>
}"
.FI
@@ -101,9 +101,9 @@ List all class namespace prefixes
.BR
.NF
-$ tracker-sparql -q "SELECT ?prefix ?ns WHERE {
+$ tracker-sparql -q "SELECT ?prefix ?ns WHERE {
?ns a tracker:Namespace ;
- tracker:prefix ?prefix
+ tracker:prefix ?prefix
}"
.FI
@@ -118,9 +118,9 @@ List all music albums
.BR
.NF
-$ tracker-sparql -q "SELECT ?album ?title COUNT(?song)
- AS songs
- SUM(?length) AS totallength
+$ tracker-sparql -q "SELECT ?album ?title COUNT(?song)
+ AS songs
+ SUM(?length) AS totallength
WHERE {
?album a nmm:MusicAlbum ;
nie:title ?title .
@@ -165,9 +165,9 @@ List all image files with a specific tag
.BR
.NF
-$ tracker-sparql -q "SELECT ?image WHERE {
+$ tracker-sparql -q "SELECT ?image WHERE {
?image a nfo:Image ;
- nao:hasTag [ nao:prefLabel 'tag' ]
+ nao:hasTag [ nao:prefLabel 'tag' ]
}"
.FI
@@ -177,7 +177,7 @@ List all image files created on a specific month and order by date
.BR
.NF
$ tracker-sparql -q "SELECT ?image ?date WHERE {
- ?image a nfo:Image ;
+ ?image a nfo:Image ;
nie:contentCreated ?date .
FILTER (?date >= '2008-07-01T00:00:00' &&
?date < '2008-08-01T00:00:00')
diff --git a/docs/manpages/tracker-stats.1 b/docs/manpages/tracker-stats.1
index cf56a83..25b6526 100644
--- a/docs/manpages/tracker-stats.1
+++ b/docs/manpages/tracker-stats.1
@@ -9,12 +9,12 @@ tracker-stats \- Provides statistics on the data available for querying
.SH DESCRIPTION
.B tracker-stats
takes no arguments and returns statistics based on the ontology
-classes outlined in the
+classes outlined in the
.B Nepomuk
ontology specification. These classes can be used to further query
-more information using
+more information using
.B SparQL
-with
+with
.B tracker-sparql.
.SH OPTIONS
diff --git a/docs/manpages/tracker-status-icon.1 b/docs/manpages/tracker-status-icon.1
index ea6358b..f6fe69f 100644
--- a/docs/manpages/tracker-status-icon.1
+++ b/docs/manpages/tracker-status-icon.1
@@ -22,8 +22,8 @@ through the work load the data miner is.
Each miner can be paused/resumed by clicking on it in the menu.
From the context menu,
-.B tracker-status-icon
-allows the user to configure the preferences of
+.B tracker-status-icon
+allows the user to configure the preferences of
.B tracker-miner-fs
using the
.B tracker-preferences
diff --git a/docs/manpages/tracker-status.1 b/docs/manpages/tracker-status.1
index 4780c13..ee0c203 100644
--- a/docs/manpages/tracker-status.1
+++ b/docs/manpages/tracker-status.1
@@ -1,7 +1,7 @@
.TH tracker-status 1 "July 2009" GNU "User Commands"
.SH NAME
-tracker-status \- Report the
+tracker-status \- Report the
.B tracker-store
status
@@ -10,7 +10,7 @@ status
.SH DESCRIPTION
.B tracker-status
-shows the status of
+shows the status of
.B tracker-store
which can be one of the following:
.PP
diff --git a/docs/manpages/tracker-store.1 b/docs/manpages/tracker-store.1
index 31ce83b..adb9091 100644
--- a/docs/manpages/tracker-store.1
+++ b/docs/manpages/tracker-store.1
@@ -9,14 +9,14 @@ tracker-store \- database indexer and query daemon
.SH DESCRIPTION
.B tracker-store
provides both a powerful database daemon which allows clients to query
-or update their data using the highly descriptive
+or update their data using the highly descriptive
.B SPARQL
language.
.PP
.B tracker-store
does not do any file crawling or any mining of data itself, instead
other processes do that and serves as a daemon waiting for such
-requests from application miners like
+requests from application miners like
.B tracker-miner-fs.
.PP
For help on how to configure this daemon, see the man page for
@@ -36,7 +36,7 @@ Sets the logging level, 0=errors, 1=minimal, 2=detailed, 3=debug.
.B \-r, \-\-force-reindex
This forces tracker-store to remove databases and to recreate fresh
databases ready for data insertion from the miners. For more
-information about the miners, see
+information about the miners, see
.B tracker-miner-fs.
.TP
.B \-m, \-\-low-memory
@@ -48,9 +48,9 @@ connection cache sizes and page sizes for example. This may slow down
indexing performance.
.TP
.B \-n, \-\-readonly-mode
-This starts
+This starts
.B tracker-store
-in a mode which disables writing to the database. Only
+in a mode which disables writing to the database. Only
.B SPARQL
read requests can be serviced if this option is used.
diff --git a/docs/manpages/tracker-tag.1 b/docs/manpages/tracker-tag.1
index f94ac80..d4f1bc5 100644
--- a/docs/manpages/tracker-tag.1
+++ b/docs/manpages/tracker-tag.1
@@ -4,7 +4,7 @@
tracker-tag \- Add, remove and list tags.
.SH SYNOPSIS
-\fBtracker-tag\fR
+\fBtracker-tag\fR
[\fIOPTION...\fR] FILE [\fIFILE...\fR]
.SH DESCRIPTION
@@ -13,7 +13,7 @@ allows the caller add tags, remove tags and list tags by URN or to
list all tags and the files associated with them.
The \fIFILE\fR argument can be either a local path or a URI. It also
-does not have to be an absolute path.
+does not have to be an absolute path.
.SH OPTIONS
.TP
@@ -37,14 +37,14 @@ associated with each tag by using --show-files.
.TP
.B \-s, \-\-show-files
Show the files associated with each tag. This option is ONLY available
-WITH the
-.B --list
+WITH the
+.B --list
option.
.TP
.B \-a, \-\-add=TAG
-Add a tag with the name
+Add a tag with the name
.B TAG.
-If no
+If no
.B FILE
arguments are specified, the tag is simply created (if it didn't
already exist) and no files are associated with it. Multiple
@@ -52,11 +52,11 @@ already exist) and no files are associated with it. Multiple
arguments can be specified.
.TP
.B \-d, \-\-delete=TAG
-Delete a tag with the name
+Delete a tag with the name
.B TAG.
-If no
+If no
.B FILE
-arguments are specified, the tag is deleted for ALL files. If
+arguments are specified, the tag is deleted for ALL files. If
.B FILE
arguments are specified, only those files have the
.B TAG
diff --git a/docs/ontologies/README.ontologiesdoc b/docs/ontologies/README.ontologiesdoc
index e19fc8f..ed70c99 100644
--- a/docs/ontologies/README.ontologiesdoc
+++ b/docs/ontologies/README.ontologiesdoc
@@ -6,7 +6,7 @@ This directory contains verbose documentation explaining each ontology.
Expected documents/format
=========================
-1) There should be one directory per ontology prefix.
+1) There should be one directory per ontology prefix.
2) In that directory, there must be a file called 'explanation.html'
This file will be copied as-it-is into the ontology webpage
3) That file can link to any other files in the same directory
@@ -19,11 +19,11 @@ Explanation.html
================
It must be a file in HTML format with <h2> as "biggest" elements (i.e. sections).
-It will be copied as-it-is into the ontology HTML page, so it shouldn't include all
+It will be copied as-it-is into the ontology HTML page, so it shouldn't include all
HTML headers (i.e. it is NOT a valid HTML document).
- The classes/properties inside the ontology can be linked using
+ The classes/properties inside the ontology can be linked using
<a href="#ClassName">
@@ -35,14 +35,14 @@ HTML headers (i.e. it is NOT a valid HTML document).
Dia diagrams (x.dia) in the directory will be converted automatically
in png, and should be linked using the png extension:
- <a href="x.png">
+ <a href="x.png">
+
-
To include verbatim examples in SparQL or turtle format, use the
<pre> HTML tag, and all "<" and ">" inside it must be written as
"<" and "%gt;".
The file "explanation.html.template" can be used as starting point.
-
-
+
+
diff --git a/docs/ontologies/nie/explanation.html b/docs/ontologies/nie/explanation.html
index c9d982e..4586e73 100644
--- a/docs/ontologies/nie/explanation.html
+++ b/docs/ontologies/nie/explanation.html
@@ -1,11 +1,11 @@
<h2>Overview</h2>
<p>The core of the NEPOMUK Information Element Ontology and the entire
- Ontology Framework revolves around the concepts of <a href="#DataObject">DataObject</a> and
- <a href="#InformationElement">InformationElement</a>. They express the representation
+ Ontology Framework revolves around the concepts of <a href="#DataObject">DataObject</a> and
+ <a href="#InformationElement">InformationElement</a>. They express the representation
and content of a piece of data. Their specialized subclasses (defined
in the other ontologies) can be used to classify
- a wide array of desktop resources and express them in RDF.
+ a wide array of desktop resources and express them in RDF.
</p>
<p>
@@ -13,9 +13,9 @@
bytes somwhere (local or remote), the physical entity that contain
data. The <emph>meaning</emph> (intepretation) of that entity, the
information for the user contained in those bytes (e.g. a music file,
- a picture) is represented on the
+ a picture) is represented on the
<a href="#InformationElement">nie:InformationElement</a> side of the
-ontology.
+ontology.
</p>
<p>
@@ -26,7 +26,7 @@ between the physical element and its interpretation. There is also a
property to
link <a href="#InformationElement">nie:InformationElement</a>s,
representing the logical containment between them (like a picture and
-its album).
+its album).
</p>
<h3>Common properties</h3>
@@ -83,7 +83,7 @@ worth to comment few of them with special relevance:
<pre>
<urn:uuid:10293801928301293> a nmm:Photo, nfo:FileDataObject ;
- # Properties as nmm:Photo
+ # Properties as nmm:Photo
nfo:width 49 ;
nfo:height 36 ;
nmm:flash <nmm:flash-off>;
diff --git a/docs/ontologies/nmm/images-overview.dia b/docs/ontologies/nmm/images-overview.dia
index 049e1bc..87f8cc3 100644
Binary files a/docs/ontologies/nmm/images-overview.dia and b/docs/ontologies/nmm/images-overview.dia differ
diff --git a/docs/ontologies/nmm/radio-overview.dia b/docs/ontologies/nmm/radio-overview.dia
index 1b1a047..016c66c 100644
Binary files a/docs/ontologies/nmm/radio-overview.dia and b/docs/ontologies/nmm/radio-overview.dia differ
diff --git a/docs/ontologies/nmo/explanation.html b/docs/ontologies/nmo/explanation.html
index 5bac7b7..60730f1 100644
--- a/docs/ontologies/nmo/explanation.html
+++ b/docs/ontologies/nmo/explanation.html
@@ -24,12 +24,12 @@
<p>Here is an example of an SMS Message in Tracker/Nepomuk: </p>
<pre>
-
+
# There are some predefined folder for SMS, like
- # nmo:default-sms-folder-inbox
+ # nmo:default-sms-folder-inbox
#
# We also know the 'to' uri from a previous query
-
+
# File containing the 'to' vcard
<file:///home/user/.sms/vcards/123098.vcard> a nfo:FileDataObject
@@ -40,7 +40,7 @@
nie:characterSet "utf-8" ;
nmo:toVCard <file:///home/user/.sms/vcards/123098.vcard> ;
nmo:isDeleted false .
-
+
<nmo:default-sms-folder-inbox> nmo:containsSMS <test://1>
</pre>
diff --git a/docs/reference/README b/docs/reference/README
index 724b418..8e58837 100644
--- a/docs/reference/README
+++ b/docs/reference/README
@@ -19,8 +19,8 @@ module. There is one option specific to this package
The Makefiles in the gdk/ and gtk/ subdirs each define three targets:
templates:
-
- Scan the headers and merge the results with the current
+
+ Scan the headers and merge the results with the current
template files
sgml:
diff --git a/examples/libtracker-miner/tracker-main.c b/examples/libtracker-miner/tracker-main.c
index 1a93955..f682241 100644
--- a/examples/libtracker-miner/tracker-main.c
+++ b/examples/libtracker-miner/tracker-main.c
@@ -88,18 +88,18 @@ check_directory_cb (TrackerMinerFS *fs,
strcmp (path, "/sys") == 0) {
goto done;
}
-
+
if (g_str_has_prefix (path, g_get_tmp_dir ())) {
goto done;
}
-
+
/* Check ignored directories in config */
basename = g_file_get_basename (file);
if (!basename) {
goto done;
}
-
+
/* If directory begins with ".", check it isn't one of
* the top level directories to watch/crawl if it
* isn't we ignore it. If it is, we don't.
@@ -107,7 +107,7 @@ check_directory_cb (TrackerMinerFS *fs,
if (basename[0] == '.') {
goto done;
}
-
+
/* Check module directory ignore patterns */
should_process = TRUE;
@@ -196,7 +196,7 @@ main (int argc, char *argv[])
g_type_init ();
- if (!g_thread_supported ()) {
+ if (!g_thread_supported ()) {
g_thread_init (NULL);
}
@@ -243,7 +243,7 @@ main (int argc, char *argv[])
TRUE);
g_signal_connect (miner, "finished",
- G_CALLBACK (miner_finished_cb),
+ G_CALLBACK (miner_finished_cb),
main_loop);
g_timeout_add_seconds (1, miner_start_cb, miner);
diff --git a/python/FUSE/trackerfs.py b/python/FUSE/trackerfs.py
index 74e5851..3d2d634 100644
--- a/python/FUSE/trackerfs.py
+++ b/python/FUSE/trackerfs.py
@@ -18,19 +18,19 @@ class TrackerClient:
#Initialize dbus session and tracker interfaces
bus = dbus.SessionBus()
obj = bus.get_object('org.freedesktop.Tracker','/org/freedesktop/tracker')
-
+
self.tracker_iface = dbus.Interface(obj, 'org.freedesktop.Tracker')
self.keywords_iface = dbus.Interface(obj, 'org.freedesktop.Tracker.Keywords')
self.search_iface = dbus.Interface(obj, 'org.freedesktop.Tracker.Search')
self.files_iface = dbus.Interface(obj, 'org.freedesktop.Tracker.Files')
-
+
self.version = self.tracker_iface.GetVersion()
self.query_id = -1
def search(self,text,service='Files',offset=0,max_hits=-1):
self.resultlist = self.search_iface.Text(self.query_id, service, text, offset, max_hits)
self.resultlist = map(lambda x: str(x),self.resultlist)
-
+
def search_by_tag(self,tag,service='Files',offset=0,max_hits=-1):
self.resultlist = self.keywords_iface.Search(self.query_id, service,tag,offset,max_hits)
self.resultlist = map(lambda x: str(x),self.resultlist)
@@ -47,7 +47,7 @@ class TrackerClient:
#In future will be implemented live_query support
def on_tracker_reply(self, results):
print results
-
+
def on_tracker_error(self, e):
print "Error:"+e
@@ -57,10 +57,10 @@ class TrackerFs (Fuse,TrackerClient):
def __init__(self):
#Initialize tracker client
TrackerClient.__init__(self)
-
+
#Shell inteface
usage = "usage: %prog mountpoint [options]"
-
+
self.parser = OptionParser(usage)
self.parser.add_option("-a", "--auto",action="store_true",help="Mount point will be populated with the rdf query in ~/.Tracker/fs", dest="automatic", default=True)
self.parser.add_option("-s", "--search", dest="keys",help="Use a key to find the contents of mounted dir", metavar="key")
@@ -72,7 +72,7 @@ class TrackerFs (Fuse,TrackerClient):
if os.path.exists(args[0]) == False:
print "The mount point doesen't exist make it?"
#self.log.debug("Create target directory")
- os.mkdir(args[0])
+ os.mkdir(args[0])
#check old files
#save_dir = open(args[0], O_RDONLY);
@@ -86,14 +86,14 @@ class TrackerFs (Fuse,TrackerClient):
verbmode = logging.DEBUG
else:
verbmode = logging.WARNING
-
+
#Setup logger
self.log = logging.getLogger("trackerfs");self.log.setLevel(verbmode)
fh = logging.StreamHandler();fh.setLevel(verbmode)
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
fh.setFormatter(formatter)
self.log.addHandler(fh)
-
+
#This is the path when file will be "really" created/moved/edited
self.realdir = "/media/Dati/.data/"
self.rdfdir = os.environ["HOME"]+"/.Tracker/fs/"
@@ -158,7 +158,7 @@ class TrackerFs (Fuse,TrackerClient):
if S_ISREG(mode) and type == 0:
self.log.debug("MkFile:"+newpath)
res = os.open(newpath, os.O_CREAT | os.O_WRONLY,mode);
- elif type == 1:
+ elif type == 1:
self.log.debug("MkDir:"+newpath)
res = os.mkdir(newpath,mode)
else:
@@ -273,7 +273,7 @@ class TrackerFs (Fuse,TrackerClient):
self.log.debug("fsync: path=%s, isfsyncfile=%s" % (path, isfsyncfile))
return 0
-if __name__ == '__main__':
+if __name__ == '__main__':
fs = TrackerFs()
fs.multithreaded = 0;
fs.main()
diff --git a/python/SearchTool/README b/python/SearchTool/README
index c9eb381..9dff66a 100644
--- a/python/SearchTool/README
+++ b/python/SearchTool/README
@@ -6,7 +6,7 @@ The qtgui requires recent versions of:
* Tracker(>= 5.2)
* Python Qt3 (can possibly use 3.16)
* Python Kde3 (>= 3.10)
-* Python DBus
+* Python DBus
If you use Ubuntu these can be installed via apt-get with this command:
sudo apt-get install python-qt3 python-kde3 python-dbus
diff --git a/python/gtk-sparql/store.py b/python/gtk-sparql/store.py
index 538f4c6..958dd1d 100644
--- a/python/gtk-sparql/store.py
+++ b/python/gtk-sparql/store.py
@@ -35,8 +35,8 @@ class QueriesStore ():
conn = sqlite3.connect (self.db_path)
c = conn.cursor ()
c.execute ("CREATE TABLE saved_queries ( Name Text not null, Query Text );")
- c.execute ("INSERT INTO saved_queries VALUES ('', '%s')" % (EMPTY_QUERY))
- c.execute ("INSERT INTO saved_queries VALUES ('Example', '%s')" % (DEFAULT_EXAMPLE))
+ c.execute ("INSERT INTO saved_queries VALUES ('', '%s')" % (EMPTY_QUERY))
+ c.execute ("INSERT INTO saved_queries VALUES ('Example', '%s')" % (DEFAULT_EXAMPLE))
conn.commit ()
c.close ()
@@ -57,7 +57,7 @@ class QueriesStore ():
c.execute ("DELETE FROM saved_queries WHERE Name='%s';" % (name))
conn.commit ()
c.close ()
-
+
def get_all_queries (self):
conn = sqlite3.connect (self.db_path)
diff --git a/python/music/lyrics.py b/python/music/lyrics.py
index f71f1cf..7718128 100644
--- a/python/music/lyrics.py
+++ b/python/music/lyrics.py
@@ -1,4 +1,4 @@
-import os
+import os
import urllib
import sys
import re
@@ -44,7 +44,7 @@ def get_lyrics(artist, title):
self.callback("Unable to find lyrics for this track.")
xmldoc.unlink()
return
-
+
xmldoc.unlink()
url = "http://api.leoslyrics.com/api_lyrics.php?auth=Rhythmbox&hid=%s"; % (urllib.quote(hids[0].encode('utf-8')))
diff --git a/python/rss_reader/signaler.py b/python/rss_reader/signaler.py
index b73153e..e91b415 100755
--- a/python/rss_reader/signaler.py
+++ b/python/rss_reader/signaler.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python2.5
#
-# Demo RSS provider simulator
+# Demo RSS provider simulator
# Copyright (C) 2009 Nokia <urho konttori nokia com>
#
# This library is free software; you can redistribute it and/or
@@ -61,7 +61,7 @@ class SignalerUI (gtk.Window):
"org.freedesktop.Tracker1.Resources")
vbox = gtk.VBox ()
-
+
# Post frame
post_frame = gtk.Frame ("Post")
post_frame_vbox = gtk.VBox ()
@@ -81,7 +81,7 @@ class SignalerUI (gtk.Window):
hbox_uri.add (self.uri_entry)
self.uri_entry.set_property ("sensitive", False)
post_frame_vbox.add (hbox_uri)
-
+
date_label = gtk.Label ("Date")
self.date_entry = gtk.Entry ()
self.date_entry.set_property ("editable", False)
@@ -92,11 +92,11 @@ class SignalerUI (gtk.Window):
self.post_text = gtk.TextView ()
post_frame_vbox.add (self.post_text)
-
+
button_gen = gtk.Button (stock=gtk.STOCK_NEW)
button_gen.connect ("clicked", self.gen_new_post_cb)
post_frame_vbox.add (button_gen)
-
+
vbox.add (post_frame)
@@ -134,7 +134,7 @@ class SignalerUI (gtk.Window):
if (uri == self.last_inserted):
print "Generate a new URI!"
return
-
+
sparql_insert = INSERT_SPARQL % (uri, date, text, title)
print sparql_insert
@@ -147,7 +147,7 @@ class SignalerUI (gtk.Window):
pass
sparql_delete = DELETE_SPARQL % (uri)
print sparql_delete
-
+
self.iface.SparqlUpdate (sparql_delete)
def gen_new_post_cb (self, widget):
@@ -168,4 +168,4 @@ if __name__ == "__main__":
gobject.set_application_name ("Feeds engine/signals simulator")
SignalerUI ()
-
+
diff --git a/src/libtracker-client/tracker.c b/src/libtracker-client/tracker.c
index 7c78354..826a323 100644
--- a/src/libtracker-client/tracker.c
+++ b/src/libtracker-client/tracker.c
@@ -120,9 +120,9 @@ typedef struct {
static guint pending_call_id = 0;
static void
-tracker_GPtrArray_reply (DBusGProxy *proxy,
- GPtrArray *OUT_result,
- GError *error,
+tracker_GPtrArray_reply (DBusGProxy *proxy,
+ GPtrArray *OUT_result,
+ GError *error,
gpointer user_data)
{
@@ -133,16 +133,16 @@ tracker_GPtrArray_reply (DBusGProxy *proxy,
g_hash_table_remove (s->client->pending_calls,
GUINT_TO_POINTER (s->id));
- (*(TrackerReplyGPtrArray) s->callback) (OUT_result,
- error,
+ (*(TrackerReplyGPtrArray) s->callback) (OUT_result,
+ error,
s->data);
g_free (s);
}
static void
-tracker_void_reply (DBusGProxy *proxy,
- GError *error,
+tracker_void_reply (DBusGProxy *proxy,
+ GError *error,
gpointer user_data)
{
@@ -153,7 +153,7 @@ tracker_void_reply (DBusGProxy *proxy,
g_hash_table_remove (s->client->pending_calls,
GUINT_TO_POINTER (s->id));
- (*(TrackerReplyVoid) s->callback) (error,
+ (*(TrackerReplyVoid) s->callback) (error,
s->data);
g_free (s);
@@ -296,10 +296,10 @@ pending_call_free (PendingCallData *data)
* with dbus_g_proxy_set_default_timeout().
*
* Returns: the #TrackerClient which should be used with
- * tracker_disconnect() when finished with.
+ * tracker_disconnect() when finished with.
**/
TrackerClient *
-tracker_connect (gboolean enable_warnings,
+tracker_connect (gboolean enable_warnings,
gint timeout)
{
DBusGConnection *connection;
@@ -312,7 +312,7 @@ tracker_connect (gboolean enable_warnings,
if (connection == NULL || error != NULL) {
if (enable_warnings) {
- g_warning ("Unable to connect to dbus: %s\n",
+ g_warning ("Unable to connect to dbus: %s\n",
error->message);
}
g_error_free (error);
@@ -330,13 +330,13 @@ tracker_connect (gboolean enable_warnings,
client->pending_calls = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) pending_call_free);
- client->proxy_statistics =
+ client->proxy_statistics =
dbus_g_proxy_new_for_name (connection,
TRACKER_SERVICE,
TRACKER_OBJECT "/Statistics",
TRACKER_INTERFACE_STATISTICS);
- client->proxy_resources =
+ client->proxy_resources =
dbus_g_proxy_new_for_name (connection,
TRACKER_SERVICE,
TRACKER_OBJECT "/Resources",
@@ -377,7 +377,7 @@ tracker_disconnect (TrackerClient *client)
/**
* tracker_cancel_call:
* @client: a #TrackerClient.
- * @call_id: a #guint id for the API call you want to cancel.
+ * @call_id: a #guint id for the API call you want to cancel.
*
* The @call_id is a #guint which increments with each asynchronous
* API call made using libtracker-client. For synchronous API calls,
@@ -420,13 +420,13 @@ tracker_cancel_last_call (TrackerClient *client)
{
if (client->last_call != 0) {
gboolean cancelled;
-
+
cancelled = tracker_cancel_call (client, client->last_call);
client->last_call = 0;
return cancelled;
}
-
+
return TRUE;
}
@@ -449,13 +449,13 @@ tracker_cancel_last_call (TrackerClient *client)
* g_ptr_array_free().
**/
GPtrArray *
-tracker_statistics_get (TrackerClient *client,
+tracker_statistics_get (TrackerClient *client,
GError **error)
{
GPtrArray *table;
- if (!org_freedesktop_Tracker1_Statistics_get (client->proxy_statistics,
- &table,
+ if (!org_freedesktop_Tracker1_Statistics_get (client->proxy_statistics,
+ &table,
&*error)) {
return NULL;
}
@@ -464,12 +464,12 @@ tracker_statistics_get (TrackerClient *client,
}
void
-tracker_resources_load (TrackerClient *client,
- const gchar *uri,
+tracker_resources_load (TrackerClient *client,
+ const gchar *uri,
GError **error)
{
- org_freedesktop_Tracker1_Resources_load (client->proxy_resources,
- uri,
+ org_freedesktop_Tracker1_Resources_load (client->proxy_resources,
+ uri,
&*error);
}
@@ -493,7 +493,7 @@ tracker_resources_load (TrackerClient *client,
*
* /* Create D-Bus connection with no warnings and no timeout. */
* client = tracker_connect (FALSE, 0);
- * query = "SELECT"
+ * query = "SELECT"
* " ?album"
* " ?title"
* " COUNT(?song) AS songs"
@@ -514,28 +514,28 @@ tracker_resources_load (TrackerClient *client,
* tracker_disconnect (client);
* return;
* }
- *
+ *
* /* Do something with the array */
- *
+ *
* g_ptr_array_free (array, TRUE);
* </programlisting>
- * </example>
- *
+ * </example>
+ *
* This API call is completely synchronous so it may block.
*
* Returns: A #GPtrArray with the query results which must be freed
* using g_ptr_array_free().
**/
GPtrArray *
-tracker_resources_sparql_query (TrackerClient *client,
- const gchar *query,
+tracker_resources_sparql_query (TrackerClient *client,
+ const gchar *query,
GError **error)
{
GPtrArray *table;
- if (!org_freedesktop_Tracker1_Resources_sparql_query (client->proxy_resources,
- query,
- &table,
+ if (!org_freedesktop_Tracker1_Resources_sparql_query (client->proxy_resources,
+ query,
+ &table,
&*error)) {
return NULL;
}
@@ -550,7 +550,7 @@ tracker_resources_sparql_query (TrackerClient *client,
* @error: a #GError.
*
* Updates the database using SPARQL.
- *
+ *
* This API behaves the same way tracker_resources_sparql_query() does
* but with the difference that it is intended to be used for data
* updates.
@@ -558,12 +558,12 @@ tracker_resources_sparql_query (TrackerClient *client,
* This API call is completely synchronous so it may block.
**/
void
-tracker_resources_sparql_update (TrackerClient *client,
- const gchar *query,
+tracker_resources_sparql_update (TrackerClient *client,
+ const gchar *query,
GError **error)
{
- org_freedesktop_Tracker1_Resources_sparql_update (client->proxy_resources,
- query,
+ org_freedesktop_Tracker1_Resources_sparql_update (client->proxy_resources,
+ query,
&*error);
}
@@ -596,12 +596,12 @@ tracker_resources_sparql_update_blank (TrackerClient *client,
* block.
**/
void
-tracker_resources_batch_sparql_update (TrackerClient *client,
- const gchar *query,
+tracker_resources_batch_sparql_update (TrackerClient *client,
+ const gchar *query,
GError **error)
{
- org_freedesktop_Tracker1_Resources_batch_sparql_update (client->proxy_resources,
- query,
+ org_freedesktop_Tracker1_Resources_batch_sparql_update (client->proxy_resources,
+ query,
&*error);
}
@@ -614,7 +614,7 @@ tracker_resources_batch_sparql_update (TrackerClient *client,
* synchronous so it may block.
**/
void
-tracker_resources_batch_commit (TrackerClient *client,
+tracker_resources_batch_commit (TrackerClient *client,
GError **error)
{
org_freedesktop_Tracker1_Resources_batch_commit (client->proxy_resources,
@@ -634,8 +634,8 @@ tracker_resources_batch_commit (TrackerClient *client,
* cancelled with tracker_cancel_call().
**/
guint
-tracker_statistics_get_async (TrackerClient *client,
- TrackerReplyGPtrArray callback,
+tracker_statistics_get_async (TrackerClient *client,
+ TrackerReplyGPtrArray callback,
gpointer user_data)
{
CallbackGPtrArray *s;
@@ -658,9 +658,9 @@ tracker_statistics_get_async (TrackerClient *client,
}
guint
-tracker_resources_load_async (TrackerClient *client,
- const gchar *uri,
- TrackerReplyVoid callback,
+tracker_resources_load_async (TrackerClient *client,
+ const gchar *uri,
+ TrackerReplyVoid callback,
gpointer user_data)
{
CallbackVoid *s;
@@ -696,9 +696,9 @@ tracker_resources_load_async (TrackerClient *client,
* Returns: The operation ID. See tracker_cancel_call().
**/
guint
-tracker_resources_sparql_query_async (TrackerClient *client,
- const gchar *query,
- TrackerReplyGPtrArray callback,
+tracker_resources_sparql_query_async (TrackerClient *client,
+ const gchar *query,
+ TrackerReplyGPtrArray callback,
gpointer user_data)
{
CallbackGPtrArray *s;
@@ -733,9 +733,9 @@ tracker_resources_sparql_query_async (TrackerClient *client,
* Returns: The operation ID. See tracker_cancel_call().
**/
guint
-tracker_resources_sparql_update_async (TrackerClient *client,
- const gchar *query,
- TrackerReplyVoid callback,
+tracker_resources_sparql_update_async (TrackerClient *client,
+ const gchar *query,
+ TrackerReplyVoid callback,
gpointer user_data)
{
CallbackVoid *s;
@@ -796,9 +796,9 @@ tracker_resources_sparql_update_blank_async (TrackerClient *client,
* Returns: The operation ID. See tracker_cancel_call().
**/
guint
-tracker_resources_batch_sparql_update_async (TrackerClient *client,
- const gchar *query,
- TrackerReplyVoid callback,
+tracker_resources_batch_sparql_update_async (TrackerClient *client,
+ const gchar *query,
+ TrackerReplyVoid callback,
gpointer user_data)
{
CallbackVoid *s;
@@ -827,13 +827,13 @@ tracker_resources_batch_sparql_update_async (TrackerClient *client,
* @callback: callback to be called when the operation is finished.
* @user_data: user data to pass to @callback.
*
- * Commits a batch of already issued SPARQL updates.
+ * Commits a batch of already issued SPARQL updates.
*
* Returns: The operation ID.
**/
guint
-tracker_resources_batch_commit_async (TrackerClient *client,
- TrackerReplyVoid callback,
+tracker_resources_batch_commit_async (TrackerClient *client,
+ TrackerReplyVoid callback,
gpointer user_data)
{
CallbackVoid *s;
diff --git a/src/libtracker-client/tracker.h b/src/libtracker-client/tracker.h
index cd8c039..0468fb6 100644
--- a/src/libtracker-client/tracker.h
+++ b/src/libtracker-client/tracker.h
@@ -67,8 +67,8 @@ typedef void (*TrackerReplyArray) (gchar **result,
* results from the query unless there is an error in the query. If
* there is an error the @error is populated with the details.
*/
-typedef void (*TrackerReplyGPtrArray) (GPtrArray *result,
- GError *error,
+typedef void (*TrackerReplyGPtrArray) (GPtrArray *result,
+ GError *error,
gpointer user_data);
/**
@@ -78,7 +78,7 @@ typedef void (*TrackerReplyGPtrArray) (GPtrArray *result,
*
* If there is an error the @error is populated with the details.
*/
-typedef void (*TrackerReplyVoid) (GError *error,
+typedef void (*TrackerReplyVoid) (GError *error,
gpointer user_data);
gboolean tracker_cancel_call (TrackerClient *client,
diff --git a/src/libtracker-common/tracker-config-file.c b/src/libtracker-common/tracker-config-file.c
index 2570e2f..5354bda 100644
--- a/src/libtracker-common/tracker-config-file.c
+++ b/src/libtracker-common/tracker-config-file.c
@@ -116,7 +116,7 @@ tracker_config_file_init (TrackerConfigFile *file)
file->key_file = g_key_file_new ();
}
-static void
+static void
config_get_property (GObject *object,
guint param_id,
GValue *value,
@@ -310,8 +310,8 @@ config_load (TrackerConfigFile *file)
}
/* Load options */
- g_key_file_load_from_file (file->key_file,
- filename,
+ g_key_file_load_from_file (file->key_file,
+ filename,
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error);
@@ -372,7 +372,7 @@ config_save (TrackerConfigFile *file)
}
g_message ("Wrote config to '%s' (%" G_GSIZE_FORMAT " bytes)",
- filename,
+ filename,
size);
g_free (filename);
diff --git a/src/libtracker-common/tracker-file-utils.c b/src/libtracker-common/tracker-file-utils.c
index f58537a..3000eee 100644
--- a/src/libtracker-common/tracker-file-utils.c
+++ b/src/libtracker-common/tracker-file-utils.c
@@ -71,7 +71,7 @@ tracker_file_open (const gchar *uri,
int fd;
fd = fileno (file);
-
+
#if defined(__linux__)
/* Make sure we set the NOATIME flag if we have permissions to */
if ((flags = fcntl (fd, F_GETFL, 0)) != -1) {
@@ -79,13 +79,13 @@ tracker_file_open (const gchar *uri,
}
#endif
}
-
+
return file;
}
void
tracker_file_close (FILE *file,
- gboolean need_again_soon)
+ gboolean need_again_soon)
{
g_return_if_fail (file != NULL);
@@ -345,7 +345,7 @@ tracker_path_hash_table_filter_duplicates (GHashTable *roots)
}
}
- /* Make sure the path doesn't have the '/' suffix. */
+ /* Make sure the path doesn't have the '/' suffix. */
p = strrchr (path, G_DIR_SEPARATOR);
if (p) {
@@ -395,12 +395,12 @@ tracker_path_list_filter_duplicates (GSList *roots,
const gchar *in_path;
in_path = l2->data;
-
+
if (path == in_path) {
/* Do nothing */
l2 = l2->next;
continue;
- }
+ }
if (basename_exception_prefix) {
gchar *lbasename;
@@ -409,11 +409,11 @@ tracker_path_list_filter_duplicates (GSList *roots,
lbasename = g_path_get_basename (path);
if (!g_str_has_prefix (lbasename, basename_exception_prefix)) {
g_free (lbasename);
-
+
lbasename = g_path_get_basename (in_path);
if (g_str_has_prefix (lbasename, basename_exception_prefix)) {
has_prefix = TRUE;
- }
+ }
} else {
has_prefix = TRUE;
}
@@ -440,11 +440,11 @@ tracker_path_list_filter_duplicates (GSList *roots,
reset = TRUE;
continue;
- }
+ }
else if (tracker_path_is_in_path (in_path, path)) {
g_debug ("Removing path:'%s', it is in path:'%s'",
in_path, path);
-
+
g_free (l2->data);
new_list = g_slist_delete_link (new_list, l2);
l1 = new_list;
@@ -456,8 +456,8 @@ tracker_path_list_filter_duplicates (GSList *roots,
l2 = l2->next;
}
-
- /* Make sure the path doesn't have the '/' suffix. */
+
+ /* Make sure the path doesn't have the '/' suffix. */
p = strrchr (path, G_DIR_SEPARATOR);
if (p) {
@@ -466,7 +466,7 @@ tracker_path_list_filter_duplicates (GSList *roots,
}
}
- /* Continue in list unless reset. */
+ /* Continue in list unless reset. */
if (G_LIKELY (!reset)) {
l1 = l1->next;
}
diff --git a/src/libtracker-common/tracker-keyfile-object.c b/src/libtracker-common/tracker-keyfile-object.c
index 04f78b9..194a1d7 100644
--- a/src/libtracker-common/tracker-keyfile-object.c
+++ b/src/libtracker-common/tracker-keyfile-object.c
@@ -79,7 +79,7 @@ tracker_keyfile_object_default_boolean (gpointer object,
{
GObjectClass *klass;
GParamSpec *spec;
- GParamSpecBoolean *bspec;
+ GParamSpecBoolean *bspec;
g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
g_return_val_if_fail (property != NULL, FALSE);
@@ -90,7 +90,7 @@ tracker_keyfile_object_default_boolean (gpointer object,
bspec = G_PARAM_SPEC_BOOLEAN (spec);
g_return_val_if_fail (bspec != NULL, FALSE);
-
+
return bspec->default_value;
}
@@ -100,7 +100,7 @@ tracker_keyfile_object_default_int (gpointer object,
{
GObjectClass *klass;
GParamSpec *spec;
- GParamSpecInt *ispec;
+ GParamSpecInt *ispec;
g_return_val_if_fail (G_IS_OBJECT (object), 0);
g_return_val_if_fail (property != NULL, 0);
@@ -245,22 +245,22 @@ tracker_keyfile_object_load_string_list (gpointer object,
if (l) {
GSList *filtered;
-
+
/* Should we make the basename (2nd argument) here
- * part of this function's API?
+ * part of this function's API?
*/
filtered = tracker_path_list_filter_duplicates (l, ".");
-
+
g_slist_foreach (l, (GFunc) g_free, NULL);
g_slist_free (l);
-
+
l = filtered;
}
} else {
l = tracker_string_list_to_gslist (value, -1);
}
g_strfreev (value);
-
+
g_object_set (G_OBJECT (object), property, l, NULL);
/* List is copied internally */
@@ -345,10 +345,10 @@ tracker_keyfile_object_save_string_list (gpointer object,
g_object_get (G_OBJECT (object), property, &list, NULL);
value = tracker_gslist_to_string_list (list);
- g_key_file_set_string_list (key_file,
- group,
- key,
- (const gchar * const *) value,
+ g_key_file_set_string_list (key_file,
+ group,
+ key,
+ (const gchar * const *) value,
(gsize) g_slist_length (list));
g_strfreev (value);
}
diff --git a/src/libtracker-common/tracker-log.c b/src/libtracker-common/tracker-log.c
index 6030cc0..07e87a3 100644
--- a/src/libtracker-common/tracker-log.c
+++ b/src/libtracker-common/tracker-log.c
@@ -146,11 +146,11 @@ tracker_log_init (gint this_verbosity,
if (initialized) {
return TRUE;
}
-
+
basename = g_strdup_printf ("%s.log", g_get_application_name ());
- filename = g_build_filename (g_get_user_data_dir (),
- "tracker",
- basename,
+ filename = g_build_filename (g_get_user_data_dir (),
+ "tracker",
+ basename,
NULL);
g_free (basename);
diff --git a/src/libtracker-common/tracker-statement-list.c b/src/libtracker-common/tracker-statement-list.c
index 27c0c6c..762193a 100644
--- a/src/libtracker-common/tracker-statement-list.c
+++ b/src/libtracker-common/tracker-statement-list.c
@@ -33,7 +33,7 @@
*/
void
-tracker_statement_list_insert (TrackerSparqlBuilder *statements,
+tracker_statement_list_insert (TrackerSparqlBuilder *statements,
const gchar *subject,
const gchar *predicate,
const gchar *value)
diff --git a/src/libtracker-common/tracker-storage-hal.c b/src/libtracker-common/tracker-storage-hal.c
index 20c4c50..d2765e7 100644
--- a/src/libtracker-common/tracker-storage-hal.c
+++ b/src/libtracker-common/tracker-storage-hal.c
@@ -121,7 +121,7 @@ tracker_storage_class_init (TrackerStorageClass *klass)
NULL, NULL,
tracker_marshal_VOID__STRING_STRING,
G_TYPE_NONE,
- 2,
+ 2,
G_TYPE_STRING,
G_TYPE_STRING);
@@ -133,7 +133,7 @@ tracker_storage_class_init (TrackerStorageClass *klass)
NULL, NULL,
tracker_marshal_VOID__STRING_STRING,
G_TYPE_NONE,
- 2,
+ 2,
G_TYPE_STRING,
G_TYPE_STRING);
@@ -450,7 +450,7 @@ hal_mount_point_add (TrackerStorage *storage,
(const gchar*) g_hash_table_lookup (priv->all_devices, udi),
mount_point,
removable_device ? "yes" : "no");
-
+
node = mount_point_hierarchy_add (priv->mounts, mount_point, udi, removable_device);
g_hash_table_insert (priv->mounts_by_udi, g_strdup (udi), node);
@@ -480,7 +480,7 @@ hal_mount_point_remove (TrackerStorage *storage,
info->mount_point,
udi,
info->removable ? "yes" : "no");
-
+
g_signal_emit (storage, signals[MOUNT_POINT_REMOVED], 0, udi, info->mount_point, NULL);
g_hash_table_remove (priv->mounts_by_udi, udi);
@@ -663,8 +663,8 @@ hal_device_add (TrackerStorage *storage,
if (dbus_error_is_set (&error)) {
g_critical ("Could not add device:'%s' property watch for udi:'%s', %s",
- device_file,
- udi,
+ device_file,
+ udi,
error.message);
dbus_error_free (&error);
return FALSE;
@@ -775,7 +775,7 @@ hal_device_property_modified_cb (LibHalContext *context,
g_message ("HAL device:'%s' property change for udi:'%s' and key:'%s'",
device_file,
- udi,
+ udi,
key);
if (strcmp (key, PROP_IS_MOUNTED) != 0) {
@@ -793,7 +793,7 @@ hal_device_property_modified_cb (LibHalContext *context,
dbus_error_free (&error);
g_message ("HAL device:'%s' with udi:'%s' is now unmounted (due to error)",
- device_file,
+ device_file,
udi);
hal_mount_point_remove (storage, udi);
return;
@@ -857,15 +857,15 @@ hal_get_mount_point_by_udi_foreach (gpointer key,
if (!gr->only_removable || info->removable) {
gchar *normalized_mount_point;
gint len;
-
+
normalized_mount_point = g_strdup (info->mount_point);
len = strlen (normalized_mount_point);
-
+
/* Don't include trailing slashes */
if (len > 2 && normalized_mount_point[len - 1] == G_DIR_SEPARATOR) {
normalized_mount_point[len - 1] = '\0';
}
-
+
gr->roots = g_slist_prepend (gr->roots, normalized_mount_point);
}
}
@@ -875,7 +875,7 @@ hal_get_mount_point_by_udi_foreach (gpointer key,
* @storage: A #TrackerStorage
*
* Returns a #GSList of strings containing the root directories for
- * mounted devices.
+ * mounted devices.
*
* Each element must be freed using g_free() and the list itself using
* g_slist_free().
@@ -908,7 +908,7 @@ tracker_storage_get_mounted_directory_roots (TrackerStorage *storage)
* @storage: A #TrackerStorage
*
* Returns a #GSList of strings containing the root directories for
- * removable devices.
+ * removable devices.
*
* Each element must be freed using g_free() and the list itself
* through g_slist_free().
@@ -942,7 +942,7 @@ tracker_storage_get_removable_device_roots (TrackerStorage *storage)
* @uri: a uri
* @mount_mount: if @uri is on a removable device, the mount point will
* be filled in here. You must free the returned result
- * @available: if @uri is on a removable device, this will be set to
+ * @available: if @uri is on a removable device, this will be set to
* TRUE in case the file is available right now
*
* Returns Whether or not @uri is on a known removable device
@@ -1023,7 +1023,7 @@ tracker_storage_get_removable_device_udis (TrackerStorage *storage)
priv = GET_PRIV (storage);
udis = NULL;
-
+
g_hash_table_iter_init (&iter, priv->mounts_by_udi);
while (g_hash_table_iter_next (&iter, &key, &value)) {
@@ -1062,7 +1062,7 @@ tracker_storage_udi_get_mount_point (TrackerStorage *storage,
g_return_val_if_fail (udi != NULL, NULL);
priv = GET_PRIV (storage);
-
+
node = g_hash_table_lookup (priv->mounts_by_udi, udi);
if (!node) {
@@ -1080,7 +1080,7 @@ tracker_storage_udi_get_mount_point (TrackerStorage *storage,
*
* Returns: The %TRUE if @udi is mounted or %FALSE if it isn't.
**/
-gboolean
+gboolean
tracker_storage_udi_get_is_mounted (TrackerStorage *storage,
const gchar *udi)
{
diff --git a/src/libtracker-common/tracker-type-utils.c b/src/libtracker-common/tracker-type-utils.c
index 8681327..64f5a56 100644
--- a/src/libtracker-common/tracker-type-utils.c
+++ b/src/libtracker-common/tracker-type-utils.c
@@ -304,7 +304,7 @@ tracker_date_format (const gchar *date_string)
buf[19] = '\0';
return g_strdup (buf);
- } else if ((len == 28) && (date_string[4] == '-') && (date_string[10] == 'T')
+ } else if ((len == 28) && (date_string[4] == '-') && (date_string[10] == 'T')
&& (date_string[19] == '.') ) {
/* The fraction of seconds ISO 8601 "YYYY-MM-DDThh:mm:ss.ff+zz:zz" */
buf[0] = date_string[0];
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c
index d69c91f..38806d6 100644
--- a/src/libtracker-common/tracker-utils.c
+++ b/src/libtracker-common/tracker-utils.c
@@ -395,7 +395,7 @@ find_conversion (const char *format,
}
gchar *
-tracker_uri_vprintf_escaped (const gchar *format,
+tracker_uri_vprintf_escaped (const gchar *format,
va_list args)
{
GString *format1;
diff --git a/src/libtracker-data/tracker-data-backup.c b/src/libtracker-data/tracker-data-backup.c
index deb1ff6..b151408 100644
--- a/src/libtracker-data/tracker-data-backup.c
+++ b/src/libtracker-data/tracker-data-backup.c
@@ -93,8 +93,8 @@ on_journal_copied (GObject *source_object,
}
free_backup_save_info (info);
} else {
- g_file_copy_async (info->file, info->destination,
- G_FILE_COPY_OVERWRITE,
+ g_file_copy_async (info->file, info->destination,
+ G_FILE_COPY_OVERWRITE,
G_PRIORITY_HIGH,
NULL, NULL, NULL,
on_meta_copied,
@@ -112,15 +112,15 @@ save_copy_procedure (BackupSaveInfo *info)
journal_o = g_file_new_for_path (tracker_db_journal_filename ());
if (g_file_query_exists (journal_o, NULL)) {
- g_file_copy_async (journal_o, info->journal,
- G_FILE_COPY_OVERWRITE,
+ g_file_copy_async (journal_o, info->journal,
+ G_FILE_COPY_OVERWRITE,
G_PRIORITY_HIGH,
NULL, NULL, NULL,
on_journal_copied,
info);
} else {
- g_file_copy_async (info->file, info->destination,
- G_FILE_COPY_OVERWRITE,
+ g_file_copy_async (info->file, info->destination,
+ G_FILE_COPY_OVERWRITE,
G_PRIORITY_HIGH,
NULL, NULL, NULL,
on_meta_copied,
@@ -169,7 +169,7 @@ tracker_data_backup_save (GFile *destination,
save_copy_procedure (info);
} else {
/* If we don't have a meta-backup.db yet, we first make one */
- tracker_db_backup_save (on_backup_finished,
+ tracker_db_backup_save (on_backup_finished,
info, NULL);
}
}
@@ -199,8 +199,8 @@ restore_copy_procedure (BackupSaveInfo *info)
journal_d = g_file_new_for_path (tracker_db_journal_filename ());
if (g_file_query_exists (journal_d, NULL)) {
- g_file_copy (info->journal, journal_d,
- G_FILE_COPY_OVERWRITE,
+ g_file_copy (info->journal, journal_d,
+ G_FILE_COPY_OVERWRITE,
NULL, NULL, NULL,
&error);
}
@@ -212,7 +212,7 @@ restore_copy_procedure (BackupSaveInfo *info)
}
g_file_copy (info->destination, info->file,
- G_FILE_COPY_OVERWRITE,
+ G_FILE_COPY_OVERWRITE,
NULL, NULL, NULL,
&error);
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 525d921..5a1bfd3 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -863,7 +863,7 @@ tracker_data_manager_init (TrackerDBManagerFlags flags,
while (conf_file) {
if (g_str_has_suffix (conf_file, ".ontology")) {
sorted = g_list_insert_sorted (sorted,
- g_strdup (conf_file),
+ g_strdup (conf_file),
(GCompareFunc) strcmp);
}
conf_file = g_dir_read_name (ontologies);
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index 8278857..cc4d3d0 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -60,7 +60,7 @@ tracker_data_query_rdf_type (guint32 id)
if (cursor) {
/* Query is usually a rather small result, but let's try to
- * avoid reallocs in gptrarray.c as much as possible (this
+ * avoid reallocs in gptrarray.c as much as possible (this
* function is called fairly often) */
ret = g_ptr_array_sized_new (20);
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 7add9ff..7004b92 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -119,7 +119,7 @@ static GPtrArray *delete_callbacks = NULL;
static GPtrArray *commit_callbacks = NULL;
static GPtrArray *rollback_callbacks = NULL;
-void
+void
tracker_data_add_commit_statement_callback (TrackerCommitCallback callback,
gpointer user_data)
{
@@ -167,7 +167,7 @@ tracker_data_add_insert_statement_callback (TrackerStatementCallback callback,
g_ptr_array_add (insert_callbacks, delegate);
}
-void
+void
tracker_data_add_delete_statement_callback (TrackerStatementCallback callback,
gpointer user_data)
{
@@ -230,7 +230,7 @@ tracker_data_update_get_next_modseq (void)
temp_iface = tracker_db_manager_get_db_interface ();
- stmt = tracker_db_interface_create_statement (temp_iface,
+ stmt = tracker_db_interface_create_statement (temp_iface,
"SELECT MAX(\"tracker:modified\") AS A FROM \"rdfs:Resource\"");
cursor = tracker_db_statement_start_cursor (stmt, NULL);
g_object_unref (stmt);
@@ -742,8 +742,8 @@ cache_create_service_decomposed (TrackerClass *cl,
delegate = g_ptr_array_index (insert_callbacks, n);
delegate->callback (graph, resource_buffer->subject,
- RDF_PREFIX "type", class_uri,
- resource_buffer->types,
+ RDF_PREFIX "type", class_uri,
+ resource_buffer->types,
delegate->user_data);
}
}
@@ -862,8 +862,8 @@ get_property_values (TrackerProperty *property)
/* We use a result_set instead of a cursor here because it's
* possible that otherwise the cursor would remain open during
- * the call from delete_resource_description. In future we want
- * to allow having the same query open on multiple cursors,
+ * the call from delete_resource_description. In future we want
+ * to allow having the same query open on multiple cursors,
* right now we don't support this. Which is why this workaround */
if (result_set) {
@@ -1213,7 +1213,7 @@ cache_delete_resource_type (TrackerClass *class,
TrackerStatementDelegate *delegate;
delegate = g_ptr_array_index (delete_callbacks, n);
- delegate->callback (graph, resource_buffer->subject,
+ delegate->callback (graph, resource_buffer->subject,
RDF_PREFIX "type", tracker_class_get_uri (class),
resource_buffer->types, delegate->user_data);
}
@@ -1285,8 +1285,8 @@ tracker_data_delete_statement (const gchar *graph,
TrackerStatementDelegate *delegate;
delegate = g_ptr_array_index (delete_callbacks, n);
- delegate->callback (graph, subject, predicate, object,
- resource_buffer->types,
+ delegate->callback (graph, subject, predicate, object,
+ resource_buffer->types,
delegate->user_data);
}
}
@@ -1504,8 +1504,8 @@ tracker_data_insert_statement_with_uri (const gchar *graph,
TrackerStatementDelegate *delegate;
delegate = g_ptr_array_index (insert_callbacks, n);
- delegate->callback (graph, subject, predicate, object,
- resource_buffer->types,
+ delegate->callback (graph, subject, predicate, object,
+ resource_buffer->types,
delegate->user_data);
}
}
@@ -1561,8 +1561,8 @@ tracker_data_insert_statement_with_string (const gchar *graph,
TrackerStatementDelegate *delegate;
delegate = g_ptr_array_index (insert_callbacks, n);
- delegate->callback (graph, subject, predicate, object,
- resource_buffer->types,
+ delegate->callback (graph, subject, predicate, object,
+ resource_buffer->types,
delegate->user_data);
}
}
@@ -1605,9 +1605,9 @@ tracker_data_update_enable_volume (const gchar *udi,
mount_path_file = g_file_new_for_path (mount_path);
mount_path_uri = g_file_get_uri (mount_path_file);
- delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:mountPoint ?d } WHERE { <%s> tracker:mountPoint ?d }",
+ delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:mountPoint ?d } WHERE { <%s> tracker:mountPoint ?d }",
removable_device_urn, removable_device_urn, removable_device_urn);
- set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:mountPoint <%s> }",
+ set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:mountPoint <%s> }",
removable_device_urn, removable_device_urn, mount_path_uri);
tracker_data_update_sparql (delete_q, &error);
@@ -1628,9 +1628,9 @@ tracker_data_update_enable_volume (const gchar *udi,
g_free (set_q);
g_free (delete_q);
- delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:isMounted ?d } WHERE { <%s> tracker:isMounted ?d }",
+ delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:isMounted ?d } WHERE { <%s> tracker:isMounted ?d }",
removable_device_urn, removable_device_urn, removable_device_urn);
- set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:isMounted true }",
+ set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:isMounted true }",
removable_device_urn, removable_device_urn);
tracker_data_update_sparql (delete_q, &error);
@@ -1667,9 +1667,9 @@ tracker_data_update_reset_volume (const gchar *uri)
mnow = time (NULL);
now_as_string = tracker_date_to_string (mnow);
- delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:unmountDate ?d } WHERE { <%s> tracker:unmountDate ?d }",
+ delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:unmountDate ?d } WHERE { <%s> tracker:unmountDate ?d }",
uri, uri, uri);
- set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:unmountDate \"%s\" }",
+ set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:unmountDate \"%s\" }",
uri, uri, now_as_string);
tracker_data_update_sparql (delete_q, &error);
@@ -1708,9 +1708,9 @@ tracker_data_update_disable_volume (const gchar *udi)
tracker_data_update_reset_volume (removable_device_urn);
- delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:isMounted ?d } WHERE { <%s> tracker:isMounted ?d }",
+ delete_q = g_strdup_printf ("DELETE FROM <%s> { <%s> tracker:isMounted ?d } WHERE { <%s> tracker:isMounted ?d }",
removable_device_urn, removable_device_urn, removable_device_urn);
- set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:isMounted false }",
+ set_q = g_strdup_printf ("INSERT INTO <%s> { <%s> a tracker:Volume; tracker:isMounted false }",
removable_device_urn, removable_device_urn);
tracker_data_update_sparql (delete_q, &error);
@@ -1864,8 +1864,8 @@ format_sql_value_as_string (GString *sql,
* annotations (non-embedded/user metadata) stored about the resource.
*/
void
-tracker_data_delete_resource_description (const gchar *graph,
- const gchar *uri,
+tracker_data_delete_resource_description (const gchar *graph,
+ const gchar *uri,
GError **error)
{
TrackerDBInterface *iface;
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index 00839cf..4b2123a 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -44,8 +44,8 @@ typedef enum {
} TrackerDataError;
typedef void (*TrackerStatementCallback) (const gchar *graph,
- const gchar *subject,
- const gchar *predicate,
+ const gchar *subject,
+ const gchar *predicate,
const gchar *object,
GPtrArray *rdf_types,
gpointer user_data);
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index cfc1806..f9fa768 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -1312,7 +1312,7 @@ public class Tracker.SparqlQuery : Object {
if (current() == SparqlTokenType.IRI_REF) {
new_binding.literal = "1";
next ();
- } else if (translate_expression (new StringBuilder ()) == PropertyType.RESOURCE) {
+ } else if (translate_expression (new StringBuilder ()) == PropertyType.RESOURCE) {
new_binding.literal = "1";
} else {
new_binding.literal = "0";
@@ -1859,7 +1859,7 @@ public class Tracker.SparqlQuery : Object {
}
PropertyType translate_aggregate_expression (StringBuilder sql) throws SparqlError {
- expect (SparqlTokenType.OPEN_PARENS);
+ expect (SparqlTokenType.OPEN_PARENS);
if (accept (SparqlTokenType.DISTINCT)) {
sql.append ("DISTINCT ");
}
@@ -2746,7 +2746,7 @@ public class Tracker.SparqlQuery : Object {
add_variable_binding (sql, binding, VariableState.BOUND);
}
-
+
if (newtable) {
if (current_subject_is_var) {
var binding = new VariableBinding ();
@@ -2771,7 +2771,7 @@ public class Tracker.SparqlQuery : Object {
pattern_bindings.append (binding);
}
}
-
+
if (!rdftype) {
if (object_is_var) {
var binding = new VariableBinding ();
diff --git a/src/libtracker-db/tracker-db-backup.c b/src/libtracker-db/tracker-db-backup.c
index 30e97ce..d5cec64 100644
--- a/src/libtracker-db/tracker-db-backup.c
+++ b/src/libtracker-db/tracker-db-backup.c
@@ -156,7 +156,7 @@ on_backup_temp_finished (gpointer user_data)
if (!info->error && info->result != SQLITE_DONE) {
- g_set_error (&info->error, TRACKER_DB_BACKUP_ERROR,
+ g_set_error (&info->error, TRACKER_DB_BACKUP_ERROR,
TRACKER_DB_BACKUP_ERROR_UNKNOWN,
"%s", sqlite3_errmsg (info->backup_temp));
}
@@ -167,8 +167,8 @@ on_backup_temp_finished (gpointer user_data)
from_file = g_file_get_child (info->parent, TRACKER_DB_BACKUP_META_FILENAME_T);
to_file = g_file_get_child (info->parent, TRACKER_DB_BACKUP_META_FILENAME);
- g_file_move (from_file, to_file,
- G_FILE_COPY_OVERWRITE,
+ g_file_move (from_file, to_file,
+ G_FILE_COPY_OVERWRITE,
NULL, NULL, NULL,
&info->error);
@@ -232,7 +232,7 @@ tracker_db_backup_save (TrackerDBBackupFinished callback,
g_set_error (&info->error, TRACKER_DB_BACKUP_ERROR, TRACKER_DB_BACKUP_ERROR_UNKNOWN,
"Could not open sqlite3 database:'%s'", db_file);
- g_idle_add_full (G_PRIORITY_DEFAULT, perform_callback, info,
+ g_idle_add_full (G_PRIORITY_DEFAULT, perform_callback, info,
backup_info_free);
return;
@@ -242,26 +242,26 @@ tracker_db_backup_save (TrackerDBBackupFinished callback,
g_set_error (&info->error, TRACKER_DB_BACKUP_ERROR, TRACKER_DB_BACKUP_ERROR_UNKNOWN,
"Could not open sqlite3 database:'%s'", info->backup_fname);
- g_idle_add_full (G_PRIORITY_DEFAULT, perform_callback, info,
+ g_idle_add_full (G_PRIORITY_DEFAULT, perform_callback, info,
backup_info_free);
return;
}
- info->backup_db = sqlite3_backup_init (info->backup_temp, "main",
+ info->backup_db = sqlite3_backup_init (info->backup_temp, "main",
info->db, "main");
if (!info->backup_db) {
g_set_error (&info->error, TRACKER_DB_BACKUP_ERROR, TRACKER_DB_BACKUP_ERROR_UNKNOWN,
"Unknown error creating backup db: '%s'", info->backup_fname);
- g_idle_add_full (G_PRIORITY_DEFAULT, perform_callback, info,
+ g_idle_add_full (G_PRIORITY_DEFAULT, perform_callback, info,
backup_info_free);
return;
}
- g_idle_add_full (G_PRIORITY_DEFAULT, backup_file_step, info,
+ g_idle_add_full (G_PRIORITY_DEFAULT, backup_file_step, info,
on_backup_temp_finished);
}
diff --git a/src/libtracker-db/tracker-db-backup.h b/src/libtracker-db/tracker-db-backup.h
index b4a966c..ac0e6b5 100644
--- a/src/libtracker-db/tracker-db-backup.h
+++ b/src/libtracker-db/tracker-db-backup.h
@@ -39,7 +39,7 @@ typedef enum {
TRACKER_DB_BACKUP_ERROR_UNKNOWN,
} TrackerDBBackupError;
-typedef void (*TrackerDBBackupFinished) (GError *error,
+typedef void (*TrackerDBBackupFinished) (GError *error,
gpointer user_data);
GQuark tracker_db_backup_error_quark (void);
diff --git a/src/libtracker-db/tracker-db-dbus.c b/src/libtracker-db/tracker-db-dbus.c
index d49f98c..3657fa6 100644
--- a/src/libtracker-db/tracker-db-dbus.c
+++ b/src/libtracker-db/tracker-db-dbus.c
@@ -35,7 +35,7 @@ typedef struct {
} OneElem;
static inline void
-row_add (GPtrArray *row,
+row_add (GPtrArray *row,
gchar *value)
{
OneElem *elem;
@@ -50,8 +50,8 @@ row_add (GPtrArray *row,
}
static inline gboolean
-row_insert (GPtrArray *row,
- gchar *value,
+row_insert (GPtrArray *row,
+ gchar *value,
guint lindex)
{
OneElem *elem;
@@ -136,8 +136,8 @@ rows_destroy (GPtrArray *rows)
}
static inline void
-rows_add (GPtrArray *rows,
- gint key,
+rows_add (GPtrArray *rows,
+ gint key,
gpointer value)
{
OneRow *row;
@@ -305,9 +305,9 @@ tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
for (i = offset_column ; i < until_column; i++) {
GValue value = {0, };
GValue transform = {0, };
-
+
g_value_init (&transform, G_TYPE_STRING);
-
+
_tracker_db_result_set_get_value (result_set, i, &value);
if (G_IS_VALUE (&value) && g_value_transform (&value, &transform)) {
if (row_counter == 0) {
@@ -320,14 +320,14 @@ tracker_dbus_query_result_columns_to_strv (TrackerDBResultSet *result_set,
old_value = strv [i];
strv[i] = g_strconcat (old_value, "|", new_value, NULL);
-
+
g_free (old_value);
}
if (new_value) {
g_free (new_value);
}
-
+
}
g_value_unset (&value);
} else if (row_counter == 0) {
@@ -506,14 +506,14 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
while (valid) {
GPtrArray *row;
GValue value_in = {0, };
- gint key;
+ gint key;
gint column;
gboolean add = FALSE;
/* Get the key and the matching row if exists */
_tracker_db_result_set_get_value (result_set, 0, &value_in);
- key = g_value_get_int (&value_in);
- row = rows_lookup (rows, key);
+ key = g_value_get_int (&value_in);
+ row = rows_lookup (rows, key);
if (!row) {
row = g_ptr_array_new ();
add = TRUE;
@@ -533,7 +533,7 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
if (g_value_transform (&value, &transform)) {
str = g_value_dup_string (&transform);
-
+
if (!str) {
str = g_strdup ("");
} else if (!g_utf8_validate (str, -1, NULL)) {
@@ -542,17 +542,17 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
str = g_strdup ("");
}
} else {
- str = g_strdup ("");
+ str = g_strdup ("");
}
if (add) {
row_add (row, str);
- } else {
+ } else {
if (!row_insert (row, str, column-1)) {
/* Failed to insert */
g_free (str);
}
- }
+ }
g_value_unset (&value);
g_value_unset (&transform);
@@ -569,6 +569,6 @@ tracker_dbus_query_result_multi_to_ptr_array (TrackerDBResultSet *result_set)
rows_migrate (rows, result);
rows_destroy (rows);
-
+
return result;
}
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index b240dee..5e8bb0b 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -108,7 +108,7 @@ struct SqliteAggregateData {
guint context_size;
TrackerDBFuncStep step;
TrackerDBFuncFinal final;
-
+
};
@@ -154,8 +154,8 @@ G_DEFINE_TYPE_WITH_CODE (TrackerDBCursorSqlite, tracker_db_cursor_sqlite, G_TYPE
G_IMPLEMENT_INTERFACE (TRACKER_TYPE_DB_CURSOR,
tracker_db_cursor_sqlite_iface_init))
-void
-tracker_db_interface_sqlite_enable_shared_cache (void)
+void
+tracker_db_interface_sqlite_enable_shared_cache (void)
{
sqlite3_enable_shared_cache (1);
}
@@ -589,7 +589,7 @@ internal_sqlite3_aggregate_final (sqlite3_context *context)
data = (SqliteAggregateData *) sqlite3_user_data (context);
- aggregate_context = sqlite3_aggregate_context(context, 0);
+ aggregate_context = sqlite3_aggregate_context(context, 0);
/* Call the function */
result = data->final (data->interface, aggregate_context);
@@ -696,7 +696,7 @@ create_result_set_from_stmt (TrackerDBInterfaceSqlite *interface,
g_set_error (error,
TRACKER_DB_INTERFACE_ERROR,
TRACKER_DB_QUERY_ERROR,
- "%s",
+ "%s",
sqlite3_errmsg (priv->db));
}
@@ -731,7 +731,7 @@ tracker_db_interface_sqlite_execute_query (TrackerDBInterface *db_interface,
g_set_error (error,
TRACKER_DB_INTERFACE_ERROR,
TRACKER_DB_QUERY_ERROR,
- "%s",
+ "%s",
sqlite3_errmsg (priv->db));
return NULL;
} else if (stmt == NULL) {
@@ -831,8 +831,8 @@ tracker_db_interface_sqlite_create_aggregate (TrackerDBInterface *interface,
priv->aggregate_data = g_slist_prepend (priv->aggregate_data, data);
- sqlite3_create_function (priv->db, name, n_args, SQLITE_ANY, data, NULL,
- &internal_sqlite3_aggregate_step,
+ sqlite3_create_function (priv->db, name, n_args, SQLITE_ANY, data, NULL,
+ &internal_sqlite3_aggregate_step,
&internal_sqlite3_aggregate_final);
}
diff --git a/src/libtracker-db/tracker-db-interface.h b/src/libtracker-db/tracker-db-interface.h
index 0d0e73f..0fb5836 100644
--- a/src/libtracker-db/tracker-db-interface.h
+++ b/src/libtracker-db/tracker-db-interface.h
@@ -118,14 +118,14 @@ struct TrackerDBCursorIface {
void (*rewind) (TrackerDBCursor *cursor);
gboolean (*iter_next) (TrackerDBCursor *cursor);
guint (*get_n_columns) (TrackerDBCursor *cursor);
- void (*get_value) (TrackerDBCursor *cursor,
+ void (*get_value) (TrackerDBCursor *cursor,
guint column,
GValue *value);
- const gchar* (*get_string) (TrackerDBCursor *cursor,
+ const gchar* (*get_string) (TrackerDBCursor *cursor,
guint column);
- gint (*get_int) (TrackerDBCursor *cursor,
+ gint (*get_int) (TrackerDBCursor *cursor,
guint column);
- gdouble (*get_double) (TrackerDBCursor *cursor,
+ gdouble (*get_double) (TrackerDBCursor *cursor,
guint column);
};
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c
index d3f54d4..e998e8f 100644
--- a/src/libtracker-db/tracker-db-manager.c
+++ b/src/libtracker-db/tracker-db-manager.c
@@ -308,7 +308,7 @@ function_group_concat_step (TrackerDBInterface *interface,
} else {
p->string = g_string_append (p->string, "|");
}
-
+
if (G_VALUE_HOLDS_STRING (&values[0])) {
p->string = g_string_append (p->string, g_value_get_string (&values[0]));
}
@@ -693,7 +693,7 @@ db_set_params (TrackerDBInterface *iface,
"replace",
function_replace,
3);
-
+
tracker_db_interface_sqlite_create_aggregate (iface,
"group_concat",
function_group_concat_step,
@@ -827,7 +827,7 @@ db_interface_create (TrackerDB db)
return db_interface_get_metadata ();
case TRACKER_DB_FULLTEXT:
- return db_interface_get_fulltext ();
+ return db_interface_get_fulltext ();
case TRACKER_DB_CONTENTS:
return db_interface_get_contents ();
@@ -848,7 +848,7 @@ db_manager_remove_all (gboolean rm_backup_and_log, gboolean not_meta)
g_message ("Removing all database files");
/* NOTE: We don't have to be initialized for this so we
- * calculate the absolute directories here.
+ * calculate the absolute directories here.
*/
for (i = 1; i < G_N_ELEMENTS (dbs); i++) {
@@ -901,7 +901,7 @@ db_get_version (void)
g_message (" Version file content size is either 0 or bigger than expected");
version = TRACKER_DB_VERSION_UNKNOWN;
- }
+ }
g_free (contents);
} else {
@@ -1026,7 +1026,7 @@ check_meta_backup (gboolean *did_copy)
/* This is currently the only test for need_journal. We should add a
* couple tests that test meta.db against consistenty, and if not
- * good, copy meta-backup.db over and set need_journal (being less
+ * good, copy meta-backup.db over and set need_journal (being less
* conservative about using the backup, and not trusting the meta.db
* as much as we do right now) */
@@ -1127,7 +1127,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
g_free (filename);
env_path = g_getenv ("TRACKER_DB_SQL_DIR");
-
+
if (G_UNLIKELY (!env_path)) {
sql_dir = g_build_filename (SHAREDIR,
"tracker",
@@ -1135,12 +1135,12 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
} else {
sql_dir = g_strdup (env_path);
}
-
+
user_data_dir = g_build_filename (g_get_user_data_dir (),
"tracker",
"data",
NULL);
-
+
data_dir = g_build_filename (g_get_user_cache_dir (),
"tracker",
NULL);
@@ -1162,7 +1162,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
}
if (need_reindex) {
- db_set_version ();
+ db_set_version ();
}
g_message ("Checking database files exist");
@@ -1202,7 +1202,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
}
/* If we are just initializing to remove the databases,
- * return here.
+ * return here.
*/
if ((flags & TRACKER_DB_MANAGER_REMOVE_ALL) != 0) {
initialized = TRUE;
@@ -1299,7 +1299,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
return TRUE;
}
-void
+void
tracker_db_manager_disconnect (void)
{
if (resources_iface) {
@@ -1319,7 +1319,7 @@ tracker_db_manager_disconnect (void)
}
}
-void
+void
tracker_db_manager_reconnect (void)
{
if (resources_iface) {
@@ -1399,7 +1399,7 @@ void
tracker_db_manager_remove_all (gboolean rm_backup_and_log)
{
g_return_if_fail (initialized != FALSE);
-
+
db_manager_remove_all (rm_backup_and_log, FALSE);
}
@@ -1421,7 +1421,7 @@ tracker_db_manager_optimize (void)
g_message (" DB:'%s' is still open with %d references!",
dbs[i].name,
G_OBJECT (dbs[i].iface)->ref_count);
-
+
dbs_are_open = TRUE;
}
}
diff --git a/src/libtracker-fts/tracker-fts-config.c b/src/libtracker-fts/tracker-fts-config.c
index b452fbf..9849f59 100644
--- a/src/libtracker-fts/tracker-fts-config.c
+++ b/src/libtracker-fts/tracker-fts-config.c
@@ -65,7 +65,7 @@ static void config_get_property (GObject *object,
static void config_finalize (GObject *object);
static void config_constructed (GObject *object);
static void config_create_with_defaults (TrackerFTSConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite);
static void config_load (TrackerFTSConfig *config);
@@ -210,30 +210,30 @@ config_constructed (GObject *object)
static void
config_create_with_defaults (TrackerFTSConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite)
{
gint i;
g_message ("Loading defaults into GKeyFile...");
-
+
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
if (!overwrite && has_key) {
continue;
}
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- g_key_file_set_integer (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_int (config,
+ g_key_file_set_integer (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_int (config,
conversions[i].property));
break;
@@ -242,11 +242,11 @@ config_create_with_defaults (TrackerFTSConfig *config,
break;
}
- g_key_file_set_comment (key_file,
- conversions[i].group,
- conversions[i].key,
+ g_key_file_set_comment (key_file,
+ conversions[i].group,
+ conversions[i].key,
tracker_keyfile_object_blurb (config,
- conversions[i].property),
+ conversions[i].property),
NULL);
}
}
@@ -266,18 +266,18 @@ config_load (TrackerFTSConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (file->key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (file->key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_keyfile_object_load_int (G_OBJECT (file),
+ tracker_keyfile_object_load_int (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -308,9 +308,9 @@ config_save (TrackerFTSConfig *config)
switch (conversions[i].type) {
case G_TYPE_INT:
tracker_keyfile_object_save_int (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -326,7 +326,7 @@ config_save (TrackerFTSConfig *config)
TrackerFTSConfig *
tracker_fts_config_new (void)
{
- return g_object_new (TRACKER_TYPE_FTS_CONFIG,
+ return g_object_new (TRACKER_TYPE_FTS_CONFIG,
"domain", "tracker-fts",
NULL);
}
diff --git a/src/libtracker-fts/tracker-fts-hash.c b/src/libtracker-fts/tracker-fts-hash.c
index cbbe160..e924afd 100644
--- a/src/libtracker-fts/tracker-fts-hash.c
+++ b/src/libtracker-fts/tracker-fts-hash.c
@@ -49,8 +49,8 @@ static void fts3HashFree(void *p){
** fields of the Hash structure.
**
** "pNew" is a pointer to the hash table that is to be initialized.
-** keyClass is one of the constants
-** FTS3_HASH_BINARY or FTS3_HASH_STRING. The value of keyClass
+** keyClass is one of the constants
+** FTS3_HASH_BINARY or FTS3_HASH_STRING. The value of keyClass
** determines what kind of key the hash table will use. "copyKey" is
** true if the hash table should make its own private copy of keys and
** false if it should just use the supplied pointer.
@@ -127,7 +127,7 @@ static int fts3BinCompare(const void *pKey1, int n1, const void *pKey2, int n2){
/*
** Return a pointer to the appropriate hash function given the key class.
**
-** The C syntax in this function definition may be unfamilar to some
+** The C syntax in this function definition may be unfamilar to some
** programmers, so we provide the following additional explanation:
**
** The name of the function is "ftsHashFunction". The function takes a
@@ -187,7 +187,7 @@ static void fts3HashInsertElement(
/* Resize the hash table so that it cantains "new_size" buckets.
-** "new_size" must be a power of 2. The hash table might fail
+** "new_size" must be a power of 2. The hash table might fail
** to resize if sqliteMalloc() fails.
*/
static void fts3Rehash(fts3Hash *pH, int new_size){
@@ -229,7 +229,7 @@ static fts3HashElem *fts3FindElementByHash(
count = pEntry->count;
xCompare = ftsCompareFunction(pH->keyClass);
while( count-- && elem ){
- if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
+ if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){
return elem;
}
elem = elem->next;
@@ -248,7 +248,7 @@ static void fts3RemoveElementByHash(
){
struct _fts3ht *pEntry;
if( elem->prev ){
- elem->prev->next = elem->next;
+ elem->prev->next = elem->next;
}else{
pH->first = elem->next;
}
diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
index 8849dcd..7fac4ee 100644
--- a/src/libtracker-fts/tracker-fts.c
+++ b/src/libtracker-fts/tracker-fts.c
@@ -598,12 +598,12 @@ typedef struct DLReader {
int nData;
sqlite_int64 iDocid;
-
+
#ifdef STORE_CATEGORY
int Catid;
#endif
-
-
+
+
int nElement;
} DLReader;
@@ -642,24 +642,24 @@ static int dlrAllDataBytes(DLReader *pReader){
static const char *dlrPosData(DLReader *pReader){
sqlite_int64 iDummy;
int n = fts3GetVarint(pReader->pData, &iDummy);
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
int Catid;
n += fts3GetVarint32(pReader->pData+n, &Catid);
#endif
-
+
assert( !dlrAtEnd(pReader) );
return pReader->pData+n;
}
static int dlrPosDataLen(DLReader *pReader){
sqlite_int64 iDummy;
int n = fts3GetVarint(pReader->pData, &iDummy);
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
int Catid;
n += fts3GetVarint32(pReader->pData+n, &Catid);
#endif
-
+
assert( !dlrAtEnd(pReader) );
return pReader->nElement-n;
}
@@ -674,16 +674,16 @@ static void dlrStep(DLReader *pReader){
/* If there is more data, read the next doclist element. */
if( pReader->nData!=0 ){
sqlite_int64 iDocidDelta = 0;
-
+
int iDummy, n = fts3GetVarint(pReader->pData, &iDocidDelta);
pReader->iDocid += iDocidDelta;
-#ifdef STORE_CATEGORY
+#ifdef STORE_CATEGORY
int Catid;
n += fts3GetVarint32(pReader->pData+n, &Catid);
pReader->Catid = Catid;
#endif
-
+
if( pReader->iType>=DL_POSITIONS ){
assert( n<pReader->nData );
while( 1 ){
@@ -713,7 +713,7 @@ static void dlrInit(DLReader *pReader, DocListType iType,
pReader->nElement = 0;
pReader->iDocid = 0;
-#ifdef STORE_CATEGORY
+#ifdef STORE_CATEGORY
pReader->Catid = 0;
#endif
@@ -739,8 +739,8 @@ static void docListValidate(DocListType iType, const char *pData, int nData,
sqlite_int64 iDocidDelta;
int n = fts3GetVarint(pData, &iDocidDelta);
iPrevDocid += iDocidDelta;
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
int Catid;
n += fts3GetVarint32(pData+n, &Catid);
#endif
@@ -854,7 +854,7 @@ static void dlwCopy(DLWriter *pWriter, DLReader *pReader){
#ifndef RANK
-#ifdef STORE_CATEGORY
+#ifdef STORE_CATEGORY
static void dlwAdd(DLWriter *pWriter, sqlite_int64 iDocid, int Catid){
char c[VARINT_MAX];
int n = fts3PutVarint(c, iDocid-pWriter->iPrevDocid);
@@ -865,10 +865,10 @@ static void dlwAdd(DLWriter *pWriter, sqlite_int64 iDocid, int Catid){
dataBufferAppend(pWriter->b, c, n);
pWriter->iPrevDocid = iDocid;
-
+
n = fts3PutVarint(c, Catid);
dataBufferAppend(pWriter->b, c, n);
-
+
#ifndef NDEBUG
pWriter->has_iPrevDocid = 1;
#endif
@@ -990,14 +990,14 @@ static void plrDestroy(PLReader *pReader){
}
#if 0
-/* because plrDestroy should only be called when plrAtEnd is true,
+/* because plrDestroy should only be called when plrAtEnd is true,
we create a new convenience function to do this in one call */
static void plrEndAndDestroy (PLReader *pReader){
while (!plrAtEnd(pReader)) {
plrStep (pReader);
}
-
+
plrDestroy (pReader);
}
#endif
@@ -1088,15 +1088,15 @@ static void plwInit(PLWriter *pWriter, DLWriter *dlw, sqlite_int64 iDocid, int C
n = fts3PutVarint(c, iDocid-pWriter->dlw->iPrevDocid);
dataBufferAppend(pWriter->dlw->b, c, n);
pWriter->dlw->iPrevDocid = iDocid;
-
+
n = fts3PutVarint(c, Catid);
dataBufferAppend(pWriter->dlw->b, c, n);
-
+
#ifndef NDEBUG
pWriter->dlw->has_iPrevDocid = 1;
#endif
- /* [tracker] - the default column (ID = 0) should be that of File:Contents for Files db and Email:Body for email db
+ /* [tracker] - the default column (ID = 0) should be that of File:Contents for Files db and Email:Body for email db
that way we avoid wrting a column ID and cosuming more bytes for the most voluminous cases */
pWriter->iColumn = default_column;
pWriter->iPos = 0;
@@ -1116,7 +1116,7 @@ static void plwInit(PLWriter *pWriter, DLWriter *dlw, sqlite_int64 iDocid){
n = fts3PutVarint(c, iDocid-pWriter->dlw->iPrevDocid);
dataBufferAppend(pWriter->dlw->b, c, n);
pWriter->dlw->iPrevDocid = iDocid;
-
+
#ifndef NDEBUG
pWriter->dlw->has_iPrevDocid = 1;
#endif
@@ -1268,8 +1268,8 @@ static void docListTrim(DocListType iType, const char *pData, int nData,
if( iColumn==-1 || plrColumn(&plReader)==iColumn ){
if( !match ){
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
plwInit(&plWriter, &dlWriter, dlrDocid(&dlReader), dlrCatid(&dlReader));
#else
plwInit(&plWriter, &dlWriter, dlrDocid(&dlReader));
@@ -1462,8 +1462,8 @@ static void posListUnion(DLReader *pLeft, DLReader *pRight, DLWriter *pOut){
plrInit(&left, pLeft);
plrInit(&right, pRight);
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
plwInit(&writer, pOut, dlrDocid(pLeft), dlrCatid(pLeft));
#else
plwInit(&writer, pOut, dlrDocid(pLeft));
@@ -1541,14 +1541,14 @@ static void docListUnion(
dlwDestroy(&writer);
}
-/*
+/*
** This function is used as part of the implementation of phrase and
** NEAR matching.
**
** pLeft and pRight are DLReaders positioned to the same docid in
** lists of type DL_POSITION. This function writes an entry to the
** DLWriter pOut for each position in pRight that is less than
-** (nNear+1) greater (but not equal to or smaller) than a position
+** (nNear+1) greater (but not equal to or smaller) than a position
** in pLeft. For example, if nNear is 0, and the positions contained
** by pLeft and pRight are:
**
@@ -1564,7 +1564,7 @@ static void docListUnion(
** If isSaveLeft = 2 then both positions are added, 3 or above and postions are appended to left
*/
static void posListPhraseMerge(
- DLReader *pLeft,
+ DLReader *pLeft,
DLReader *pRight,
int nNear,
int isSaveLeft,
@@ -1580,7 +1580,7 @@ static void posListPhraseMerge(
plrInit(&left, pLeft);
plrInit(&right, pRight);
-
+
while( !plrAtEnd(&left) && !plrAtEnd(&right) ){
@@ -1594,8 +1594,8 @@ static void posListPhraseMerge(
if( (plrPosition(&right)-plrPosition(&left))<=(nNear+1) ){
if( !match ){
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
plwInit(&writer, pOut, dlrDocid(pLeft), dlrCatid(pLeft));
#else
plwInit(&writer, pOut, dlrDocid(pLeft));
@@ -1607,17 +1607,17 @@ static void posListPhraseMerge(
}else if( isSaveLeft == 1 ){
plwAdd(&writer, plrColumn(&left), plrPosition(&left), 0, 0);
} else {
-
+
int iPosRight = plrPosition(&right);
int iColumnRight = plrColumn(&right);
int i;
-
+
for (i=term_num; i>=0; i--) {
plwAdd(&writer, iColumnRight, iPosRight - i, 0, 0);
}
-
+
}
-
+
plrStep(&right);
}else{
plrStep(&left);
@@ -1635,7 +1635,7 @@ static void posListPhraseMerge(
}
/*
-** Compare the values pointed to by the PLReaders passed as arguments.
+** Compare the values pointed to by the PLReaders passed as arguments.
** Return -1 if the value pointed to by pLeft is considered less than
** the value pointed to by pRight, +1 if it is considered greater
** than it, or 0 if it is equal. i.e.
@@ -1670,7 +1670,7 @@ static int plrCompare(PLReader *pLeft, PLReader *pRight){
** A phrase intersection means that two documents only match
** if pLeft.iPos+1==pRight.iPos.
**
-** A NEAR intersection means that two documents only match if
+** A NEAR intersection means that two documents only match if
** (abs(pLeft.iPos-pRight.iPos)<nNear).
**
** If a NEAR intersection is requested, then the nPhrase argument should
@@ -1738,9 +1738,9 @@ static void docListPhraseMerge(
PLReader pr2 = {0};
PLWriter plwriter;
-
-
-#ifdef STORE_CATEGORY
+
+
+#ifdef STORE_CATEGORY
plwInit(&plwriter, &writer, dlrDocid(dlrAtEnd(&dr1)?&dr2:&dr1), dlrCatid(dlrAtEnd(&dr1)?&dr2:&dr1));
#else
plwInit(&plwriter, &writer, dlrDocid(dlrAtEnd(&dr1)?&dr2:&dr1));
@@ -1800,8 +1800,8 @@ static void docListAndMerge(
dlrInit(&left, DL_POSITIONS, pLeft, nLeft);
dlrInit(&right, DL_POSITIONS, pRight, nRight);
dlwInit(&writer, DL_POSITIONS, pOut);
-
-
+
+
while( !dlrAtEnd(&left) && !dlrAtEnd(&right) ){
if(dlrDocid(&left)<dlrDocid(&right) ){
@@ -1818,8 +1818,8 @@ static void docListAndMerge(
dlrDestroy(&left);
dlrDestroy(&right);
dlwDestroy(&writer);
-}
-
+}
+
#else
static void docListAndMerge(
const char *pLeft, int nLeft,
@@ -1885,7 +1885,7 @@ static void docListOrMerge(
dlwCopy (&writer, &left);
dlrStep(&left);
}else if( dlrAtEnd(&left) ){
-
+
dlwCopy (&writer, &right);
dlrStep(&right);
}else if( dlrDocid(&left)<dlrDocid(&right) ){
@@ -1938,13 +1938,13 @@ static void docListOrMerge(
while( !dlrAtEnd(&left) || !dlrAtEnd(&right) ){
if( dlrAtEnd(&right) ){
dlwAdd(&writer, dlrDocid(&left));
-
+
dlrStep(&left);
}else if( dlrAtEnd(&left) ){
-
+
dlwAdd(&writer, dlrDocid(&right));
-
+
dlrStep(&right);
}else if( dlrDocid(&left)<dlrDocid(&right) ){
@@ -1956,7 +1956,7 @@ static void docListOrMerge(
dlwAdd(&writer, dlrDocid(&right));
-
+
dlrStep(&right);
}else{
@@ -2036,7 +2036,7 @@ static void docListExceptMerge(
dlrStep(&right);
}
if( dlrAtEnd(&right) || dlrDocid(&left)<dlrDocid(&right) ){
-
+
dlwAdd(&writer, dlrDocid(&left));
}
dlrStep(&left);
@@ -2896,7 +2896,7 @@ static void fulltext_vtab_destroy(fulltext_vtab *v){
** ftsIdChar(X) will be true. Otherwise it is false.
**
** For ASCII, any character with the high-order bit set is
-** allowed in an identifier. For 7-bit characters,
+** allowed in an identifier. For 7-bit characters,
** isFtsIdChar[X] must be 1.
**
** Ticket #1066. the SQL standard does not allow '$' in the
@@ -2917,7 +2917,7 @@ static const char isFtsIdChar[] = {
/*
-** Return the length of the token that begins at z[0].
+** Return the length of the token that begins at z[0].
** Store the token type in *tokenType before returning.
*/
static int ftsGetToken(const char *z, int *tokenType){
@@ -3123,7 +3123,7 @@ static char *firstToken(char *zIn, char **pzTail){
** * s begins with the string t, ignoring case
** * s is longer than t
** * The first character of s beyond t is not a alphanumeric
-**
+**
** Ignore leading space in *s.
**
** To put it another way, return true if the first token of
@@ -3166,7 +3166,7 @@ static void clearTableSpec(TableSpec *p) {
* USING fts3(subject, body, tokenize mytokenizer(myarg))
*
* We return parsed information in a TableSpec structure.
- *
+ *
*/
static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
char**pzErr){
@@ -3324,7 +3324,7 @@ static int constructVtab(
return SQLITE_NOMEM;
}
- zTok = spec->azTokenizer[0];
+ zTok = spec->azTokenizer[0];
if( !zTok ){
zTok = "simple";
}
@@ -3487,7 +3487,7 @@ static int fulltextBestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
/* An arbitrary value for now.
* TODO: Perhaps docid matches should be considered cheaper than
* full-text searches. */
- pInfo->estimatedCost = 1.0;
+ pInfo->estimatedCost = 1.0;
return SQLITE_OK;
}
@@ -3527,9 +3527,9 @@ static int fulltextOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
memset(c, 0, sizeof(fulltext_cursor));
/* sqlite will initialize c->base */
*ppCursor = &c->base;
-
+
c->offsets = g_string_new ("");
-
+
FTSTRACE(("FTS3 Open %p: %p\n", pVTab, c));
return SQLITE_OK;
}else{
@@ -3606,7 +3606,7 @@ static void snippetOffsetsOfColumn(
int nDoc
#ifdef STORE_CATEGORY
, int position
-#endif
+#endif
){
fulltext_vtab *pVtab; /* The full text index */
@@ -3642,9 +3642,9 @@ static void snippetOffsetsOfColumn(
while(1){
// rc = pTModule->xNext(pTCursor, &zToken, &nToken, &iBegin, &iEnd, &iPos);
-
-
- zToken = tracker_parser_next (pVtab->parser,
+
+
+ zToken = tracker_parser_next (pVtab->parser,
&iPos,
&iBegin,
&iEnd,
@@ -3656,8 +3656,8 @@ static void snippetOffsetsOfColumn(
if (stop_word) {
continue;
}
-
-
+
+
iRotorBegin[iRotor&FTS3_ROTOR_MASK] = iBegin;
iRotorLen[iRotor&FTS3_ROTOR_MASK] = iEnd-iBegin;
match = 0;
@@ -3687,7 +3687,7 @@ static void snippetOffsetsOfColumn(
/*
** Remove entries from the pSnippet structure to account for the NEAR
-** operator. When this is called, pSnippet contains the list of token
+** operator. When this is called, pSnippet contains the list of token
** offsets produced by treating all NEAR operators as AND operators.
** This function removes any entries that should not be present after
** accounting for the NEAR restriction. For example, if the queried
@@ -3696,7 +3696,7 @@ static void snippetOffsetsOfColumn(
** "A B C D E A"
**
** and the query is:
-**
+**
** A NEAR/0 E
**
** then when this function is called the Snippet contains token offsets
@@ -3787,14 +3787,14 @@ static void trimSnippetOffsetsForNear(Query *pQuery, Snippet *pSnippet){
/*
-** Compute all offsets for the current row of the query.
+** Compute all offsets for the current row of the query.
** If the offsets have already been computed, this routine is a no-op.
*/
static void snippetAllOffsets(fulltext_cursor *p){
int iColumn, i;
fulltext_vtab *pFts;
-#ifndef STORE_CATEGORY
+#ifndef STORE_CATEGORY
int iFirst, iLast;
int nColumn;
#endif
@@ -3802,57 +3802,57 @@ static void snippetAllOffsets(fulltext_cursor *p){
if( p->snippet.nMatch ) return;
if( p->q.nTerms==0 ) return;
pFts = p->q.pFts;
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
PLReader plReader;
int col_array[255];
gpointer pos_array[255];
-
+
for (i=0; i<255; i++) {
col_array[i] = 0;
pos_array[i] = NULL;
}
-
-
+
+
int iPos = 0;
-
+
if (dlrAtEnd (&p->reader)) return;
-
+
plrInit(&plReader, &p->reader);
-
+
if (plrAtEnd(&plReader)) return;
-
+
iColumn = -1;
-
+
for ( ; !plrAtEnd(&plReader); plrStep(&plReader) ){
-
+
if (plrColumn (&plReader) != iColumn) {
-
+
iColumn = plrColumn(&plReader);
col_array[iColumn] += 1;
}
-
+
iPos = plrPosition(&plReader);
GSList *l = pos_array[iColumn];
- l = g_slist_prepend (l, GINT_TO_POINTER (iPos));
+ l = g_slist_prepend (l, GINT_TO_POINTER (iPos));
}
plrEndAndDestroy(&plReader);
-
-
- /* get the column with most hits */
+
+
+ /* get the column with most hits */
int hit_column = 0;
- int hit_column_count = col_array[0];
-
+ int hit_column_count = col_array[0];
+
/*bias field id 0 more as its the main content field */
// if (hit_column_count > 0) hit_column_count++;
-
+
for (i=1; i<255; i++) {
if (col_array [i] > hit_column_count) {
hit_column = i;
hit_column_count =col_array[i];
}
-
+
g_slist_free (pos_array[i]);
}
@@ -3862,9 +3862,9 @@ static void snippetAllOffsets(fulltext_cursor *p){
zDoc = (const char*)sqlite3_column_text(p->pStmt, hit_column+1);
nDoc = sqlite3_column_bytes(p->pStmt, hit_column+1);
snippetOffsetsOfColumn(&p->q, &p->snippet, hit_column, zDoc, nDoc, iPos);
-
-
-#else
+
+
+#else
nColumn = pFts->nColumn;
iColumn = (p->iCursorType - QUERY_FULLTEXT);
@@ -3875,8 +3875,8 @@ static void snippetAllOffsets(fulltext_cursor *p){
iFirst = iColumn;
iLast = iColumn;
}
-
-
+
+
for(i=iFirst; i<=iLast; i++){
const char *zDoc;
int nDoc;
@@ -3884,8 +3884,8 @@ static void snippetAllOffsets(fulltext_cursor *p){
nDoc = sqlite3_column_bytes(p->pStmt, i+1);
snippetOffsetsOfColumn(&p->q, &p->snippet, i, zDoc, nDoc);
}
-#endif
-
+#endif
+
trimSnippetOffsetsForNear(&p->q, &p->snippet);
}
@@ -3905,9 +3905,9 @@ static void snippetOffsetText(Snippet *p){
for(i=0; i<p->nMatch; i++){
struct snippetMatch *pMatch = &p->aMatch[i];
if( pMatch->iTerm>=0 ){
- /* If snippetMatch.iTerm is less than 0, then the match was
- ** discarded as part of processing the NEAR operator (see the
- ** trimSnippetOffsetsForNear() function for details). Ignore
+ /* If snippetMatch.iTerm is less than 0, then the match was
+ ** discarded as part of processing the NEAR operator (see the
+ ** trimSnippetOffsetsForNear() function for details). Ignore
** it in this case
*/
zBuf[0] = ' ';
@@ -3997,7 +3997,7 @@ static void snippetText(
int iStart, iEnd;
int tailEllipsis = 0;
int iMatch;
-
+
sqlite3_free(pCursor->snippet.zSnippet);
pCursor->snippet.zSnippet = 0;
@@ -4142,14 +4142,14 @@ static int fulltextNext(sqlite3_vtab_cursor *pCursor){
#endif
/* (tracker) read position offsets here */
-
-
+
+
c->offsets = g_string_assign (c->offsets, "");
c->rank = 0;
plrInit(&plReader, &c->reader);
-
-
+
+
for ( ; !plrAtEnd(&plReader); plrStep(&plReader) ){
const gchar *uri;
int col = plrColumn (&plReader);
@@ -4166,11 +4166,11 @@ static int fulltextNext(sqlite3_vtab_cursor *pCursor){
g_warning ("Type '%d' for FTS offset doesn't exist in ontology", col);
}
}
-
+
plrDestroy(&plReader);
dlrStep(&c->reader);
-
+
if( rc!=SQLITE_OK ) return rc;
c->eof = 0;
return SQLITE_OK;
@@ -4186,7 +4186,7 @@ static int termSelect(fulltext_vtab *v, int iColumn,
const char *pTerm, int nTerm, int isPrefix,
DocListType iType, DataBuffer *out);
-/*
+/*
** Return a DocList corresponding to the phrase *pPhrase.
**
** The resulting DL_DOCIDS doclist is stored in pResult, which is
@@ -4208,15 +4208,15 @@ static int docListOfTerm(
assert( v->nPendingData<0 );
dataBufferInit(&left, 0);
-
+
#ifdef RANK
rc = termSelect(v, iColumn, pQTerm->pTerm, pQTerm->nTerm, pQTerm->isPrefix,
DL_POSITIONS, &left);
#else
rc = termSelect(v, iColumn, pQTerm->pTerm, pQTerm->nTerm, pQTerm->isPrefix,
(0<pQTerm->nPhrase ? DL_POSITIONS : DL_DOCIDS), &left);
- #endif
-
+ #endif
+
if( rc ) return rc;
for(i=1; i<=pQTerm->nPhrase && left.nData>0; i++){
/* If this token is connected to the next by a NEAR operator, and
@@ -4244,14 +4244,14 @@ static int docListOfTerm(
pQTerm[i-1].nNear, pQTerm[i-1].iPhrase + nPhraseRight,
DL_POSITIONS,
&new, i);
-
+
#else
docListPhraseMerge(left.pData, left.nData, right.pData, right.nData,
pQTerm[i-1].nNear, pQTerm[i-1].iPhrase + nPhraseRight,
((i<pQTerm->nPhrase) ? DL_POSITIONS : DL_DOCIDS),
&new, i);
- #endif
+ #endif
dataBufferDestroy(&left);
dataBufferDestroy(&right);
left = new;
@@ -4679,11 +4679,11 @@ static int fulltextFilter(
#ifdef RANK
dlrInit(&c->reader, DL_POSITIONS, c->result.pData, c->result.nData);
-#else
+#else
dlrInit(&c->reader, DL_DOCIDS, c->result.pData, c->result.nData);
-#endif
-
+#endif
+
}
break;
}
@@ -4712,13 +4712,13 @@ static int fulltextColumn(sqlite3_vtab_cursor *pCursor,
fulltext_cursor *c = (fulltext_cursor *) pCursor;
fulltext_vtab *v = cursor_vtab(c);
-#ifdef STORE_CATEGORY
+#ifdef STORE_CATEGORY
if (idxCol == 0) {
sqlite3_result_int (pContext, c->currentCatid);
return SQLITE_OK;
}
#endif
-
+
if( idxCol<v->nColumn ){
sqlite3_value *pVal = sqlite3_column_value(c->pStmt, idxCol+1);
sqlite3_result_value(pContext, pVal);
@@ -4751,13 +4751,13 @@ static int fulltextRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
** we also store positions and offsets in the hash table using that
** column number.
*/
-static int buildTerms(fulltext_vtab *v, sqlite_int64 iDocid,
+static int buildTerms(fulltext_vtab *v, sqlite_int64 iDocid,
-#ifdef STORE_CATEGORY
+#ifdef STORE_CATEGORY
int Catid,
#endif
const char *zText, int iColumn){
-
+
const char *pToken;
int nTokenBytes;
int iStartOffset, iEndOffset, iPosition, stop_word;
@@ -4801,8 +4801,8 @@ int Catid,
p = fts3HashFind(&v->pendingTerms, pToken, nTokenBytes);
if( p==NULL ){
nData = 0;
-
-#ifdef STORE_CATEGORY
+
+#ifdef STORE_CATEGORY
p = dlcNew(iDocid, DL_DEFAULT, Catid);
#else
p = dlcNew(iDocid, DL_DEFAULT);
@@ -4815,13 +4815,13 @@ int Catid,
}else{
nData = p->b.nData;
if( p->dlw.iPrevDocid!=iDocid ) {
-#ifdef STORE_CATEGORY
+#ifdef STORE_CATEGORY
dlcNext(p, iDocid, Catid);
#else
dlcNext(p, iDocid);
#endif
-
+
}
}
if( iColumn>=0 ){
@@ -4847,19 +4847,19 @@ int Catid,
static int insertTerms(fulltext_vtab *v, sqlite_int64 iDocid,
sqlite3_value **pValues){
int i;
-
-#ifdef STORE_CATEGORY
-
+
+#ifdef STORE_CATEGORY
+
/* tracker- category is at column 0 so we dont want to add that value to index */
for(i = 1; i < v->nColumn ; ++i){
char *zText = (char*)sqlite3_value_text(pValues[i]);
-
- /* tracker - as for col id we want col 0 to be the default metadata field (file:contents or email:body) ,
+
+ /* tracker - as for col id we want col 0 to be the default metadata field (file:contents or email:body) ,
col 1 to be meatdata id 1, col 2 to be metadat id 2 etc so need to decrement i here */
int rc = buildTerms(v, iDocid, sqlite3_value_int (pValues[0]), zText, i-1);
if( rc!=SQLITE_OK ) return rc;
}
-
+
#else
for(i = 0; i < v->nColumn ; ++i){
@@ -4867,8 +4867,8 @@ static int insertTerms(fulltext_vtab *v, sqlite_int64 iDocid,
int rc = buildTerms(v, iDocid, zText, i);
if( rc!=SQLITE_OK ) return rc;
}
-
-#endif
+
+#endif
return SQLITE_OK;
}
@@ -4886,8 +4886,8 @@ static int deleteTerms(fulltext_vtab *v, sqlite_int64 iDocid){
rc = content_select(v, iDocid, &pValues);
if( rc!=SQLITE_OK ) return rc;
-#ifdef STORE_CATEGORY
-
+#ifdef STORE_CATEGORY
+
for(i = 1 ; i < v->nColumn; ++i) {
rc = buildTerms(v, iDocid, atoi(pValues[0]), pValues[i], -1);
if( rc!=SQLITE_OK ) break;
@@ -4945,7 +4945,7 @@ static int index_update(fulltext_vtab *v, sqlite_int64 iRow,
for(i = 1; i < v->nColumn ; ++i){
char *zText = (char*)sqlite3_value_text(pValues[i]);
- /* tracker - as for col id we want col 0 to be the default metadata field (file:contents or email:body) ,
+ /* tracker - as for col id we want col 0 to be the default metadata field (file:contents or email:body) ,
col 1 to be meatdata id 1, col 2 to be metadat id 2 etc so need to decrement i here */
int rc = buildTerms(v, iRow, sqlite3_value_int (pValues[0]), zText, delete ? -1 : (i-1));
if( rc!=SQLITE_OK ) return rc;
@@ -6980,7 +6980,7 @@ static void snippetOffsetsFunc(
sqlite3_result_error(pContext, "illegal first argument to offsets",-1);
}else{
memcpy(&pCursor, sqlite3_value_blob(argv[0]), sizeof(pCursor));
-
+
/* (tracker) output caches position data in column, position string format */
sqlite3_result_text(pContext,
pCursor->offsets->str, pCursor->offsets->len,
@@ -7701,8 +7701,8 @@ static int fulltextRename(
"ALTER TABLE %Q.'%q_content' RENAME TO '%q_content';"
"ALTER TABLE %Q.'%q_segments' RENAME TO '%q_segments';"
"ALTER TABLE %Q.'%q_segdir' RENAME TO '%q_segdir';"
- , p->zDb, p->zName, zName
- , p->zDb, p->zName, zName
+ , p->zDb, p->zName, zName
+ , p->zDb, p->zName, zName
, p->zDb, p->zName, zName
);
if( zSql ){
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index fa9dcd9..439bbce 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -733,7 +733,7 @@ void
tracker_crawler_pause (TrackerCrawler *crawler)
{
g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
-
+
crawler->private->is_paused = TRUE;
if (crawler->private->is_running) {
@@ -741,7 +741,7 @@ tracker_crawler_pause (TrackerCrawler *crawler)
process_func_stop (crawler);
}
- g_message ("Crawler is paused, %s",
+ g_message ("Crawler is paused, %s",
crawler->private->is_running ? "currently running" : "not running");
}
@@ -757,7 +757,7 @@ tracker_crawler_resume (TrackerCrawler *crawler)
process_func_start (crawler);
}
- g_message ("Crawler is resuming, %s",
+ g_message ("Crawler is resuming, %s",
crawler->private->is_running ? "currently running" : "not running");
}
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index d9be596..41de13a 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -1105,10 +1105,10 @@ item_writeback (TrackerMinerFS *fs,
/* While we are in writeback:
* o. We always ignore deletes because it's never the final operation
* of a writeback. We have a delete when both are null.
- * o. A create means the writeback used rename(). This is the final
+ * o. A create means the writeback used rename(). This is the final
* operation of a writeback and thus we make the update query.
* We have a create when file == null and source_file != null
- * o. A move means the writeback used rename(). This is the final
+ * o. A move means the writeback used rename(). This is the final
* operation of a writeback and thus we make the update query.
* We have a move when both file and source_file aren't null.
* o. A update means the writeback didn't use rename(). This is the
@@ -1150,7 +1150,7 @@ item_writeback (TrackerMinerFS *fs,
if (success) {
gchar *query;
- /* Perhaps we should move the DELETE to tracker-miner-files.c?
+ /* Perhaps we should move the DELETE to tracker-miner-files.c?
* Or we add support for DELETE to TrackerSparqlBuilder ofcrs */
query = g_strdup_printf ("DELETE FROM <%s> { <%s> "
@@ -1163,7 +1163,7 @@ item_writeback (TrackerMinerFS *fs,
"nfo:fileLastModified ?unknown2 ;\n\t"
"nfo:fileLastAccessed ?unknown3 ;\n\t"
"nie:mimeType ?unknown4 \n"
- "} \n %s",
+ "} \n %s",
uri, uri, uri,
tracker_sparql_builder_get_result (sparql));
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 813032b..0ca4e76 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -745,7 +745,7 @@ tracker_miner_manager_get_status (TrackerMinerManager *manager,
if (error) {
/* We handle this error as a special case, some
- * plugins don't have .service files.
+ * plugins don't have .service files.
*/
if (error->code != DBUS_GERROR_SERVICE_UNKNOWN) {
g_critical ("Could not get miner progress for '%s': %s", miner,
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index a32d5c4..cac845d 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -456,8 +456,8 @@ miner_constructed (GObject *object)
return;
}
- g_object_set_qdata_full (G_OBJECT (miner),
- dbus_data,
+ g_object_set_qdata_full (G_OBJECT (miner),
+ dbus_data,
data,
dbus_data_destroy);
}
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 2318ff5..0b2ce7e 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -50,7 +50,7 @@
struct TrackerMonitorPrivate {
GHashTable *monitors;
-
+
gboolean enabled;
gint scan_timeout;
gint cache_timeout;
@@ -483,7 +483,7 @@ get_inotify_limit (void)
return limit;
}
-#ifdef PAUSE_ON_IO
+#ifdef PAUSE_ON_IO
static gboolean
unpause_cb (gpointer data)
@@ -628,7 +628,7 @@ libinotify_event_pairs_timeout_cb (gpointer data)
GPOINTER_TO_UINT (key),
seconds);
- is_directory =
+ is_directory =
g_file_query_file_type (event->file, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY;
switch (event->event_type) {
@@ -639,7 +639,7 @@ libinotify_event_pairs_timeout_cb (gpointer data)
* target location for the event.
*/
if (is_directory) {
- tracker_monitor_remove (monitor,
+ tracker_monitor_remove (monitor,
event->file);
}
@@ -698,7 +698,7 @@ libinotify_cached_event_handle (TrackerMonitor *monitor,
case IN_DELETE:
case IN_DELETE_SELF:
if (is_directory) {
- tracker_monitor_remove (monitor,
+ tracker_monitor_remove (monitor,
data->file);
}
@@ -754,7 +754,7 @@ libinotify_cached_events_timeout_cb (gpointer data)
last_event_seconds = now.tv_sec - event->last_time.tv_sec;
start_event_seconds = now.tv_sec - event->start_time.tv_sec;
- is_directory =
+ is_directory =
g_file_query_file_type (event->file, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY;
g_debug ("Comparing now:%ld to then:%ld (start:%ld), diff:%ld (with start:%ld)",
@@ -774,7 +774,7 @@ libinotify_cached_events_timeout_cb (gpointer data)
force_emit = start_event_seconds > monitor->private->cache_timeout;
}
- timed_out = last_event_seconds >= MAX (CACHE_LIFETIME_SECONDS,
+ timed_out = last_event_seconds >= MAX (CACHE_LIFETIME_SECONDS,
monitor->private->scan_timeout);
/* Make sure the item is in the cache for at least 2
@@ -840,7 +840,7 @@ libinotify_cached_event_delete_children_func (gpointer key,
data = user_data;
return (data->event_type == IN_DELETE ||
- data->event_type == IN_DELETE_SELF) &&
+ data->event_type == IN_DELETE_SELF) &&
g_file_has_prefix (key, data->file);
}
@@ -929,7 +929,7 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
str1 = g_file_get_path (file);
}
- is_directory =
+ is_directory =
g_file_query_file_type (file, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY;
event_type_str = libinotify_monitor_event_to_string (event_type);
@@ -1021,8 +1021,8 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
* handle that cache first. Otherwise we have
* disparity when the cache expires.
*/
- libinotify_monitor_force_emission (monitor,
- file,
+ libinotify_monitor_force_emission (monitor,
+ file,
event_type,
is_directory);
@@ -1032,7 +1032,7 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
case IN_UNMOUNT:
if (cookie == 0 || event_type == IN_UNMOUNT) {
/* This is how things generally work with
- * deleted items:
+ * deleted items:
*
* 1. Check if we have a child file already in
* the deleted hash table AND this is a
@@ -1045,7 +1045,7 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
* handle deleted items after n seconds.
* 4. When we handle deleted items, only emit
* those which were deleted in the last 2
- * seconds.
+ * seconds.
*/
data = event_data_new (file, event_type);
@@ -1083,9 +1083,9 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
signals[ITEM_MOVED], 0,
file,
other_file,
- is_directory,
+ is_directory,
TRUE);
-
+
if (is_directory) {
monitor_move (monitor, file, other_file);
}
@@ -1294,7 +1294,7 @@ monitor_move (TrackerMonitor *monitor,
g_free (old_path);
continue;
}
-
+
new_prefix = g_file_get_path (new_file);
new_path = g_build_path (G_DIR_SEPARATOR_S, new_prefix, p, NULL);
g_free (new_prefix);
@@ -1384,7 +1384,7 @@ tracker_monitor_set_enabled (TrackerMonitor *monitor,
g_return_if_fail (TRACKER_IS_MONITOR (monitor));
/* Don't replace all monitors if we are already
- * enabled/disabled.
+ * enabled/disabled.
*/
if (monitor->private->enabled == enabled) {
return;
@@ -1529,11 +1529,11 @@ tracker_monitor_remove (TrackerMonitor *monitor,
removed = g_hash_table_remove (monitor->private->monitors, file);
path = g_file_get_path (file);
-
+
g_debug ("Removed monitor for path:'%s', total monitors:%d",
path,
g_hash_table_size (monitor->private->monitors));
-
+
g_free (path);
return removed;
diff --git a/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml b/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
index 3bf963d..0c2b9dc 100644
--- a/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
+++ b/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<e-plugin-list>
- <e-plugin id="org.freedesktop.Tracker1.evolution_plugin"
+ <e-plugin id="org.freedesktop.Tracker1.evolution_plugin"
type="shlib"
location="+PLUGIN_INSTALL_DIR+/liborg-freedesktop-Tracker-evolution-plugin.so"
domain="+GETTEXT_PACKAGE+"
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index f474f7f..85ee730 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -77,11 +77,11 @@
#include "tracker-evolution-plugin.h"
-/* This runs in-process of evolution (in the mailer, as a EPlugin). It has
+/* This runs in-process of evolution (in the mailer, as a EPlugin). It has
* access to the CamelSession using the external variable 'session'. The header
* mail/mail-session.h makes this variable public */
-/* Note to people who are scared about this plugin using the CamelDB directly:
+/* Note to people who are scared about this plugin using the CamelDB directly:
* The code uses camel_db_clone to create a new connection to the DB. We hope
* that's sufficient for not having to lock the store instances (sqlite3 has
* its own locks, and we only clone the db_r instance, we also only ever do
@@ -213,9 +213,9 @@ camel_stream_format_text (CamelDataWrapper *dw, CamelStream *stream)
CamelMimeFilterWindows *windows = NULL;
ssize_t bytes = -1;
- if (dw->mime_type && (charset = camel_content_type_param
- (dw->mime_type, "charset")) &&
- g_ascii_strncasecmp(charset, "iso-8859-", 9) == 0)
+ if (dw->mime_type && (charset = camel_content_type_param
+ (dw->mime_type, "charset")) &&
+ g_ascii_strncasecmp(charset, "iso-8859-", 9) == 0)
{
CamelStream *null;
@@ -291,8 +291,8 @@ folder_registry_free (FolderRegistry *registry)
}
static FolderRegistry*
-folder_registry_new (const gchar *account_uri,
- CamelFolder *folder,
+folder_registry_new (const gchar *account_uri,
+ CamelFolder *folder,
TrackerEvolutionPlugin *self)
{
FolderRegistry *registry = g_slice_new (FolderRegistry);
@@ -351,19 +351,19 @@ send_sparql_commit (TrackerEvolutionPlugin *self, gboolean update)
g_free (date_s);
}
- tracker_resources_batch_commit_async (priv->client, on_replied,
+ tracker_resources_batch_commit_async (priv->client, on_replied,
g_object_ref (self));
}
}
-static void
+static void
add_contact (TrackerSparqlBuilder *sparql, const gchar *predicate, const gchar *uri, const gchar *value)
{
gchar *email_uri, *email = NULL, *fullname = NULL;
get_email_and_fullname (value, &email, &fullname);
- email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
+ email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
tracker_sparql_builder_subject_iri (sparql, email_uri);
tracker_sparql_builder_predicate (sparql, "rdf:type");
@@ -397,8 +397,8 @@ add_contact (TrackerSparqlBuilder *sparql, const gchar *predicate, const gchar *
}
static void
-process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
- time_t sent, const gchar *subject, const gchar *from, const gchar *to,
+process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
+ time_t sent, const gchar *subject, const gchar *from, const gchar *to,
const gchar *cc, const gchar *size, CamelFolder *folder, const gchar *uri)
{
gchar **arr;
@@ -491,9 +491,9 @@ process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
}
#if 0
- /* This massively slows down Evolution, we need to do this in a queue
+ /* This massively slows down Evolution, we need to do this in a queue
* instead. Therefore I'm disabling this code for now. The code does
- * a parse of each already-once-downloaded E-mail. This is obviously
+ * a parse of each already-once-downloaded E-mail. This is obviously
* excessive and expensive for the performance of Evolution. */
if (folder) {
@@ -520,10 +520,10 @@ process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (tpart));
if (!wrapper) {
- wrapper = camel_data_wrapper_new ();
+ wrapper = camel_data_wrapper_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (tpart), wrapper);
camel_object_unref (wrapper);
- }
+ }
if (wrapper->stream) {
camel_stream_reset (wrapper->stream);
@@ -555,14 +555,14 @@ process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
}
/* When new messages arrive to- or got deleted from the summary, called in
- * mainloop or by a thread (unknown, depends on Camel and Evolution code that
+ * mainloop or by a thread (unknown, depends on Camel and Evolution code that
* executes the reason why this signal gets emitted).
*
* This one is the reason why we registered all those folders during init below. */
static void
-on_folder_summary_changed (CamelFolder *folder,
- CamelFolderChangeInfo *changes,
+on_folder_summary_changed (CamelFolder *folder,
+ CamelFolderChangeInfo *changes,
gpointer user_data)
{
OnSummaryChangedInfo *info = user_data;
@@ -640,11 +640,11 @@ on_folder_summary_changed (CamelFolder *folder,
/* Camel returns a uint32, so %u */
size = g_strdup_printf ("%u", camel_message_info_size (linfo));
- /* This is not a path but a URI, don't use the
+ /* This is not a path but a URI, don't use the
* OS's directory separator here */
- uri = g_strdup_printf ("%s%s/%s",
- em_uri,
+ uri = g_strdup_printf ("%s%s/%s",
+ em_uri,
camel_folder_get_full_name (folder),
uid);
@@ -654,7 +654,7 @@ on_folder_summary_changed (CamelFolder *folder,
tracker_sparql_builder_insert_open (sparql, uri);
- process_fields (sparql, uid, flags, sent, subject,
+ process_fields (sparql, uid, flags, sent, subject,
from, to, cc, size, folder, uri);
cflags = camel_message_info_user_flags (linfo);
@@ -686,7 +686,7 @@ on_folder_summary_changed (CamelFolder *folder,
tracker_sparql_builder_predicate (sparql, "nao:propertyName");
tracker_sparql_builder_object_string (sparql, ctags->name);
-
+
tracker_sparql_builder_predicate (sparql, "nao:propertyValue");
tracker_sparql_builder_object_string (sparql, ctags->value);
@@ -718,21 +718,21 @@ on_folder_summary_changed (CamelFolder *folder,
if (changes->uid_removed && changes->uid_removed->len > 0) {
- /* The FROM uri is not exactly right here, but we just want
+ /* The FROM uri is not exactly right here, but we just want
* graph != NULL in tracker-store/tracker-writeback.c */
GString *sparql = g_string_new ("");
for (i = 0; i< changes->uid_removed->len; i++) {
- /* This is not a path but a URI, don't use the OS's
+ /* This is not a path but a URI, don't use the OS's
* directory separator here */
- g_string_append_printf (sparql, "DELETE FROM <%s%s/%s> { <%s%s/%s> a rdfs:Resource }\n ",
- em_uri,
+ g_string_append_printf (sparql, "DELETE FROM <%s%s/%s> { <%s%s/%s> a rdfs:Resource }\n ",
+ em_uri,
camel_folder_get_full_name (folder),
(char*) changes->uid_removed->pdata[i],
- em_uri,
+ em_uri,
camel_folder_get_full_name (folder),
(char*) changes->uid_removed->pdata[i]);
}
@@ -774,7 +774,7 @@ clean_many_queue (void)
}
}
-static gboolean
+static gboolean
many_idle_handler (gpointer user_data)
{
TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (user_data);
@@ -787,18 +787,18 @@ many_idle_handler (gpointer user_data)
return FALSE;
}
- for (queued_set = g_queue_pop_head (many_queue), popped = 1;
- queued_set != NULL && popped < QUEUED_SETS_PER_MAINLOOP;
+ for (queued_set = g_queue_pop_head (many_queue), popped = 1;
+ queued_set != NULL && popped < QUEUED_SETS_PER_MAINLOOP;
queued_set = g_queue_pop_head (many_queue), popped++) {
- /* During initial introduction the client-registrar might
- * decide to crash, disconnect, stop listening. That
+ /* During initial introduction the client-registrar might
+ * decide to crash, disconnect, stop listening. That
* would result in critical warnings so we start ignoring
- * as soon as service_gone has removed the registrar.
+ * as soon as service_gone has removed the registrar.
*
* We nonetheless need to handle these items to clean up
* the queue properly, of course. */
-
+
if (priv->client) {
const gchar *query;
@@ -819,10 +819,10 @@ many_idle_handler (gpointer user_data)
send_sparql_update (user_data, query);
} else {
- /* Performance improvement: remove all that had
+ /* Performance improvement: remove all that had
* this disconnected registrar from the queue */
- g_object_set (user_data, "progress",
+ g_object_set (user_data, "progress",
1.0, NULL);
clean_many_queue ();
@@ -833,7 +833,7 @@ many_idle_handler (gpointer user_data)
if (!queued_set) {
send_sparql_commit (user_data, TRUE);
- g_object_set (user_data, "progress",
+ g_object_set (user_data, "progress",
1.0, NULL);
}
@@ -859,10 +859,10 @@ start_many_handler (TrackerEvolutionPlugin *self)
/* Initial upload of more recent than last_checkout items, called in the mainloop */
static void
-introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
- CamelFolderInfo *iter,
+introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
+ CamelFolderInfo *iter,
CamelStore *store, CamelDB *cdb_r,
- gchar *account_uri,
+ gchar *account_uri,
ClientRegistry *info)
{
TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (self);
@@ -878,19 +878,19 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
/* This query is the culprint of the functionality: it fetches
* all the metadata from the summary table where modified is
* more recent than the client-registry's modseq. Note that we
- * pass time(NULL) to all methods, which is why comparing
+ * pass time(NULL) to all methods, which is why comparing
* against the modified column that Evolution > 2.25.5 stores
* works (otherwise this wouldn't work, of course).
*
* The idea is that only the changes must initially be pushed,
* not everything each time (which would be unefficient). The
- * specification (http://live.gnome.org/Evolution/Metadata)
+ * specification (http://live.gnome.org/Evolution/Metadata)
* allows this 'modseq' optimization (is in fact recommending
* it over using Cleanup() each time) */
/* TODO: add bodystructure and then prepare a full MIME structure
- * using the NMO ontology, by parsing the bodystructure.
- * Bodystructures can be found in %s_bodystructure when they
+ * using the NMO ontology, by parsing the bodystructure.
+ * Bodystructures can be found in %s_bodystructure when they
* exist (not guaranteed). In IMAP BODYSTRUCTURE format. */
query = sqlite3_mprintf ("SELECT uid, flags, read, deleted, " /* 0 - 3 */
@@ -899,9 +899,9 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
"mail_from, mail_to, mail_cc, mlist, " /* 12 - 15 */
"labels, usertags " /* 16 - 17 */
"FROM %Q "
- "WHERE modified > %"G_GUINT64_FORMAT,
+ "WHERE modified > %"G_GUINT64_FORMAT,
- iter->full_name,
+ iter->full_name,
info->last_checkout);
@@ -950,7 +950,7 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
folder = g_hash_table_lookup (priv->cached_folders, iter->full_name);
- uri = g_strdup_printf ("%s%s/%s", em_uri,
+ uri = g_strdup_printf ("%s%s/%s", em_uri,
iter->full_name, uid);
if (!sparql) {
@@ -961,8 +961,8 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
tracker_sparql_builder_insert_open (sparql, uri);
- process_fields (sparql, uid, flags, sent,
- subject, from, to, cc, size,
+ process_fields (sparql, uid, flags, sent,
+ subject, from, to, cc, size,
folder, uri);
g_static_rec_mutex_unlock (priv->mutex);
@@ -1020,7 +1020,7 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
tracker_sparql_builder_predicate (sparql, "nao:propertyName");
tracker_sparql_builder_object_string (sparql, name);
-
+
tracker_sparql_builder_predicate (sparql, "nao:propertyValue");
tracker_sparql_builder_object_string (sparql, value);
@@ -1040,7 +1040,7 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
if (count >= MAX_BEFORE_SEND) {
- /* Yield per MAX_BEFORE_SEND. This function is
+ /* Yield per MAX_BEFORE_SEND. This function is
* called as a result of a DBus call, so it runs
* in the mainloop. Therefore, yield he mainloop
* sometimes, indeed */
@@ -1062,8 +1062,8 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
/* The many_queue stuff:
* Why is this? Ah! Good question and glad you ask.
* We noticed that hammering the DBus isn't exactly
- * a truly good idea. This many-handler will
- * slow it all down to a N items per N seconds
+ * a truly good idea. This many-handler will
+ * slow it all down to a N items per N seconds
* thing. */
queued_set = g_slice_new (QueuedSet);
@@ -1078,7 +1078,7 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
start_handler = TRUE;
}
- g_queue_push_tail (many_queue,
+ g_queue_push_tail (many_queue,
queued_set);
priv->of_total++;
@@ -1106,8 +1106,8 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
sqlite3_free (query);
if (iter->child) {
- introduce_walk_folders_in_folder (self, iter->child,
- store, cdb_r,
+ introduce_walk_folders_in_folder (self, iter->child,
+ store, cdb_r,
account_uri, info);
}
@@ -1117,13 +1117,13 @@ introduce_walk_folders_in_folder (TrackerEvolutionPlugin *self,
g_free (em_uri);
}
-/* Initial notify of deletes that are more recent than last_checkout, called in
+/* Initial notify of deletes that are more recent than last_checkout, called in
* the mainloop */
static void
-introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
- CamelStore *store,
- char *account_uri,
+introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
+ CamelStore *store,
+ char *account_uri,
gpointer user_data)
{
ClientRegistry *info = user_data;
@@ -1136,7 +1136,7 @@ introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
query = sqlite3_mprintf ("SELECT uid, mailbox "
"FROM Deletes "
- "WHERE modified > %" G_GUINT64_FORMAT,
+ "WHERE modified > %" G_GUINT64_FORMAT,
info->last_checkout);
/* This creates a thread apparently */
@@ -1171,15 +1171,15 @@ introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
uid = (const gchar *) sqlite3_column_text (stmt, 0);
mailbox = (const gchar *) sqlite3_column_text (stmt, 1);
- /* This is not a path but a URI, don't use the OS's
+ /* This is not a path but a URI, don't use the OS's
* directory separator here */
- g_ptr_array_add (subjects_a, g_strdup_printf ("%s%s/%s", em_uri,
+ g_ptr_array_add (subjects_a, g_strdup_printf ("%s%s/%s", em_uri,
mailbox, uid));
if (count > MAX_BEFORE_SEND) {
- /* Yield per MAX_BEFORE_SEND. This function is
+ /* Yield per MAX_BEFORE_SEND. This function is
* called as a result of a DBus call, so it runs
* in the mainloop. Therefore, yield he mainloop
* sometimes, indeed */
@@ -1196,13 +1196,13 @@ introduce_store_deal_with_deleted (TrackerEvolutionPlugin *self,
}
if (count > 0) {
- /* The FROM uri is not exactly right here, but we just want
+ /* The FROM uri is not exactly right here, but we just want
* graph != NULL in tracker-store/tracker-writeback.c */
GString *sparql = g_string_new ("");
for (i = 0; i < subjects_a->len; i++) {
- g_string_append_printf (sparql, "DELETE FROM <%s> { <%s> a rdfs:Resource } \n",
+ g_string_append_printf (sparql, "DELETE FROM <%s> { <%s> a rdfs:Resource } \n",
(gchar *) g_ptr_array_index (subjects_a, i),
(gchar *) g_ptr_array_index (subjects_a, i));
}
@@ -1324,17 +1324,17 @@ register_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
goto not_ready;
}
- hook_id = camel_object_hook_event (folder, "folder_changed",
- CAMEL_CALLBACK (on_folder_summary_changed),
+ hook_id = camel_object_hook_event (folder, "folder_changed",
+ CAMEL_CALLBACK (on_folder_summary_changed),
registry->hook_info);
registry->hook_info->hook_id = hook_id;
g_hash_table_replace (priv->registered_folders,
- GINT_TO_POINTER (hook_id),
+ GINT_TO_POINTER (hook_id),
registry);
- g_hash_table_replace (priv->cached_folders,
- g_strdup (iter->full_name),
+ g_hash_table_replace (priv->cached_folders,
+ g_strdup (iter->full_name),
folder);
not_ready:
@@ -1352,9 +1352,9 @@ register_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
}
static void
-register_walk_folders_in_folder (TrackerEvolutionPlugin *self,
- CamelFolderInfo *iter,
- CamelStore *store,
+register_walk_folders_in_folder (TrackerEvolutionPlugin *self,
+ CamelFolderInfo *iter,
+ CamelStore *store,
gchar *account_uri)
{
TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (self);
@@ -1387,12 +1387,12 @@ register_walk_folders_in_folder (TrackerEvolutionPlugin *self,
/* This is asynchronous and hooked to the mail/ API, so nicely
* integrated with the Evolution UI application */
- mail_get_folder (iter->uri, 0, register_on_get_folder, info,
+ mail_get_folder (iter->uri, 0, register_on_get_folder, info,
mail_msg_unordered_push);
if (iter->child) {
- register_walk_folders_in_folder (self, iter->child,
- store,
+ register_walk_folders_in_folder (self, iter->child,
+ store,
account_uri);
}
@@ -1445,9 +1445,9 @@ unregister_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
}
static void
-unregister_walk_folders_in_folder (TrackerEvolutionPlugin *self,
- CamelFolderInfo *titer,
- CamelStore *store,
+unregister_walk_folders_in_folder (TrackerEvolutionPlugin *self,
+ CamelFolderInfo *titer,
+ CamelStore *store,
gchar *account_uri)
{
/* Recursively walks all the folders in store */
@@ -1462,12 +1462,12 @@ unregister_walk_folders_in_folder (TrackerEvolutionPlugin *self,
/* This is asynchronous and hooked to the mail/ API, so nicely
* integrated with the Evolution UI application */
- mail_get_folder (titer->uri, 0, unregister_on_get_folder, info,
+ mail_get_folder (titer->uri, 0, unregister_on_get_folder, info,
mail_msg_unordered_push);
if (titer->child) {
unregister_walk_folders_in_folder (self, titer->child,
- store,
+ store,
account_uri);
}
@@ -1500,11 +1500,11 @@ try_again (gpointer user_data)
TryAgainInfo *info = user_data;
IntroductionInfo *intro_info = info->intro_info;
- introduce_walk_folders_in_folder (intro_info->self,
+ introduce_walk_folders_in_folder (intro_info->self,
info->iter,
- info->store,
+ info->store,
info->cdb_r,
- intro_info->account_uri,
+ intro_info->account_uri,
intro_info->info);
return FALSE;
@@ -1531,8 +1531,8 @@ try_again_d (gpointer user_data)
}
static gboolean
-on_got_folderinfo_introduce (CamelStore *store,
- CamelFolderInfo *iter,
+on_got_folderinfo_introduce (CamelStore *store,
+ CamelFolderInfo *iter,
void *data)
{
TryAgainInfo *info = g_new0 (TryAgainInfo, 1);
@@ -1549,23 +1549,23 @@ on_got_folderinfo_introduce (CamelStore *store,
/* If a registrar is running while Evolution is starting up, we decide
* not to slow down Evolution's startup by immediately going through
* all CamelFolder instances (the UI is doing the same thing, we can
- * better allow the UI to do this first, and cache the folders that
- * way)
+ * better allow the UI to do this first, and cache the folders that
+ * way)
*
* Regretfully doesn't Evolution's plugin interfaces give me a better
* hook to detect the startup of the UI application of Evolution, else
- * it would of course be better to use that instead.
+ * it would of course be better to use that instead.
*
- * The register_count is the amount of folders that we register, a
+ * The register_count is the amount of folders that we register, a
* registry has been made asynchronous using the high-level API
* mail_get_folder, so in the callback we decrement the number, before
* the call we increment the number. If we're at zero, it means we're
- * fully initialized. If not, we wait ten seconds and retry until
+ * fully initialized. If not, we wait ten seconds and retry until
* finally we're fully initialized. (it's not as magic as it looks) */
if (register_count != 0) {
g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 10,
- try_again, info,
+ try_again, info,
try_again_d);
} else {
try_again (info);
@@ -1576,8 +1576,8 @@ on_got_folderinfo_introduce (CamelStore *store,
}
static void
-introduce_account_to (TrackerEvolutionPlugin *self,
- EAccount *account,
+introduce_account_to (TrackerEvolutionPlugin *self,
+ EAccount *account,
ClientRegistry *info)
{
CamelProvider *provider;
@@ -1626,7 +1626,7 @@ introduce_account_to (TrackerEvolutionPlugin *self,
static void
-introduce_account_to_all (TrackerEvolutionPlugin *self,
+introduce_account_to_all (TrackerEvolutionPlugin *self,
EAccount *account)
{
TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (self);
@@ -1641,7 +1641,7 @@ introduce_account_to_all (TrackerEvolutionPlugin *self,
}
static void
-introduce_accounts_to (TrackerEvolutionPlugin *self,
+introduce_accounts_to (TrackerEvolutionPlugin *self,
ClientRegistry *info)
{
TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (self);
@@ -1676,13 +1676,13 @@ register_client_second_half (ClientRegistry *info)
introduce_accounts_to (info->self, info);
- priv->registered_clients =
+ priv->registered_clients =
g_list_prepend (priv->registered_clients, info);
}
static void
-on_register_client_qry (GPtrArray *results,
- GError *error,
+on_register_client_qry (GPtrArray *results,
+ GError *error,
gpointer user_data)
{
ClientRegistry *info = user_data;
@@ -1743,14 +1743,14 @@ register_client (TrackerEvolutionPlugin *self)
query = "SELECT ?c "
"WHERE { <" DATASOURCE_URN "> nie:contentLastModified ?c }";
- tracker_resources_sparql_query_async (priv->client, query,
+ tracker_resources_sparql_query_async (priv->client, query,
on_register_client_qry,
info);
}
static void
-on_folder_created (CamelStore *store, void *event_data,
+on_folder_created (CamelStore *store, void *event_data,
StoreRegistry *registry)
{
unregister_account (registry->self, registry->account);
@@ -1759,8 +1759,8 @@ on_folder_created (CamelStore *store, void *event_data,
}
static void
-on_folder_deleted (CamelStore *store,
- void *event_data,
+on_folder_deleted (CamelStore *store,
+ void *event_data,
StoreRegistry *registry)
{
unregister_account (registry->self, registry->account);
@@ -1769,8 +1769,8 @@ on_folder_deleted (CamelStore *store,
}
static void
-on_folder_renamed (CamelStore *store,
- CamelRenameInfo *info,
+on_folder_renamed (CamelStore *store,
+ CamelRenameInfo *info,
StoreRegistry *registry)
{
unregister_account (registry->self, registry->account);
@@ -1779,8 +1779,8 @@ on_folder_renamed (CamelStore *store,
}
static StoreRegistry*
-store_registry_new (gpointer co,
- EAccount *account,
+store_registry_new (gpointer co,
+ EAccount *account,
TrackerEvolutionPlugin *self)
{
StoreRegistry *registry = g_slice_new (StoreRegistry);
@@ -1794,7 +1794,7 @@ store_registry_new (gpointer co,
}
static void
-store_registry_free (StoreRegistry *registry)
+store_registry_free (StoreRegistry *registry)
{
camel_object_remove_event (registry->store, registry->hook_id);
camel_object_unref (registry->store);
@@ -1803,8 +1803,8 @@ store_registry_free (StoreRegistry *registry)
static gboolean
-on_got_folderinfo_register (CamelStore *store,
- CamelFolderInfo *iter,
+on_got_folderinfo_register (CamelStore *store,
+ CamelFolderInfo *iter,
void *data)
{
RegisterInfo *reg_info = data;
@@ -1827,30 +1827,30 @@ on_got_folderinfo_register (CamelStore *store,
/* Hook up catching folder changes in the store */
registry = store_registry_new (store, account, self);
- hook_id = camel_object_hook_event (store, "folder_created",
- CAMEL_CALLBACK (on_folder_created),
+ hook_id = camel_object_hook_event (store, "folder_created",
+ CAMEL_CALLBACK (on_folder_created),
registry);
registry->hook_id = hook_id;
- g_hash_table_replace (priv->registered_stores,
+ g_hash_table_replace (priv->registered_stores,
GINT_TO_POINTER (hook_id),
registry);
registry = store_registry_new (store, account, self);
- hook_id = camel_object_hook_event (store, "folder_renamed",
- CAMEL_CALLBACK (on_folder_renamed),
+ hook_id = camel_object_hook_event (store, "folder_renamed",
+ CAMEL_CALLBACK (on_folder_renamed),
registry);
registry->hook_id = hook_id;
- g_hash_table_replace (priv->registered_stores,
+ g_hash_table_replace (priv->registered_stores,
GINT_TO_POINTER (hook_id),
registry);
registry = store_registry_new (store, account, self);
- hook_id = camel_object_hook_event (store, "folder_deleted",
- CAMEL_CALLBACK (on_folder_deleted),
+ hook_id = camel_object_hook_event (store, "folder_deleted",
+ CAMEL_CALLBACK (on_folder_deleted),
registry);
registry->hook_id = hook_id;
- g_hash_table_replace (priv->registered_stores,
- GINT_TO_POINTER (hook_id),
+ g_hash_table_replace (priv->registered_stores,
+ GINT_TO_POINTER (hook_id),
registry);
g_static_rec_mutex_unlock (priv->mutex);
@@ -1906,7 +1906,7 @@ register_account (TrackerEvolutionPlugin *self,
}
static gboolean
-on_got_folderinfo_unregister (CamelStore *store,
+on_got_folderinfo_unregister (CamelStore *store,
CamelFolderInfo *titer,
void *data)
{
@@ -1925,7 +1925,7 @@ on_got_folderinfo_unregister (CamelStore *store,
g_hash_table_iter_init (&iter, priv->registered_stores);
while (g_hash_table_iter_next (&iter, &key, &value)) {
- if (value == store)
+ if (value == store)
g_hash_table_iter_remove (&iter);
}
}
@@ -1977,8 +1977,8 @@ unregister_account (TrackerEvolutionPlugin *self,
}
static void
-on_account_added (EAccountList *list,
- EAccount *account,
+on_account_added (EAccountList *list,
+ EAccount *account,
TrackerEvolutionPlugin *self)
{
register_account (self, account);
@@ -1994,7 +1994,7 @@ on_account_removed (EAccountList *list,
}
static void
-on_account_changed (EAccountList *list,
+on_account_changed (EAccountList *list,
EAccount *account,
TrackerEvolutionPlugin *self)
{
@@ -2004,7 +2004,7 @@ on_account_changed (EAccountList *list,
}
static void
-disable_plugin (void)
+disable_plugin (void)
{
if (manager) {
g_object_unref (manager);
@@ -2030,7 +2030,7 @@ list_names_reply_cb (DBusGProxy *proxy,
g_warning ("%s", error->message);
g_error_free (error);
if (names)
- g_strfreev (names);
+ g_strfreev (names);
return;
}
@@ -2042,15 +2042,15 @@ list_names_reply_cb (DBusGProxy *proxy,
i++;
}
- g_strfreev (names);
+ g_strfreev (names);
}
static void
-name_owner_changed_cb (DBusGProxy *proxy,
- gchar *name,
- gchar *old_owner,
- gchar *new_owner,
+name_owner_changed_cb (DBusGProxy *proxy,
+ gchar *name,
+ gchar *old_owner,
+ gchar *new_owner,
gpointer user_data)
{
TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (user_data);
@@ -2079,7 +2079,7 @@ enable_plugin (void)
g_object_unref (manager);
}
- manager = g_object_new (TRACKER_TYPE_EVOLUTION_PLUGIN,
+ manager = g_object_new (TRACKER_TYPE_EVOLUTION_PLUGIN,
"name", "Emails", NULL);
g_signal_emit_by_name (manager, "started");
@@ -2187,7 +2187,7 @@ tracker_evolution_plugin_init (TrackerEvolutionPlugin *plugin)
goto error_handler;
}
- priv->dbus_proxy = dbus_g_proxy_new_for_name (priv->connection,
+ priv->dbus_proxy = dbus_g_proxy_new_for_name (priv->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
@@ -2204,11 +2204,11 @@ tracker_evolution_plugin_init (TrackerEvolutionPlugin *plugin)
g_object_unref (it);
- g_signal_connect (priv->accounts, "account-added",
+ g_signal_connect (priv->accounts, "account-added",
G_CALLBACK (on_account_added), plugin);
- g_signal_connect (priv->accounts, "account-removed",
+ g_signal_connect (priv->accounts, "account-removed",
G_CALLBACK (on_account_removed), plugin);
- g_signal_connect (priv->accounts, "account-changed",
+ g_signal_connect (priv->accounts, "account-changed",
G_CALLBACK (on_account_changed), plugin);
error_handler:
@@ -2249,7 +2249,7 @@ miner_started (TrackerMiner *miner)
}
dbus_g_proxy_begin_call (priv->dbus_proxy, "ListNames",
- list_names_reply_cb,
+ list_names_reply_cb,
g_object_ref (miner),
listnames_fini,
G_TYPE_INVALID,
@@ -2287,7 +2287,7 @@ miner_paused (TrackerMiner *miner)
tracker_disconnect (priv->client);
/* By setting this to NULL, events will still be catched by our
- * handlers, but the send_sparql_* calls will just ignore it.
+ * handlers, but the send_sparql_* calls will just ignore it.
* This is fine as a solution (at least for now). It allows us
* to avoid having to unregister everything and risk the chance
* of missing something (like a folder or account creation). */
@@ -2340,7 +2340,7 @@ miner_resumed (TrackerMiner *miner)
g_object_set (miner, "progress", 0.0, "status", _("Resuming"), NULL);
dbus_g_proxy_begin_call (priv->dbus_proxy, "ListNames",
- list_names_reply_cb,
+ list_names_reply_cb,
g_object_ref (miner),
resuming_fini,
G_TYPE_INVALID,
diff --git a/src/plugins/kmail/tracker-kmail-registrar.c b/src/plugins/kmail/tracker-kmail-registrar.c
index b7c478f..68cb845 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.c
+++ b/src/plugins/kmail/tracker-kmail-registrar.c
@@ -155,9 +155,9 @@ get_email_and_fullname (const gchar *line, gchar **email, gchar **fullname)
}
static void
-perform_set (TrackerKMailRegistrar *object,
- const gchar *subject,
- const GStrv predicates,
+perform_set (TrackerKMailRegistrar *object,
+ const gchar *subject,
+ const GStrv predicates,
const GStrv values)
{
guint i = 0;
@@ -199,7 +199,7 @@ perform_set (TrackerKMailRegistrar *object,
*
* I don't have predicates in Tracker's ontology for these. In
* Jürg's vstore branch we are working with Nepomuk as ontology-
- * set. Perhaps when we merge this to that branch that we can
+ * set. Perhaps when we merge this to that branch that we can
* improve this situation. */
if (g_strcmp0 (predicates[i], TRACKER_KMAIL_PREDICATE_TAG) == 0) {
@@ -233,7 +233,7 @@ perform_set (TrackerKMailRegistrar *object,
get_email_and_fullname (values[i], &email, &fullname);
- email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
+ email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
tracker_sparql_builder_subject_iri (sparql, email_uri);
tracker_sparql_builder_predicate (sparql, "rdf:type");
@@ -272,7 +272,7 @@ perform_set (TrackerKMailRegistrar *object,
get_email_and_fullname (values[i], &email, &fullname);
- email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
+ email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
tracker_sparql_builder_subject_iri (sparql, email_uri);
tracker_sparql_builder_predicate (sparql, "rdf:type");
@@ -310,7 +310,7 @@ perform_set (TrackerKMailRegistrar *object,
get_email_and_fullname (values[i], &email, &fullname);
- email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
+ email_uri = tracker_uri_printf_escaped ("mailto:%s";, email);
tracker_sparql_builder_subject_iri (sparql, email_uri);
tracker_sparql_builder_predicate (sparql, "rdf:type");
@@ -355,11 +355,11 @@ perform_set (TrackerKMailRegistrar *object,
g_object_unref (sparql);
}
-static void
-perform_unset (TrackerKMailRegistrar *object,
+static void
+perform_unset (TrackerKMailRegistrar *object,
const gchar *subject)
{
- gchar *sparql = g_strdup_printf ("DELETE FROM <%s> { <%s> a rdfs:Resource }",
+ gchar *sparql = g_strdup_printf ("DELETE FROM <%s> { <%s> a rdfs:Resource }",
subject, subject);
tracker_store_queue_sparql_update (sparql, NULL, NULL, NULL, NULL);
@@ -388,8 +388,8 @@ on_commit (gpointer user_data)
}
void
-tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
- const gchar *subject,
+tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
+ const gchar *subject,
const GStrv predicates,
const GStrv values,
const guint modseq,
@@ -407,14 +407,14 @@ tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
if (predicates && values) {
- dbus_async_return_if_fail (g_strv_length (predicates) ==
+ dbus_async_return_if_fail (g_strv_length (predicates) ==
g_strv_length (values), context);
perform_set (object, subject, predicates, values);
}
tracker_store_queue_commit (on_commit, NULL,
- GUINT_TO_POINTER (modseq),
+ GUINT_TO_POINTER (modseq),
NULL);
dbus_g_method_return (context);
@@ -423,8 +423,8 @@ tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
}
void
-tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
- const GStrv subjects,
+tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
+ const GStrv subjects,
const GPtrArray *predicates,
const GPtrArray *values,
const guint modseq,
@@ -458,7 +458,7 @@ tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
}
tracker_store_queue_commit (on_commit, NULL,
- GUINT_TO_POINTER (modseq),
+ GUINT_TO_POINTER (modseq),
NULL);
dbus_g_method_return (context);
@@ -468,8 +468,8 @@ tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
void
-tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
- const GStrv subjects,
+tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
+ const GStrv subjects,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror)
@@ -498,8 +498,8 @@ tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
}
void
-tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
- const gchar *subject,
+tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
+ const gchar *subject,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror)
@@ -523,7 +523,7 @@ tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
}
void
-tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
+tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror)
@@ -538,7 +538,7 @@ tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
perform_cleanup (object);
tracker_store_queue_commit (on_commit, NULL,
- GUINT_TO_POINTER (modseq),
+ GUINT_TO_POINTER (modseq),
NULL);
dbus_g_method_return (context);
@@ -554,9 +554,9 @@ on_manager_destroy (DBusGProxy *proxy, gpointer user_data)
}
static void
-tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
+tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
DBusGConnection *connection,
- DBusGProxy *dbus_proxy,
+ DBusGProxy *dbus_proxy,
GError **error)
{
GError *nerror = NULL;
@@ -573,12 +573,12 @@ tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
TRACKER_KMAIL_MANAGER_INTERFACE);
/* Creation of the registrar */
- if (!org_freedesktop_DBus_request_name (dbus_proxy,
+ if (!org_freedesktop_DBus_request_name (dbus_proxy,
TRACKER_KMAIL_REGISTRAR_SERVICE,
DBUS_NAME_FLAG_DO_NOT_QUEUE,
&result, &nerror)) {
- g_critical ("Could not setup D-Bus, %s in use\n",
+ g_critical ("Could not setup D-Bus, %s in use\n",
TRACKER_KMAIL_REGISTRAR_SERVICE);
if (nerror) {
@@ -592,19 +592,19 @@ tracker_kmail_push_registrar_enable (TrackerPushRegistrar *registrar,
return;
}
- object = g_object_new (TRACKER_TYPE_KMAIL_REGISTRAR,
+ object = g_object_new (TRACKER_TYPE_KMAIL_REGISTRAR,
"connection", connection, NULL);
- dbus_g_object_type_install_info (G_OBJECT_TYPE (object),
+ dbus_g_object_type_install_info (G_OBJECT_TYPE (object),
&dbus_glib_tracker_kmail_registrar_object_info);
- dbus_g_connection_register_g_object (connection,
- TRACKER_KMAIL_REGISTRAR_PATH,
+ dbus_g_connection_register_g_object (connection,
+ TRACKER_KMAIL_REGISTRAR_PATH,
object);
/* Registration of the registrar to the manager - the cast is fine and checked */
dbus_g_proxy_call_no_reply (manager_proxy, "Register",
- G_TYPE_OBJECT, object,
+ G_TYPE_OBJECT, object,
G_TYPE_UINT, (guint) tracker_data_manager_get_db_option_int64 ("KMailLastModseq"),
G_TYPE_INVALID,
G_TYPE_INVALID);
diff --git a/src/plugins/kmail/tracker-kmail-registrar.h b/src/plugins/kmail/tracker-kmail-registrar.h
index f69724e..4e99c6e 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.h
+++ b/src/plugins/kmail/tracker-kmail-registrar.h
@@ -59,31 +59,31 @@ struct TrackerKMailRegistrarClass {
GType tracker_kmail_registrar_get_type (void);
-void tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
- const gchar *subject,
+void tracker_kmail_registrar_set (TrackerKMailRegistrar *object,
+ const gchar *subject,
const GStrv predicates,
const GStrv values,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror);
-void tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
- const GStrv subjects,
+void tracker_kmail_registrar_set_many (TrackerKMailRegistrar *object,
+ const GStrv subjects,
const GPtrArray *predicates,
const GPtrArray *values,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror);
-void tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
- const GStrv subjects,
+void tracker_kmail_registrar_unset_many (TrackerKMailRegistrar *object,
+ const GStrv subjects,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror);
-void tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
- const gchar *subject,
+void tracker_kmail_registrar_unset (TrackerKMailRegistrar *object,
+ const gchar *subject,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror);
-void tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
+void tracker_kmail_registrar_cleanup (TrackerKMailRegistrar *object,
const guint modseq,
DBusGMethodInvocation *context,
GError *derror);
diff --git a/src/tracker-control/tracker-control.c b/src/tracker-control/tracker-control.c
index 8303716..cc0861a 100644
--- a/src/tracker-control/tracker-control.c
+++ b/src/tracker-control/tracker-control.c
@@ -63,7 +63,7 @@ static GOptionEntry entries[] = {
NULL },
{ "terminate", 't', 0, G_OPTION_ARG_NONE, &should_terminate,
N_("Use SIGTERM to stop all tracker processes found"),
- NULL
+ NULL
},
{ "hard-reset", 'r', 0, G_OPTION_ARG_NONE, &hard_reset,
N_("Kill all Tracker processes and remove all databases"),
@@ -103,11 +103,11 @@ get_pids (void)
return NULL;
}
- while ((name = g_dir_read_name (dir)) != NULL) {
+ while ((name = g_dir_read_name (dir)) != NULL) {
gchar c;
gboolean is_pid = TRUE;
- for (c = *name; c && c != ':' && is_pid; c++) {
+ for (c = *name; c && c != ':' && is_pid; c++) {
is_pid &= g_ascii_isdigit (c);
}
@@ -146,7 +146,7 @@ log_handler (const gchar *domain,
g_fprintf (stdout, "%s\n", message);
fflush (stdout);
break;
- }
+ }
}
static gboolean
@@ -211,7 +211,7 @@ main (int argc, char **argv)
textdomain (GETTEXT_PACKAGE);
g_type_init ();
-
+
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
@@ -254,52 +254,52 @@ main (int argc, char **argv)
(!start && !remove_config && !remove_thumbnails)) {
pids = get_pids ();
str = g_strdup_printf (tracker_dngettext (NULL,
- "Found %d PIDâ?¦",
+ "Found %d PIDâ?¦",
"Found %d PIDsâ?¦",
g_slist_length (pids)),
g_slist_length (pids));
g_print ("%s\n", str);
g_free (str);
-
+
for (l = pids; l; l = l->next) {
gchar *filename;
gchar *contents = NULL;
gchar **strv;
-
+
filename = g_build_filename ("/proc", l->data, "cmdline", NULL);
if (!g_file_get_contents (filename, &contents, NULL, &error)) {
str = g_strdup_printf (_("Could not open '%s'"), filename);
- g_printerr ("%s, %s\n",
+ g_printerr ("%s, %s\n",
str,
error ? error->message : _("no error given"));
g_free (str);
g_clear_error (&error);
g_free (contents);
g_free (filename);
-
+
continue;
}
-
+
strv = g_strsplit (contents, "^@", 2);
if (strv && strv[0]) {
gchar *basename;
-
+
basename = g_path_get_basename (strv[0]);
if (g_str_has_prefix (basename, "tracker") == TRUE &&
g_str_has_suffix (basename, "-control") == FALSE) {
pid_t pid;
-
+
pid = atoi (l->data);
str = g_strdup_printf (_("Found process ID %d for '%s'"), pid, basename);
g_print ("%s\n", str);
g_free (str);
-
+
if (should_terminate) {
if (kill (pid, SIGTERM) == -1) {
const gchar *errstr = g_strerror (errno);
-
+
str = g_strdup_printf (_("Could not terminate process %d"), pid);
- g_printerr (" %s, %s\n",
+ g_printerr (" %s, %s\n",
str,
errstr ? errstr : _("no error given"));
g_free (str);
@@ -311,9 +311,9 @@ main (int argc, char **argv)
} else if (should_kill) {
if (kill (pid, SIGKILL) == -1) {
const gchar *errstr = g_strerror (errno);
-
+
str = g_strdup_printf (_("Could not kill process %d"), pid);
- g_printerr (" %s, %s\n",
+ g_printerr (" %s, %s\n",
str,
errstr ? errstr : _("no error given"));
g_free (str);
@@ -324,10 +324,10 @@ main (int argc, char **argv)
}
}
}
-
+
g_free (basename);
}
-
+
g_strfreev (strv);
g_free (contents);
g_free (filename);
@@ -345,7 +345,7 @@ main (int argc, char **argv)
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
log_handler,
NULL);
-
+
g_log_set_default_handler (log_handler, NULL);
/* Clean up */
@@ -367,10 +367,10 @@ main (int argc, char **argv)
const gchar *suffix = ".cfg";
const gchar *home_dir;
gchar *path;
-
+
crawler = tracker_crawler_new ();
main_loop = g_main_loop_new (NULL, FALSE);
-
+
g_signal_connect (crawler, "check-file",
G_CALLBACK (crawler_check_file_cb),
&suffix);
@@ -393,7 +393,7 @@ main (int argc, char **argv)
tracker_crawler_start (crawler, file, FALSE);
g_object_unref (file);
-
+
g_main_loop_run (main_loop);
g_object_unref (crawler);
}
@@ -404,10 +404,10 @@ main (int argc, char **argv)
TrackerCrawler *crawler;
const gchar *home_dir;
gchar *path;
-
+
crawler = tracker_crawler_new ();
main_loop = g_main_loop_new (NULL, FALSE);
-
+
g_signal_connect (crawler, "check-file",
G_CALLBACK (crawler_check_file_cb),
NULL);
@@ -430,7 +430,7 @@ main (int argc, char **argv)
tracker_crawler_start (crawler, file, TRUE);
g_object_unref (file);
-
+
g_main_loop_run (main_loop);
g_object_unref (crawler);
}
@@ -441,7 +441,7 @@ main (int argc, char **argv)
manager = tracker_miner_manager_new ();
miners = tracker_miner_manager_get_available (manager);
-
+
g_print ("%s\n", _("Starting minersâ?¦"));
/* Get the status of all miners, this will start all
@@ -455,14 +455,14 @@ main (int argc, char **argv)
display_name = tracker_miner_manager_get_display_name (manager, l->data);
if (!tracker_miner_manager_get_status (manager, l->data, NULL, &progress)) {
- g_printerr (" %s: %s (%s)\n",
+ g_printerr (" %s: %s (%s)\n",
_("Failed"),
display_name,
_("Could not get miner status"));
} else {
- g_print (" %s: %s (%3.0f%%)\n",
+ g_print (" %s: %s (%3.0f%%)\n",
_("Done"),
- display_name,
+ display_name,
progress * 100);
}
diff --git a/src/tracker-extract/dummy.c b/src/tracker-extract/dummy.c
index 4ce0d85..6702014 100644
--- a/src/tracker-extract/dummy.c
+++ b/src/tracker-extract/dummy.c
@@ -31,7 +31,7 @@
#include "tracker-main.h"
/*
- * Prototype of the parsing function.
+ * Prototype of the parsing function.
*/
static void extract_dummy (const gchar *filename,
GHashTable *metadata);
@@ -56,7 +56,7 @@ extract_function (const gchar *filename,
* Open the file and do whatever you need to do with it.
*
* The extracted properties must be added to the metadata
- * hash table.
+ * hash table.
*/
g_hash_table_insert (metadata,
g_strdup ("Dummy:DummyProp"),
diff --git a/src/tracker-extract/tracker-albumart-dummy.c b/src/tracker-extract/tracker-albumart-dummy.c
index 440c47d..0ac414b 100644
--- a/src/tracker-extract/tracker-albumart-dummy.c
+++ b/src/tracker-extract/tracker-albumart-dummy.c
@@ -24,7 +24,7 @@
#include "tracker-albumart-generic.h"
gboolean
-tracker_albumart_file_to_jpeg (const gchar *filename,
+tracker_albumart_file_to_jpeg (const gchar *filename,
const gchar *target)
{
return FALSE;
diff --git a/src/tracker-extract/tracker-albumart-generic.h b/src/tracker-extract/tracker-albumart-generic.h
index 1054067..32071ac 100644
--- a/src/tracker-extract/tracker-albumart-generic.h
+++ b/src/tracker-extract/tracker-albumart-generic.h
@@ -26,9 +26,9 @@
#include <glib.h>
-G_BEGIN_DECLS
+G_BEGIN_DECLS
-gboolean tracker_albumart_file_to_jpeg (const gchar *filename,
+gboolean tracker_albumart_file_to_jpeg (const gchar *filename,
const gchar *target);
gboolean tracker_albumart_buffer_to_jpeg (const unsigned char *buffer,
size_t len,
diff --git a/src/tracker-extract/tracker-albumart-pixbuf.c b/src/tracker-extract/tracker-albumart-pixbuf.c
index cbda326..6eae43d 100644
--- a/src/tracker-extract/tracker-albumart-pixbuf.c
+++ b/src/tracker-extract/tracker-albumart-pixbuf.c
@@ -26,7 +26,7 @@
#include "tracker-albumart-generic.h"
gboolean
-tracker_albumart_file_to_jpeg (const gchar *filename,
+tracker_albumart_file_to_jpeg (const gchar *filename,
const gchar *target)
{
GdkPixbuf *pixbuf;
@@ -61,7 +61,7 @@ tracker_albumart_buffer_to_jpeg (const unsigned char *buffer,
if (g_strcmp0 (buffer_mime, "image/jpeg") == 0 ||
g_strcmp0 (buffer_mime, "JPG") == 0) {
- g_debug ("Saving album art using raw data as uri:'%s'",
+ g_debug ("Saving album art using raw data as uri:'%s'",
target);
g_file_set_contents (target, buffer, (gssize) len, NULL);
@@ -70,13 +70,13 @@ tracker_albumart_buffer_to_jpeg (const unsigned char *buffer,
GdkPixbufLoader *loader;
GError *error = NULL;
- g_debug ("Saving album art using GdkPixbufLoader for uri:'%s'",
+ g_debug ("Saving album art using GdkPixbufLoader for uri:'%s'",
target);
loader = gdk_pixbuf_loader_new ();
if (!gdk_pixbuf_loader_write (loader, buffer, len, &error)) {
- g_warning ("Could not write with GdkPixbufLoader when setting album art, %s",
+ g_warning ("Could not write with GdkPixbufLoader when setting album art, %s",
error ? error->message : "no error given");
g_clear_error (&error);
@@ -88,7 +88,7 @@ tracker_albumart_buffer_to_jpeg (const unsigned char *buffer,
pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
if (!gdk_pixbuf_save (pixbuf, target, "jpeg", &error, NULL)) {
- g_warning ("Could not save GdkPixbuf when setting album art, %s",
+ g_warning ("Could not save GdkPixbuf when setting album art, %s",
error ? error->message : "no error given");
g_clear_error (&error);
@@ -101,7 +101,7 @@ tracker_albumart_buffer_to_jpeg (const unsigned char *buffer,
g_object_unref (pixbuf);
if (!gdk_pixbuf_loader_close (loader, &error)) {
- g_warning ("Could not close GdkPixbufLoader when setting album art, %s",
+ g_warning ("Could not close GdkPixbufLoader when setting album art, %s",
error ? error->message : "no error given");
g_clear_error (&error);
}
diff --git a/src/tracker-extract/tracker-albumart-quill.cpp b/src/tracker-extract/tracker-albumart-quill.cpp
index 04f228a..f8c95a1 100644
--- a/src/tracker-extract/tracker-albumart-quill.cpp
+++ b/src/tracker-extract/tracker-albumart-quill.cpp
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
static gboolean init = FALSE;
gboolean
-tracker_albumart_file_to_jpeg (const gchar *filename,
+tracker_albumart_file_to_jpeg (const gchar *filename,
const gchar *target)
{
if (!init) {
diff --git a/src/tracker-extract/tracker-albumart.c b/src/tracker-extract/tracker-albumart.c
index b4bba0d..2f59a3f 100644
--- a/src/tracker-extract/tracker-albumart.c
+++ b/src/tracker-extract/tracker-albumart.c
@@ -65,7 +65,7 @@ static DBusGProxy *albumart_proxy;
#ifndef HAVE_STRCASESTR
static gchar *
-strcasestr (const gchar *haystack,
+strcasestr (const gchar *haystack,
const gchar *needle)
{
gchar *p;
@@ -184,7 +184,7 @@ albumart_strip_find_next_block (const gchar *original,
if (close_pos) {
*close_pos = p2 - original;
}
-
+
return TRUE;
}
}
@@ -206,9 +206,9 @@ albumart_strip_invalid_entities (const gchar *original)
const gchar *convert_chars_delimiter = " ";
const gunichar blocks[5][2] = {
{ '(', ')' },
- { '{', '}' },
- { '[', ']' },
- { '<', '>' },
+ { '{', '}' },
+ { '[', ']' },
+ { '<', '>' },
{ 0, 0 }
};
@@ -221,10 +221,10 @@ albumart_strip_invalid_entities (const gchar *original)
pos1 = -1;
pos2 = -1;
-
+
for (i = 0; blocks[i][0] != 0; i++) {
gint start, end;
-
+
/* Go through blocks, find the earliest block we can */
if (albumart_strip_find_next_block (p, blocks[i][0], blocks[i][1], &start, &end)) {
if (pos1 == -1 || start < pos1) {
@@ -233,7 +233,7 @@ albumart_strip_invalid_entities (const gchar *original)
}
}
}
-
+
/* If either are -1 we didn't find any */
if (pos1 == -1) {
/* This means no blocks were found */
@@ -251,7 +251,7 @@ albumart_strip_invalid_entities (const gchar *original)
if (*p == '\0') {
blocks_done = TRUE;
}
- }
+ }
}
/* Now convert chars to lower case */
@@ -277,7 +277,7 @@ albumart_strip_invalid_entities (const gchar *original)
g_free (str);
str = g_strjoinv (" ", strv);
g_strfreev (strv);
-
+
/* Now strip leading/trailing white space */
g_strstrip (str);
@@ -291,23 +291,23 @@ albumart_checksum_for_data (GChecksumType checksum_type,
{
GChecksum *checksum;
gchar *retval;
-
+
checksum = g_checksum_new (checksum_type);
if (!checksum) {
return NULL;
}
-
+
g_checksum_update (checksum, data, length);
retval = g_strdup (g_checksum_get_string (checksum));
g_checksum_free (checksum);
-
+
return retval;
}
static void
-albumart_get_path (const gchar *artist,
- const gchar *album,
- const gchar *prefix,
+albumart_get_path (const gchar *artist,
+ const gchar *album,
+ const gchar *prefix,
const gchar *uri,
gchar **path,
gchar **local_uri)
@@ -341,7 +341,7 @@ albumart_get_path (const gchar *artist,
if (!album) {
album_stripped = g_strdup (" ");
} else {
- album_stripped = albumart_strip_invalid_entities (album);
+ album_stripped = albumart_strip_invalid_entities (album);
}
artist_down = g_utf8_strdown (artist_stripped, -1);
@@ -350,27 +350,27 @@ albumart_get_path (const gchar *artist,
g_free (artist_stripped);
g_free (album_stripped);
- dir = g_build_filename (g_get_user_cache_dir (),
- "media-art",
+ dir = g_build_filename (g_get_user_cache_dir (),
+ "media-art",
NULL);
if (!g_file_test (dir, G_FILE_TEST_EXISTS)) {
g_mkdir_with_parents (dir, 0770);
}
- artist_checksum = albumart_checksum_for_data (G_CHECKSUM_MD5,
- (const guchar *) artist_down,
+ artist_checksum = albumart_checksum_for_data (G_CHECKSUM_MD5,
+ (const guchar *) artist_down,
strlen (artist_down));
- album_checksum = albumart_checksum_for_data (G_CHECKSUM_MD5,
- (const guchar *) album_down,
+ album_checksum = albumart_checksum_for_data (G_CHECKSUM_MD5,
+ (const guchar *) album_down,
strlen (album_down));
-
+
g_free (artist_down);
g_free (album_down);
- art_filename = g_strdup_printf ("%s-%s-%s.jpeg",
- prefix ? prefix : "album",
- artist_checksum,
+ art_filename = g_strdup_printf ("%s-%s-%s.jpeg",
+ prefix ? prefix : "album",
+ artist_checksum,
album_checksum);
if (path) {
@@ -384,7 +384,7 @@ albumart_get_path (const gchar *artist,
if (strstr (uri, "://")) {
file = g_file_new_for_uri (uri);
} else {
- file = g_file_new_for_path (uri);
+ file = g_file_new_for_path (uri);
}
parent = g_file_get_parent (file);
@@ -404,9 +404,9 @@ albumart_get_path (const gchar *artist,
g_free (album_checksum);
}
-static gboolean
-albumart_heuristic (const gchar *artist,
- const gchar *album,
+static gboolean
+albumart_heuristic (const gchar *artist,
+ const gchar *album,
const gchar *filename_uri,
const gchar *local_uri,
gboolean *copied)
@@ -437,27 +437,27 @@ albumart_heuristic (const gchar *artist,
/* Copy from local album art (.mediaartlocal) to spec */
if (local_uri) {
GFile *local_file;
-
+
local_file = g_file_new_for_uri (local_uri);
-
+
if (g_file_query_exists (local_file, NULL)) {
- g_debug ("Album art being copied from local (.mediaartlocal) file:'%s'",
+ g_debug ("Album art being copied from local (.mediaartlocal) file:'%s'",
local_uri);
- albumart_get_path (artist_stripped,
- album_stripped,
- "album", NULL,
+ albumart_get_path (artist_stripped,
+ album_stripped,
+ "album", NULL,
&target, NULL);
if (target) {
file = g_file_new_for_path (target);
-
- g_file_copy_async (local_file, file, 0, 0,
+
+ g_file_copy_async (local_file, file, 0, 0,
NULL, NULL, NULL, NULL, NULL);
-
+
g_object_unref (file);
}
g_object_unref (local_file);
-
+
if (copied) {
*copied = TRUE;
}
@@ -465,10 +465,10 @@ albumart_heuristic (const gchar *artist,
g_free (target);
g_free (artist_stripped);
g_free (album_stripped);
-
+
return TRUE;
}
-
+
g_object_unref (local_file);
}
@@ -490,7 +490,7 @@ albumart_heuristic (const gchar *artist,
dir = g_dir_open (dirname, 0, &error);
if (!dir) {
- g_debug ("Album art directory could not be opened:'%s', %s",
+ g_debug ("Album art directory could not be opened:'%s', %s",
dirname,
error ? error->message : "no error given");
@@ -508,17 +508,17 @@ albumart_heuristic (const gchar *artist,
for (name = g_dir_read_name (dir), count = 0, retval = FALSE;
name != NULL && !retval && count < 50;
name = g_dir_read_name (dir), count++) {
- if ((artist_stripped && strcasestr (name, artist_stripped)) ||
- (album_stripped && strcasestr (name, album_stripped)) ||
+ if ((artist_stripped && strcasestr (name, artist_stripped)) ||
+ (album_stripped && strcasestr (name, album_stripped)) ||
(strcasestr (name, "cover"))) {
- if (g_str_has_suffix (name, "jpeg") ||
+ if (g_str_has_suffix (name, "jpeg") ||
g_str_has_suffix (name, "jpg")) {
if (!target) {
albumart_get_path (artist_stripped,
- album_stripped,
- "album",
- NULL,
- &target,
+ album_stripped,
+ "album",
+ NULL,
+ &target,
NULL);
}
@@ -538,7 +538,7 @@ albumart_heuristic (const gchar *artist,
g_file_copy (found_file, file, 0, NULL, NULL, NULL, &error);
g_object_unref (found_file);
-
+
retval = error != NULL;
g_clear_error (&error);
}
@@ -546,11 +546,11 @@ albumart_heuristic (const gchar *artist,
gchar *found;
if (!target) {
- albumart_get_path (artist_stripped,
- album_stripped,
- "album",
- NULL,
- &target,
+ albumart_get_path (artist_stripped,
+ album_stripped,
+ "album",
+ NULL,
+ &target,
NULL);
}
@@ -569,7 +569,7 @@ albumart_heuristic (const gchar *artist,
}
g_dir_close (dir);
-
+
if (file) {
g_object_unref (file);
}
@@ -597,7 +597,7 @@ albumart_signal_queue_thumbnail (const gchar *file,
return;
}
- g_message ("Album art being signaled for thumbnail queue for file:'%s', mime:'%s'",
+ g_message ("Album art being signaled for thumbnail queue for file:'%s', mime:'%s'",
file, mime);
g_signal_emit_by_name (object, "queue-thumbnail", file, mime);
}
@@ -606,7 +606,7 @@ static gboolean
albumart_set (const unsigned char *buffer,
size_t len,
const gchar *mime,
- const gchar *artist,
+ const gchar *artist,
const gchar *album,
const gchar *uri)
{
@@ -630,9 +630,9 @@ albumart_set (const unsigned char *buffer,
static void
albumart_request_download (TrackerStorage *hal,
- const gchar *album,
- const gchar *artist,
- const gchar *local_uri,
+ const gchar *album,
+ const gchar *artist,
+ const gchar *local_uri,
const gchar *art_path)
{
GetFileInfo *info;
@@ -645,7 +645,7 @@ albumart_request_download (TrackerStorage *hal,
#ifdef HAVE_HAL
info->hal = hal ? g_object_ref (hal) : NULL;
-#else
+#else
info->hal = NULL;
#endif
@@ -671,7 +671,7 @@ albumart_request_download (TrackerStorage *hal,
dbus_g_proxy_begin_call (albumart_proxy,
"Queue",
albumart_queue_cb,
- info,
+ info,
NULL,
G_TYPE_STRING, artist,
G_TYPE_STRING, album,
@@ -682,7 +682,7 @@ albumart_request_download (TrackerStorage *hal,
static void
albumart_copy_to_local (TrackerStorage *hal,
- const gchar *filename,
+ const gchar *filename,
const gchar *local_uri)
{
GSList *removable_roots, *l;
@@ -709,7 +709,7 @@ albumart_copy_to_local (TrackerStorage *hal,
for (l = removable_roots; l; l = l->next) {
guint len;
-
+
len = strlen (l->data);
if (flen >= len && strncmp (filename, l->data, len)) {
@@ -731,7 +731,7 @@ albumart_copy_to_local (TrackerStorage *hal,
local_file = g_file_new_for_uri (local_uri);
/* We don't try to overwrite, but we also ignore all errors.
- * Such an error could be that the removable device is
+ * Such an error could be that the removable device is
* read-only. Well that's fine then ... ignore */
if (!g_file_query_exists (local_file, NULL)) {
@@ -741,10 +741,10 @@ albumart_copy_to_local (TrackerStorage *hal,
make_directory_with_parents (dirf, NULL, NULL);
g_object_unref (dirf);
- g_debug ("Copying album art from:'%s' to:'%s'",
+ g_debug ("Copying album art from:'%s' to:'%s'",
filename, local_uri);
- g_file_copy_async (from, local_file, 0, 0,
+ g_file_copy_async (from, local_file, 0, 0,
NULL, NULL, NULL, NULL, NULL);
}
@@ -784,14 +784,14 @@ albumart_queue_cb (DBusGProxy *proxy,
uri = g_filename_to_uri (info->art_path, NULL, NULL);
- g_debug ("Downloaded album art using D-Bus service for uri:'%s'",
+ g_debug ("Downloaded album art using D-Bus service for uri:'%s'",
uri);
albumart_signal_queue_thumbnail (uri, "image/jpeg");
g_free (uri);
albumart_copy_to_local (info->hal,
- info->art_path,
+ info->art_path,
info->local_uri);
}
@@ -883,9 +883,9 @@ tracker_albumart_process (const unsigned char *buffer,
g_debug ("Processing album art, buffer is %ld bytes, artist:'%s', album:'%s', filename:'%s', mime:'%s'",
(long int) len,
- artist ? artist : "",
+ artist ? artist : "",
album ? album : "",
- filename,
+ filename,
mime);
if (strstr (filename, "://")) {
@@ -894,11 +894,11 @@ tracker_albumart_process (const unsigned char *buffer,
filename_uri = g_filename_to_uri (filename, NULL, NULL);
}
- albumart_get_path (artist,
- album,
- "album",
- filename_uri,
- &art_path,
+ albumart_get_path (artist,
+ album,
+ "album",
+ filename_uri,
+ &art_path,
&local_uri);
if (!art_path) {
@@ -914,7 +914,7 @@ tracker_albumart_process (const unsigned char *buffer,
/* If we have embedded album art */
if (buffer && len > 0) {
processed = albumart_set (buffer,
- len,
+ len,
mime,
artist,
album,
@@ -931,7 +931,7 @@ tracker_albumart_process (const unsigned char *buffer,
g_object_unref (file);
g_object_unref (dirf);
- key = g_strdup_printf ("%s-%s-%s",
+ key = g_strdup_printf ("%s-%s-%s",
artist ? artist : "",
album ? album : "",
dirname ? dirname : "");
@@ -939,25 +939,25 @@ tracker_albumart_process (const unsigned char *buffer,
g_free (dirname);
if (!g_hash_table_lookup (albumart_cache, key)) {
- if (!albumart_heuristic (artist,
- album,
+ if (!albumart_heuristic (artist,
+ album,
filename_uri,
- local_uri,
+ local_uri,
NULL)) {
/* If the heuristic failed, we
* request the download the
* media-art to the media-art
* downloaders
*/
- albumart_request_download (albumart_storage,
+ albumart_request_download (albumart_storage,
artist,
album,
local_uri,
art_path);
}
- g_hash_table_insert (albumart_cache,
- key,
+ g_hash_table_insert (albumart_cache,
+ key,
GINT_TO_POINTER(TRUE));
} else {
g_free (key);
@@ -968,8 +968,8 @@ tracker_albumart_process (const unsigned char *buffer,
albumart_signal_queue_thumbnail (filename_uri, "image/jpeg");
}
} else {
- g_debug ("Album art already exists for uri:'%s' as '%s'",
- filename_uri,
+ g_debug ("Album art already exists for uri:'%s' as '%s'",
+ filename_uri,
art_path);
}
@@ -979,7 +979,7 @@ tracker_albumart_process (const unsigned char *buffer,
*/
if (g_file_test (art_path, G_FILE_TEST_EXISTS)) {
albumart_copy_to_local (albumart_storage,
- art_path,
+ art_path,
local_uri);
}
}
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index 1e24ffb..b0ed351 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -163,30 +163,30 @@ config_constructed (GObject *object)
static void
config_create_with_defaults (TrackerConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite)
{
gint i;
g_message ("Loading defaults into GKeyFile...");
-
+
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
if (!overwrite && has_key) {
continue;
}
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- g_key_file_set_integer (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_int (config,
+ g_key_file_set_integer (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_int (config,
conversions[i].property));
break;
@@ -194,11 +194,11 @@ config_create_with_defaults (TrackerConfig *config,
g_assert_not_reached ();
}
- g_key_file_set_comment (key_file,
- conversions[i].group,
- conversions[i].key,
+ g_key_file_set_comment (key_file,
+ conversions[i].group,
+ conversions[i].key,
tracker_keyfile_object_blurb (config,
- conversions[i].property),
+ conversions[i].property),
NULL);
}
}
@@ -218,18 +218,18 @@ config_load (TrackerConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (file->key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (file->key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_keyfile_object_load_int (G_OBJECT (file),
+ tracker_keyfile_object_load_int (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -260,9 +260,9 @@ config_save (TrackerConfig *config)
switch (conversions[i].type) {
case G_TYPE_INT:
tracker_keyfile_object_save_int (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
diff --git a/src/tracker-extract/tracker-exif.c b/src/tracker-extract/tracker-exif.c
index 6d84d62..7964c52 100644
--- a/src/tracker-extract/tracker-exif.c
+++ b/src/tracker-extract/tracker-exif.c
@@ -42,7 +42,7 @@
#ifndef HAVE_STRCASESTR
static gchar *
-strcasestr (const gchar *haystack,
+strcasestr (const gchar *haystack,
const gchar *needle)
{
gchar *p;
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index 86ae7b8..aab16df 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -96,7 +96,7 @@ extract_abw (const gchar *uri,
gchar *keywords = g_strdup (line + 26);
char *lasts, *keyw;
- for (keyw = strtok_r (keywords, ",; ", &lasts); keyw;
+ for (keyw = strtok_r (keywords, ",; ", &lasts); keyw;
keyw = strtok_r (NULL, ",; ", &lasts)) {
tracker_sparql_builder_predicate (metadata, "nie:keyword");
tracker_sparql_builder_object_unvalidated (metadata, keyw);
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 1080e4e..80b0003 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -103,7 +103,7 @@ typedef struct {
/* Decodebin elements and properties*/
- GstElement *bin;
+ GstElement *bin;
GList *fsinks;
gint64 duration;
@@ -620,16 +620,16 @@ dbin_dpad_cb (GstElement* e, GstPad* pad, gboolean cont, gpointer data_)
GValue val = {0, };
fsink = gst_element_factory_make ("fakesink", NULL);
-
+
/* We increase the preroll buffer so we get duration (one frame not enough)*/
g_value_init (&val, G_TYPE_INT);
- g_value_set_int (&val, 51);
+ g_value_set_int (&val, 51);
g_object_set_property (G_OBJECT (fsink), "preroll-queue-len", &val);
g_value_unset (&val);
extractor->fsinks = g_list_append (extractor->fsinks, fsink);
gst_element_set_state (fsink, GST_STATE_PAUSED);
-
+
gst_bin_add (GST_BIN (extractor->pipeline), fsink);
fsinkpad = gst_element_get_static_pad (fsink, "sink");
gst_pad_link (pad, fsinkpad);
@@ -648,7 +648,7 @@ get_media_duration (MetadataExtractor *extractor)
fmt = GST_FORMAT_TIME;
duration = -1;
-
+
if (gst_element_query_duration (extractor->pipeline,
&fmt,
&duration) &&
@@ -670,7 +670,7 @@ add_stream_tag (void *obj, void *data_)
if ((caps = GST_PAD_CAPS (fsink))) {
s = gst_caps_get_structure (caps, 0);
-
+
if (s) {
if (g_strrstr (gst_structure_get_name (s), "audio")) {
if ( ( (extractor->audio_channels != -1) &&
@@ -740,21 +740,21 @@ poll_for_ready (MetadataExtractor *extractor,
while (TRUE) {
GstMessage *message;
GstElement *src;
-
+
message = gst_bus_timed_pop (bus, timeout);
-
+
if (!message) {
g_warning ("Pipeline timed out");
return FALSE;
}
-
+
src = (GstElement*)GST_MESSAGE_SRC (message);
-
+
switch (GST_MESSAGE_TYPE (message)) {
case GST_MESSAGE_STATE_CHANGED: {
if (ready_with_state) {
GstState old, new, pending;
-
+
if (src == extractor->pipeline) {
gst_message_parse_state_changed (message, &old, &new, &pending);
if (new == state) {
@@ -799,12 +799,12 @@ poll_for_ready (MetadataExtractor *extractor,
/* Nothing to do here */
break;
}
-
+
gst_message_unref (message);
}
-
+
g_assert_not_reached ();
-
+
return FALSE;
}
@@ -812,7 +812,7 @@ static GstElement *
create_decodebin_pipeline (MetadataExtractor *extractor, const gchar *uri)
{
GstElement *pipeline = NULL;
-
+
GstElement *filesrc = NULL;
GstElement *bin = NULL;
@@ -836,11 +836,11 @@ create_decodebin_pipeline (MetadataExtractor *extractor, const gchar *uri)
return FALSE;
}
- id = g_signal_connect (G_OBJECT (bin),
+ id = g_signal_connect (G_OBJECT (bin),
"new-decoded-pad",
- G_CALLBACK (dbin_dpad_cb),
+ G_CALLBACK (dbin_dpad_cb),
extractor);
-
+
gst_bin_add (GST_BIN (pipeline), filesrc);
gst_bin_add (GST_BIN (pipeline), bin);
@@ -895,7 +895,7 @@ tracker_extract_gstreamer (const gchar *uri,
extractor->mime = type;
extractor->tagcache = NULL;
-
+
extractor->album_art_data = NULL;
extractor->album_art_size = 0;
extractor->album_art_mime = NULL;
@@ -926,7 +926,7 @@ tracker_extract_gstreamer (const gchar *uri,
if (!poll_for_ready (extractor, GST_STATE_PLAYING, FALSE, TRUE)) {
g_warning ("Error running tagreadbin");
return;
- }
+ }
} else {
if (!poll_for_ready (extractor, GST_STATE_PAUSED, TRUE, FALSE)) {
g_warning ("Error running decodebin");
@@ -946,8 +946,8 @@ tracker_extract_gstreamer (const gchar *uri,
extract_metadata (extractor, uri, metadata, &album, &scount);
- tracker_albumart_process (extractor->album_art_data,
- extractor->album_art_size,
+ tracker_albumart_process (extractor->album_art_data,
+ extractor->album_art_size,
extractor->album_art_mime,
/* g_hash_table_lookup (metadata, "Audio:Artist") */ NULL,
album,
diff --git a/src/tracker-extract/tracker-extract-imagemagick.c b/src/tracker-extract/tracker-extract-imagemagick.c
index f1a1f2c..cabe120 100644
--- a/src/tracker-extract/tracker-extract-imagemagick.c
+++ b/src/tracker-extract/tracker-extract-imagemagick.c
@@ -43,7 +43,7 @@
#define RDF_PREFIX TRACKER_RDF_PREFIX
#define RDF_TYPE RDF_PREFIX "type"
-static void extract_imagemagick (const gchar *uri,
+static void extract_imagemagick (const gchar *uri,
TrackerSparqlBuilder *metadata);
static TrackerExtractData data[] = {
@@ -52,7 +52,7 @@ static TrackerExtractData data[] = {
};
static void
-extract_imagemagick (const gchar *uri,
+extract_imagemagick (const gchar *uri,
TrackerSparqlBuilder *metadata)
{
gchar *argv[6];
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 143d720..b2cc996 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -62,7 +62,7 @@
* special cases, finding continuous space etc). We now take 5 first
* MB of the file and assume that this is enough. In theory there is
* no maximum size as someone could embed 50 gigabytes of albumart
- * there.
+ * there.
*/
#define MAX_FILE_READ 1024 * 1024 * 5
@@ -191,9 +191,9 @@ enum {
};
/* sorted array */
-static const struct {
- const char *name;
- id3v24frame frame;
+static const struct {
+ const char *name;
+ id3v24frame frame;
} id3v24_frames[] = {
{ "APIC", ID3V24_APIC },
{ "COMM", ID3V24_COMM },
@@ -215,9 +215,9 @@ static const struct {
};
/* sorted array */
-static const struct {
- const char *name;
- id3v2frame frame;
+static const struct {
+ const char *name;
+ id3v2frame frame;
} id3v2_frames[] = {
{ "COM", ID3V2_COM },
{ "PIC", ID3V2_PIC },
@@ -419,8 +419,8 @@ static gint freq_table[4][3] = {
{ 32000, 16000, 8000 }
};
-static gint spf_table[6] = {
- 48, 144, 144, 48, 144, 72
+static gint spf_table[6] = {
+ 48, 144, 144, 48, 144, 72
};
static TrackerExtractData extract_data[] = {
@@ -430,7 +430,7 @@ static TrackerExtractData extract_data[] = {
};
static char *
-read_id3v1_buffer (int fd,
+read_id3v1_buffer (int fd,
goffset size)
{
char *buffer;
@@ -452,7 +452,7 @@ read_id3v1_buffer (int fd,
}
bytes_read = 0;
-
+
while (bytes_read < ID3V1_SIZE) {
rc = read (fd,
buffer + bytes_read,
@@ -468,7 +468,7 @@ read_id3v1_buffer (int fd,
bytes_read += rc;
}
}
-
+
return buffer;
}
@@ -538,7 +538,7 @@ get_genre_number (const char *str, guint *genre)
g_free (result);
g_match_info_free (info);
return TRUE;
- }
+ }
}
g_match_info_free (info);
@@ -574,7 +574,7 @@ un_unsync (const unsigned char *source,
while (offset < size) {
*dest = source[offset];
- if ((source[offset] == 0xFF) &&
+ if ((source[offset] == 0xFF) &&
(source[offset + 1] == 0x00)) {
offset++;
new_size--;
@@ -582,13 +582,13 @@ un_unsync (const unsigned char *source,
dest++;
offset++;
}
-
+
*dest_size = new_size;
}
static char*
-get_encoding (const char *data,
- gssize size,
+get_encoding (const char *data,
+ gssize size,
gboolean *encoding_found)
{
gchar *encoding = NULL;
@@ -600,7 +600,7 @@ get_encoding (const char *data,
if (encoding_found) {
*encoding_found = FALSE;
}
-
+
#ifdef HAVE_ENCA
langs = enca_get_languages (&s);
@@ -616,7 +616,7 @@ get_encoding (const char *data,
*encoding_found = TRUE;
}
- encoding = g_strdup (enca_charset_name (eencoding.charset,
+ encoding = g_strdup (enca_charset_name (eencoding.charset,
ENCA_NAME_STYLE_ICONV));
}
@@ -651,8 +651,8 @@ convert_to_encoding (const gchar *str,
len,
to_codeset,
from_codeset,
- bytes_read,
- bytes_written,
+ bytes_read,
+ bytes_written,
&error);
if (error) {
@@ -665,8 +665,8 @@ convert_to_encoding (const gchar *str,
len,
to_codeset,
encoding,
- bytes_read,
- bytes_written,
+ bytes_read,
+ bytes_written,
error_out);
g_free (encoding);
@@ -691,7 +691,7 @@ get_id3 (const gchar *data,
if (!data) {
return FALSE;
}
-
+
if (size < 128) {
return FALSE;
}
@@ -829,7 +829,7 @@ mp3_parse_header (const gchar *data,
/* unknown layer */
return FALSE;
}
-
+
if (mpeg_ver < 3) {
idx_num = (mpeg_ver - 1) * 3 + layer_ver - 1;
} else {
@@ -901,7 +901,7 @@ mp3_parse_header (const gchar *data,
} else{
length = spfp8 * 8 * frames / (sample_rate ? sample_rate : 0xFFFFFFFF);
}
-
+
tracker_sparql_builder_predicate (metadata, "nmm:length");
tracker_sparql_builder_object_int64 (metadata, length);
}
@@ -948,7 +948,7 @@ mp3_parse (const gchar *data,
static gchar *
id3v24_text_to_utf8 (const gchar encoding,
- const gchar *text,
+ const gchar *text,
gssize len)
{
/* This byte describes the encoding
@@ -992,8 +992,8 @@ id3v24_text_to_utf8 (const gchar encoding,
}
static gchar *
-id3v2_text_to_utf8 (const gchar encoding,
- const gchar *text,
+id3v2_text_to_utf8 (const gchar encoding,
+ const gchar *text,
gssize len)
{
/* This byte describes the encoding
@@ -1114,7 +1114,7 @@ get_id3v24_tags (const gchar *data,
((data[pos+6] & 0x7F) << 7) |
((data[pos+7] & 0x7F) << 0));
- flags = (((unsigned char) (data[pos + 8]) << 8) +
+ flags = (((unsigned char) (data[pos + 8]) << 8) +
((unsigned char) (data[pos + 9])));
pos += 10;
@@ -1320,7 +1320,7 @@ get_id3v23_tags (const gchar *data,
((unsigned char)(data[pos + 6]) << 8) |
((unsigned char)(data[pos + 7]) << 0) );
- flags = (((unsigned char)(data[pos + 8]) << 8) +
+ flags = (((unsigned char)(data[pos + 8]) << 8) +
((unsigned char)(data[pos + 9])));
pos += 10;
@@ -1389,7 +1389,7 @@ get_id3v23_tags (const gchar *data,
text_desc = &data[pos + 4]; /* <text string according to encoding> $00 (00) */
text_desc_len = strlen (text_desc);
text = &data[pos + 4 + text_desc_len + 1]; /* <full text string according to encoding> */
-
+
offset = 4 + text_desc_len + 1;
word = id3v2_text_to_utf8 (text_encode, text, csize - offset);
@@ -1513,8 +1513,8 @@ get_id3v20_tags (const gchar *data,
frame = id3v2_get_frame (&data[pos]);
- csize = (((unsigned char)(data[pos + 3]) << 16) +
- ((unsigned char)(data[pos + 4]) << 8) +
+ csize = (((unsigned char)(data[pos + 3]) << 16) +
+ ((unsigned char)(data[pos + 4]) << 8) +
((unsigned char)(data[pos + 5]) ) );
pos += 6;
@@ -1887,7 +1887,7 @@ extract_mp3 (const gchar *uri,
fd = open (filename, O_RDONLY | O_NOATIME);
if (fd == -1) {
fd = open (filename, O_RDONLY);
-
+
if (fd == -1) {
return;
}
@@ -1901,11 +1901,11 @@ extract_mp3 (const gchar *uri,
#ifndef G_OS_WIN32
/* We don't use GLib's mmap because size can not be specified */
- buffer = mmap (NULL,
- buffer_size,
- PROT_READ,
- MAP_PRIVATE,
- fd,
+ buffer = mmap (NULL,
+ buffer_size,
+ PROT_READ,
+ MAP_PRIVATE,
+ fd,
0);
#endif
@@ -1921,7 +1921,7 @@ extract_mp3 (const gchar *uri,
if (!get_id3 (id3v1_buffer, ID3V1_SIZE, &md.id3v1)) {
/* Do nothing? */
}
-
+
g_free (id3v1_buffer);
/* Get other embedded tags */
@@ -1930,7 +1930,7 @@ extract_mp3 (const gchar *uri,
md.title = tracker_coalesce (4, md.id3v24.title2, md.id3v23.title2, md.id3v22.title2, md.id3v1.title);
if (!md.title) {
gchar *p;
-
+
/* use filename */
md.title = g_filename_display_basename (filename);
@@ -1940,18 +1940,18 @@ extract_mp3 (const gchar *uri,
}
}
- md.performer = tracker_coalesce (7,
+ md.performer = tracker_coalesce (7,
md.id3v24.performer1, md.id3v24.performer2,
md.id3v23.performer1, md.id3v23.performer2,
md.id3v22.performer1, md.id3v22.performer2,
md.id3v1.artist);
md.album = tracker_coalesce (4, md.id3v24.album, md.id3v23.album, md.id3v22.album, md.id3v1.album);
- md.genre = tracker_coalesce (7,
- md.id3v24.content_type, md.id3v24.title1,
+ md.genre = tracker_coalesce (7,
+ md.id3v24.content_type, md.id3v24.title1,
md.id3v23.content_type, md.id3v23.title1,
md.id3v22.content_type, md.id3v22.title1,
md.id3v1.genre);
- md.recording_time = tracker_coalesce (7,
+ md.recording_time = tracker_coalesce (7,
md.id3v24.recording_time, md.id3v24.release_time,
md.id3v23.recording_time, md.id3v23.release_time,
md.id3v22.recording_time, md.id3v22.release_time,
@@ -1959,7 +1959,7 @@ extract_mp3 (const gchar *uri,
md.publisher = tracker_coalesce (3, md.id3v24.publisher, md.id3v23.publisher, md.id3v22.publisher);
md.text = tracker_coalesce (3, md.id3v24.text, md.id3v23.text, md.id3v22.text);
md.copyright = tracker_coalesce (3, md.id3v24.copyright, md.id3v23.copyright, md.id3v22.copyright);
- md.comment = tracker_coalesce (7,
+ md.comment = tracker_coalesce (7,
md.id3v24.title3, md.id3v24.comment,
md.id3v23.title3, md.id3v23.comment,
md.id3v22.title3, md.id3v22.comment,
@@ -2081,11 +2081,11 @@ extract_mp3 (const gchar *uri,
/* Get mp3 stream info */
mp3_parse (buffer, buffer_size, audio_offset, uri, metadata, &md);
- tracker_albumart_process (md.albumart_data,
- md.albumart_size,
+ tracker_albumart_process (md.albumart_data,
+ md.albumart_size,
md.albumart_mime,
NULL,
- md.title,
+ md.title,
filename);
g_free (md.title);
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index fd57868..7ce4921 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -259,8 +259,8 @@ extract_mplayer (const gchar *uri,
if (tmp_metadata_video) {
ForeachCopyInfo info = { metadata, uri };
- g_hash_table_foreach (tmp_metadata_video,
- copy_hash_table_entry,
+ g_hash_table_foreach (tmp_metadata_video,
+ copy_hash_table_entry,
&info);
g_hash_table_unref (tmp_metadata_video);
tmp_metadata_video = NULL;
@@ -279,8 +279,8 @@ extract_mplayer (const gchar *uri,
if (tmp_metadata_audio) {
ForeachCopyInfo info = { metadata, uri };
- g_hash_table_foreach (tmp_metadata_audio,
- copy_hash_table_entry,
+ g_hash_table_foreach (tmp_metadata_audio,
+ copy_hash_table_entry,
&info);
g_hash_table_unref (tmp_metadata_audio);
tmp_metadata_audio = NULL;
diff --git a/src/tracker-extract/tracker-extract-msoffice.c b/src/tracker-extract/tracker-extract-msoffice.c
index 1dc8280..50befe4 100644
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@ -53,7 +53,7 @@
/*
-* Powerpoint files comprise of structures. Each structure contains a header.
+* Powerpoint files comprise of structures. Each structure contains a header.
* Within that header is a record type that specifies what strcture it is. It is
* called record type.
*
@@ -142,9 +142,9 @@ add_gvalue_in_metadata (TrackerSparqlBuilder *metadata,
if (s[len - 1] == '"') {
str_val = (len > 2 ? g_strndup (s + 1, len - 2) : NULL);
} else {
- /* We have a string that begins with a double
- * quote but which finishes by something
- * different... We copy the string from the
+ /* We have a string that begins with a double
+ * quote but which finishes by something
+ * different... We copy the string from the
* beginning. */
str_val = g_strdup (s);
}
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index 4ba822c..a51218e 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -265,7 +265,7 @@ text_handler (GMarkupParseContext *context,
case READ_KEYWORDS: {
gchar *keywords = g_strdup (text);
char *lasts, *keyw;
- for (keyw = strtok_r (keywords, ",; ", &lasts); keyw;
+ for (keyw = strtok_r (keywords, ",; ", &lasts); keyw;
keyw = strtok_r (NULL, ",; ", &lasts)) {
tracker_sparql_builder_predicate (metadata, "nie:keyword");
tracker_sparql_builder_object_unvalidated (metadata, keyw);
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index a8e20d4..c349937 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -184,7 +184,7 @@ extract_pdf (const gchar *uri,
document = poppler_document_new_from_file (uri, NULL, &error);
if (error) {
- g_warning ("Couldn't create PopplerDocument from uri:'%s', %s",
+ g_warning ("Couldn't create PopplerDocument from uri:'%s', %s",
uri,
error->message ? error->message : "no error given");
g_error_free (error);
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index 7c08468..e3bbf99 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -44,7 +44,7 @@
*/
#define PLAYLIST_DEFAULT_NO_TRACKS 0
-#define PLAYLIST_DEFAULT_DURATION 0
+#define PLAYLIST_DEFAULT_DURATION 0
#define NFO_PREFIX TRACKER_NFO_PREFIX
@@ -68,8 +68,8 @@ static TrackerExtractData playlist_data[] = {
{ "audio/x-scpls", extract_playlist },
{ "audio/x-pn-realaudio", extract_playlist },
{ "application/ram", extract_playlist },
- { "application/vnd.ms-wpl", extract_playlist },
- { "application/smil", extract_playlist },
+ { "application/vnd.ms-wpl", extract_playlist },
+ { "application/smil", extract_playlist },
{ "audio/x-ms-asx", extract_playlist },
{ NULL, NULL }
};
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 49701b4..8020cd8 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -60,7 +60,7 @@ typedef struct {
} PngNeedsMergeData;
typedef struct {
- gchar *author, *creator, *description, *comment, *copyright,
+ gchar *author, *creator, *description, *comment, *copyright,
*creation_time, *title, *disclaimer;
} PngData;
@@ -93,7 +93,7 @@ insert_keywords (TrackerSparqlBuilder *metadata, const gchar *uri, gchar *keywor
keywords = strchr (keywords, '"');
if (keywords)
keywords++;
- else
+ else
keywords = keyw;
len = strlen (keywords);
@@ -137,7 +137,7 @@ read_metadata (png_structp png_ptr, png_infop info_ptr, const gchar *uri, Tracke
if (g_strcmp0 ("XML:com.adobe.xmp", text_ptr[i].key) == 0) {
- /* ATM tracker_read_xmp supports setting xmp_data
+ /* ATM tracker_read_xmp supports setting xmp_data
* multiple times, keep it that way as here it's
* theoretically possible that the function gets
* called multiple times */
@@ -208,7 +208,7 @@ read_metadata (png_structp png_ptr, png_infop info_ptr, const gchar *uri, Tracke
xmp_data.description);
merge_data.date = tracker_coalesce (3, png_data.creation_time,
- xmp_data.date,
+ xmp_data.date,
xmp_data.DateTimeOriginal);
@@ -422,7 +422,7 @@ extract_png (const gchar *uri,
return;
}
- f = tracker_file_open (filename, "r", FALSE);
+ f = tracker_file_open (filename, "r", FALSE);
if (f) {
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
@@ -474,7 +474,7 @@ extract_png (const gchar *uri,
g_free (filename);
return;
}
-
+
/* Read the image. FIXME We should be able to skip this step and
* just get the info from the end. This causes some errors atm.
*/
diff --git a/src/tracker-extract/tracker-extract-ps.c b/src/tracker-extract/tracker-extract-ps.c
index cbec510..1451d68 100644
--- a/src/tracker-extract/tracker-extract-ps.c
+++ b/src/tracker-extract/tracker-extract-ps.c
@@ -179,24 +179,24 @@ date_to_iso8601 (const gchar *date)
if (date && date[1] && date[2]) {
if (date[0] == '(') {
/* we have probably a date like
- * "(18:07 Tuesday 22 May 2007)"
+ * "(18:07 Tuesday 22 May 2007)"
*/
return hour_day_str_day (date);
} else if (g_ascii_isalpha (date[0])) {
/* we have probably a date like
- * "Tue May 22 18:07:10 2007"
+ * "Tue May 22 18:07:10 2007"
*/
return day_str_month_day (date);
} else if (date[1] == ' ' || date[2] == ' ') {
/* we have probably a date like
- * "22 May 1997 18:07:10 -0600"
+ * "22 May 1997 18:07:10 -0600"
*/
return day_month_year_date (date);
} else if (date[1] == ':' || date[2] == ':') {
/* we have probably a date like
- * "6:07 PM May 22, 2007"
+ * "6:07 PM May 22, 2007"
*/
return hour_month_day_date (date);
}
@@ -214,7 +214,7 @@ extract_ps (const gchar *uri,
gchar *line;
gsize length;
gssize read_char;
-
+
filename = g_filename_from_uri (uri, NULL, NULL);
f = tracker_file_open (filename, "r", TRUE);
g_free (filename);
@@ -229,7 +229,7 @@ extract_ps (const gchar *uri,
tracker_sparql_builder_subject_iri (metadata, uri);
tracker_sparql_builder_predicate (metadata, "a");
tracker_sparql_builder_object (metadata, "nfo:PaginatedTextDocument");
-
+
while ((read_char = getline (&line, &length, f)) != -1) {
gboolean pageno_atend = FALSE;
gboolean header_finished = FALSE;
@@ -303,7 +303,7 @@ extract_ps_gz (const gchar *uri,
gboolean ptat;
const gchar *argv[4];
gchar *filename;
-
+
fd = g_file_open_tmp ("tracker-extract-ps-gunzipped.XXXXXX",
&gunzipped,
&error);
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index fd9f1b2..4d336c1 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -62,8 +62,8 @@ typedef enum {
} TagType;
typedef struct {
- gchar *camera, *title, *orientation, *copyright, *white_balance,
- *fnumber, *flash, *focal_length, *artist,
+ gchar *camera, *title, *orientation, *copyright, *white_balance,
+ *fnumber, *flash, *focal_length, *artist,
*exposure_time, *iso_speed_ratings, *date, *description,
*metering_mode, *creator, *x_dimension, *y_dimension;
} TiffNeedsMergeData;
@@ -243,7 +243,7 @@ insert_keywords (TrackerSparqlBuilder *metadata, const gchar *uri, gchar *keywor
keywords = strchr (keywords, '"');
if (keywords)
keywords++;
- else
+ else
keywords = keyw;
len = strlen (keywords);
@@ -300,7 +300,7 @@ extract_tiff (const gchar *uri, TrackerSparqlBuilder *metadata)
#ifdef HAVE_LIBIPTCDATA
if (TIFFGetField (image, TIFFTAG_RICHTIFFIPTC, &iptcSize, &iptcOffset)) {
- if (TIFFIsByteSwapped(image) != 0)
+ if (TIFFIsByteSwapped(image) != 0)
TIFFSwabArrayOfLong((uint32 *) iptcOffset,(unsigned long) iptcSize);
tracker_read_iptc (iptcOffset,
4*iptcSize,
@@ -323,36 +323,36 @@ extract_tiff (const gchar *uri, TrackerSparqlBuilder *metadata)
tiff_data.artist = get_value (image, TIFFTAG_ARTIST, TIFF_TAGTYPE_STRING);
if (!tiff_data.copyright)
tiff_data.copyright = get_value (image, TIFFTAG_COPYRIGHT, TIFF_TAGTYPE_STRING);
- if (!tiff_data.datetime)
- tiff_data.datetime = get_value (image, TIFFTAG_DATETIME, TIFF_TAGTYPE_STRING);
- if (!tiff_data.documentname)
- tiff_data.documentname = get_value (image, TIFFTAG_DOCUMENTNAME, TIFF_TAGTYPE_STRING);
- if (!tiff_data.imagedescription)
- tiff_data.imagedescription = get_value (image, TIFFTAG_IMAGEDESCRIPTION, TIFF_TAGTYPE_STRING);
- if (!tiff_data.make)
- tiff_data.make = get_value (image, TIFFTAG_MAKE, TIFF_TAGTYPE_STRING);
- if (!tiff_data.model)
- tiff_data.model = get_value (image, TIFFTAG_MODEL, TIFF_TAGTYPE_STRING);
+ if (!tiff_data.datetime)
+ tiff_data.datetime = get_value (image, TIFFTAG_DATETIME, TIFF_TAGTYPE_STRING);
+ if (!tiff_data.documentname)
+ tiff_data.documentname = get_value (image, TIFFTAG_DOCUMENTNAME, TIFF_TAGTYPE_STRING);
+ if (!tiff_data.imagedescription)
+ tiff_data.imagedescription = get_value (image, TIFFTAG_IMAGEDESCRIPTION, TIFF_TAGTYPE_STRING);
+ if (!tiff_data.make)
+ tiff_data.make = get_value (image, TIFFTAG_MAKE, TIFF_TAGTYPE_STRING);
+ if (!tiff_data.model)
+ tiff_data.model = get_value (image, TIFFTAG_MODEL, TIFF_TAGTYPE_STRING);
if (!tiff_data.orientation)
- tiff_data.orientation = get_orientation (image);
+ tiff_data.orientation = get_orientation (image);
if (TIFFGetField (image, TIFFTAG_EXIFIFD, &exifOffset)) {
if (TIFFReadEXIFDirectory (image, exifOffset)) {
if (!exif_data.exposure_time)
- exif_data.exposure_time = get_value (image, EXIFTAG_EXPOSURETIME, TIFF_TAGTYPE_DOUBLE);
+ exif_data.exposure_time = get_value (image, EXIFTAG_EXPOSURETIME, TIFF_TAGTYPE_DOUBLE);
if (!exif_data.fnumber)
- exif_data.fnumber = get_value (image, EXIFTAG_FNUMBER, TIFF_TAGTYPE_DOUBLE);
+ exif_data.fnumber = get_value (image, EXIFTAG_FNUMBER, TIFF_TAGTYPE_DOUBLE);
if (!exif_data.iso_speed_ratings)
- exif_data.iso_speed_ratings = get_value (image, EXIFTAG_ISOSPEEDRATINGS, TIFF_TAGTYPE_C16_UINT16);
+ exif_data.iso_speed_ratings = get_value (image, EXIFTAG_ISOSPEEDRATINGS, TIFF_TAGTYPE_C16_UINT16);
if (!exif_data.time_original)
- exif_data.time_original = get_value (image, EXIFTAG_DATETIMEORIGINAL, TIFF_TAGTYPE_STRING);
+ exif_data.time_original = get_value (image, EXIFTAG_DATETIMEORIGINAL, TIFF_TAGTYPE_STRING);
if (!exif_data.metering_mode)
- exif_data.metering_mode = get_metering_mode (image);
+ exif_data.metering_mode = get_metering_mode (image);
if (!exif_data.flash)
- exif_data.flash = get_flash (image);
+ exif_data.flash = get_flash (image);
if (!exif_data.focal_length)
- exif_data.focal_length = get_value (image, EXIFTAG_DATETIMEORIGINAL, TIFF_TAGTYPE_DOUBLE);
- if (!exif_data.white_balance)
+ exif_data.focal_length = get_value (image, EXIFTAG_DATETIMEORIGINAL, TIFF_TAGTYPE_DOUBLE);
+ if (!exif_data.white_balance)
exif_data.white_balance = get_white_balance (image);
}
}
@@ -397,7 +397,7 @@ extract_tiff (const gchar *uri, TrackerSparqlBuilder *metadata)
merge_data.white_balance = tracker_coalesce (2, exif_data.white_balance,
xmp_data.WhiteBalance);
-
+
merge_data.fnumber = tracker_coalesce (2, exif_data.fnumber,
xmp_data.FNumber);
@@ -420,7 +420,7 @@ extract_tiff (const gchar *uri, TrackerSparqlBuilder *metadata)
xmp_data.ISOSpeedRatings);
merge_data.date = tracker_coalesce (6, tiff_data.datetime,
- exif_data.time,
+ exif_data.time,
xmp_data.date,
iptc_data.date_created,
exif_data.time_original,
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index 587de05..f189571 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -40,7 +40,7 @@
#define NMM_PREFIX TRACKER_NMM_PREFIX
#define RDF_PREFIX TRACKER_RDF_PREFIX
-static void extract_vorbis (const char *uri,
+static void extract_vorbis (const char *uri,
TrackerSparqlBuilder *metadata);
@@ -51,9 +51,9 @@ typedef struct {
typedef struct {
gchar *title,*artist,*album,*albumartist, *trackcount, *tracknumber,
*DiscNo, *Performer, *TrackGain, *TrackPeakGain, *AlbumGain,
- *AlbumPeakGain, *date, *comment, *genre, *Codec, *CodecVersion,
- *Samplerate ,*Channels, *MBAlbumID, *MBArtistID, *MBAlbumArtistID,
- *MBTrackID, *Lyrics, *Copyright, *License, *Organization, *Location,
+ *AlbumPeakGain, *date, *comment, *genre, *Codec, *CodecVersion,
+ *Samplerate ,*Channels, *MBAlbumID, *MBArtistID, *MBAlbumArtistID,
+ *MBTrackID, *Lyrics, *Copyright, *License, *Organization, *Location,
*Publisher;
} VorbisData;
@@ -64,7 +64,7 @@ static TrackerExtractData extract_data[] = {
};
static gchar *
-ogg_get_comment (vorbis_comment *vc,
+ogg_get_comment (vorbis_comment *vc,
gchar *label)
{
gchar *tag;
@@ -208,7 +208,7 @@ extract_vorbis (const char *uri,
if (vorbis_data.TrackGain) {
/* tracker_statement_list_insert (metadata, uri, _PREFIX "", vorbis_data.); */
g_free (vorbis_data.TrackGain);
- }
+ }
if (vorbis_data.TrackPeakGain) {
/* tracker_statement_list_insert (metadata, uri, _PREFIX "", vorbis_data.); */
g_free (vorbis_data.TrackPeakGain);
diff --git a/src/tracker-extract/tracker-extract-xmp.c b/src/tracker-extract/tracker-extract-xmp.c
index 4473730..3f3d6b4 100644
--- a/src/tracker-extract/tracker-extract-xmp.c
+++ b/src/tracker-extract/tracker-extract-xmp.c
@@ -30,7 +30,7 @@
#include "tracker-main.h"
#include "tracker-xmp.h"
-static void extract_xmp (const gchar *filename,
+static void extract_xmp (const gchar *filename,
TrackerSparqlBuilder *metadata);
static TrackerExtractData data[] = {
@@ -38,7 +38,7 @@ static TrackerExtractData data[] = {
{ NULL, NULL }
};
-/* This function is used to find the URI for a file.xmp file. The point here is
+/* This function is used to find the URI for a file.xmp file. The point here is
* that the URI for file.xmp is not file:///file.xmp but instead for example
* file:///file.jpeg or file:///file.png. The reason is that file.xmp is a
* sidekick, and a sidekick doesn't describe itself, it describes another file. */
@@ -57,13 +57,13 @@ find_orig_uri (const gchar *xmp_filename)
dir = g_file_get_parent (file);
orig_info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_NAME,
- G_FILE_QUERY_INFO_NONE,
+ G_FILE_QUERY_INFO_NONE,
NULL, NULL);
filename_a = g_file_info_get_name (orig_info);
- iter = g_file_enumerate_children (dir, G_FILE_ATTRIBUTE_STANDARD_NAME,
- G_FILE_QUERY_INFO_NONE,
+ iter = g_file_enumerate_children (dir, G_FILE_ATTRIBUTE_STANDARD_NAME,
+ G_FILE_QUERY_INFO_NONE,
NULL, NULL);
if (iter) {
@@ -74,7 +74,7 @@ find_orig_uri (const gchar *xmp_filename)
const gchar *ext_a, *ext_b;
gchar *casefold_a, *casefold_b;
- /* OK, important:
+ /* OK, important:
* 1. Files can't be the same.
* 2. File names (without extension) must match
* 3. Something else? */
@@ -95,7 +95,7 @@ find_orig_uri (const gchar *xmp_filename)
g_object_unref (info);
continue;
}
-
+
/* Check extensions are not the same (i.e. same len and ext) */
if (g_strcmp0 (ext_a, ext_b) == 0) {
g_object_unref (info);
@@ -135,7 +135,7 @@ find_orig_uri (const gchar *xmp_filename)
}
static void
-extract_xmp (const gchar *uri,
+extract_xmp (const gchar *uri,
TrackerSparqlBuilder *metadata)
{
gchar *contents;
@@ -151,8 +151,8 @@ extract_xmp (const gchar *uri,
* describe itself instead, falling back to uri */
tracker_read_xmp (contents,
- length,
- orig_uri ? orig_uri : uri,
+ length,
+ orig_uri ? orig_uri : uri,
&xmp_data);
tracker_apply_xmp (metadata, uri, &xmp_data);
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 0404114..b59dcae 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -52,9 +52,9 @@ typedef struct {
gboolean force_internal_extractors;
} TrackerExtractPrivate;
-typedef struct {
+typedef struct {
const GModule *module;
- const TrackerExtractData *edata;
+ const TrackerExtractData *edata;
} ModuleData;
enum {
@@ -175,8 +175,8 @@ tracker_extract_new (gboolean disable_shutdown,
module = g_module_open (module_path, G_MODULE_BIND_LOCAL);
if (!module) {
- g_warning ("Could not load module '%s': %s",
- name,
+ g_warning ("Could not load module '%s': %s",
+ name,
g_module_error ());
g_free (module_path);
continue;
@@ -186,7 +186,7 @@ tracker_extract_new (gboolean disable_shutdown,
if (g_module_symbol (module, "tracker_get_extract_data", (gpointer *) &func)) {
ModuleData mdata;
-
+
mdata.module = module;
mdata.edata = (func) ();
@@ -247,9 +247,9 @@ get_file_metadata (TrackerExtract *extract,
if (!priv->force_internal_extractors) {
tracker_dbus_request_comment (request_id,
" Extracting with libstreamanalyzer...");
-
+
tracker_topanalyzer_extract (uri, statements, &content_type);
-
+
if (tracker_sparql_builder_get_length (statements) > 0) {
g_free (content_type);
tracker_sparql_builder_insert_close (statements);
@@ -284,16 +284,16 @@ get_file_metadata (TrackerExtract *extract,
info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- G_FILE_QUERY_INFO_NONE,
- NULL,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
&error);
-
+
if (error || !info) {
tracker_dbus_request_comment (request_id,
" Could not create GFileInfo for file size check, %s",
error ? error->message : "no error given");
g_error_free (error);
-
+
if (info) {
g_object_unref (info);
}
@@ -366,7 +366,7 @@ get_file_metadata (TrackerExtract *extract,
tracker_dbus_request_comment (request_id,
" Extracting with module:'%s'",
g_module_name ((GModule*) mdata.module));
-
+
(*edata->extract) (uri, statements);
items = tracker_sparql_builder_get_length (statements);
@@ -442,7 +442,7 @@ tracker_extract_get_pid (TrackerExtract *object,
tracker_dbus_request_new (request_id,
"D-Bus request to get PID");
-
+
value = getpid ();
tracker_dbus_request_debug (request_id,
"PID is %d", value);
@@ -477,7 +477,7 @@ tracker_extract_get_metadata (TrackerExtract *object,
" Resetting shutdown timeout");
priv = TRACKER_EXTRACT_GET_PRIVATE (object);
-
+
tracker_main_quit_timeout_reset ();
if (!priv->disable_shutdown) {
alarm (MAX_EXTRACT_TIME);
@@ -500,7 +500,7 @@ tracker_extract_get_metadata (TrackerExtract *object,
tracker_dbus_request_failed (request_id,
&actual_error,
"Could not get any metadata for uri:'%s' and mime:'%s'",
- uri,
+ uri,
mime);
dbus_g_method_return_error (context, actual_error);
g_error_free (actual_error);
diff --git a/src/tracker-extract/tracker-fts-config.c b/src/tracker-extract/tracker-fts-config.c
index b452fbf..9849f59 100644
--- a/src/tracker-extract/tracker-fts-config.c
+++ b/src/tracker-extract/tracker-fts-config.c
@@ -65,7 +65,7 @@ static void config_get_property (GObject *object,
static void config_finalize (GObject *object);
static void config_constructed (GObject *object);
static void config_create_with_defaults (TrackerFTSConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite);
static void config_load (TrackerFTSConfig *config);
@@ -210,30 +210,30 @@ config_constructed (GObject *object)
static void
config_create_with_defaults (TrackerFTSConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite)
{
gint i;
g_message ("Loading defaults into GKeyFile...");
-
+
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
if (!overwrite && has_key) {
continue;
}
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- g_key_file_set_integer (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_int (config,
+ g_key_file_set_integer (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_int (config,
conversions[i].property));
break;
@@ -242,11 +242,11 @@ config_create_with_defaults (TrackerFTSConfig *config,
break;
}
- g_key_file_set_comment (key_file,
- conversions[i].group,
- conversions[i].key,
+ g_key_file_set_comment (key_file,
+ conversions[i].group,
+ conversions[i].key,
tracker_keyfile_object_blurb (config,
- conversions[i].property),
+ conversions[i].property),
NULL);
}
}
@@ -266,18 +266,18 @@ config_load (TrackerFTSConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (file->key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (file->key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_keyfile_object_load_int (G_OBJECT (file),
+ tracker_keyfile_object_load_int (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -308,9 +308,9 @@ config_save (TrackerFTSConfig *config)
switch (conversions[i].type) {
case G_TYPE_INT:
tracker_keyfile_object_save_int (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -326,7 +326,7 @@ config_save (TrackerFTSConfig *config)
TrackerFTSConfig *
tracker_fts_config_new (void)
{
- return g_object_new (TRACKER_TYPE_FTS_CONFIG,
+ return g_object_new (TRACKER_TYPE_FTS_CONFIG,
"domain", "tracker-fts",
NULL);
}
diff --git a/src/tracker-extract/tracker-iptc.h b/src/tracker-extract/tracker-iptc.h
index ac6a817..8bb6fa7 100644
--- a/src/tracker-extract/tracker-iptc.h
+++ b/src/tracker-extract/tracker-iptc.h
@@ -25,7 +25,7 @@
#include <glib.h>
typedef struct {
- gchar *keywords, *date_created, *byline, *credit, *copyright_notice,
+ gchar *keywords, *date_created, *byline, *credit, *copyright_notice,
*image_orientation;
} TrackerIptcData;
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index d4ae7e3..6069559 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -113,7 +113,7 @@ static gboolean
quit_timeout_cb (gpointer user_data)
{
quit_timeout_id = 0;
-
+
if (!disable_shutdown) {
g_main_loop_quit (main_loop);
} else {
@@ -130,8 +130,8 @@ tracker_main_quit_timeout_reset (void)
g_source_remove (quit_timeout_id);
}
- quit_timeout_id = g_timeout_add_seconds (QUIT_TIMEOUT,
- quit_timeout_cb,
+ quit_timeout_id = g_timeout_add_seconds (QUIT_TIMEOUT,
+ quit_timeout_cb,
NULL);
}
@@ -146,7 +146,7 @@ initialize_priority (void)
* so complains if we do not check its returned value. But it
* seems that since glibc 2.2.4, nice() can return -1 on a
* successful call so we have to check value of errno too.
- * Stupid...
+ * Stupid...
*/
g_message ("Setting process priority");
@@ -166,11 +166,11 @@ initialize_directories (void)
/* NOTE: We don't create the database directories here, the
* tracker-db-manager does that for us.
*/
-
+
user_data_dir = g_build_filename (g_get_user_data_dir (),
"tracker",
NULL);
-
+
/* g_message ("Checking directory exists:'%s'", user_data_dir); */
g_mkdir_with_parents (user_data_dir, 00755);
@@ -255,7 +255,7 @@ log_handler (const gchar *domain,
g_fprintf (stdout, "%s\n", message);
fflush (stdout);
break;
- }
+ }
}
TrackerFTSConfig *
@@ -323,7 +323,7 @@ run_standalone (void)
return EXIT_SUCCESS;
}
-
+
int
main (int argc, char *argv[])
{
@@ -389,7 +389,7 @@ main (int argc, char *argv[])
/* Set conditions when we use stand alone settings */
if (filename) {
return run_standalone ();
- }
+ }
/* Initialize subsystems */
initialize_directories ();
diff --git a/src/tracker-extract/tracker-msword.cpp b/src/tracker-extract/tracker-msword.cpp
index 741860a..943e833 100644
--- a/src/tracker-extract/tracker-msword.cpp
+++ b/src/tracker-extract/tracker-msword.cpp
@@ -44,42 +44,42 @@ class TextExtractor : public TextHandler
{
public:
UString content;
- virtual void runOfText (const UString &text,
+ virtual void runOfText (const UString &text,
SharedPtr<const Word97::CHP> chp);
-};
+};
-void
-TextExtractor::runOfText (const UString &text,
+void
+TextExtractor::runOfText (const UString &text,
SharedPtr<const Word97::CHP> chp)
{
content += text;
}
-static gchar*
-ustring2utf (const UString& ustr, guint n_words)
+static gchar*
+ustring2utf (const UString& ustr, guint n_words)
{
CString cstring = ustr.cstring();
- gchar *unicode_str = g_convert (cstring.c_str (), cstring.length (),
- "UTF-8", "ISO-8859-1",
+ gchar *unicode_str = g_convert (cstring.c_str (), cstring.length (),
+ "UTF-8", "ISO-8859-1",
NULL, NULL, NULL);
- if(unicode_str) {
+ if(unicode_str) {
gchar *normalized = tracker_text_normalize (unicode_str, n_words, NULL);
g_free (unicode_str);
return normalized;
}
-
+
return NULL;
}
-gchar*
+gchar*
extract_msword_content (const gchar *uri, gint max_words)
{
gchar *filename = g_filename_from_uri (uri, NULL, NULL);
gchar *str;
-
+
if(!filename) {
return NULL;
}
@@ -103,11 +103,11 @@ extract_msword_content (const gchar *uri, gint max_words)
delete extractor;
return NULL;
}
-
+
str = ustring2utf (extractor->content, max_words);
-
+
delete extractor;
g_free (filename);
-
+
return str;
}
diff --git a/src/tracker-extract/tracker-topanalyzer.cpp b/src/tracker-extract/tracker-topanalyzer.cpp
index 048dd06..dbbb514 100644
--- a/src/tracker-extract/tracker-topanalyzer.cpp
+++ b/src/tracker-extract/tracker-topanalyzer.cpp
@@ -67,34 +67,34 @@ namespace Tracker {
void initWriterData (const Strigi::FieldRegister&);
void releaseWriterData (const Strigi::FieldRegister&);
void startAnalysis (const AnalysisResult*);
- void addText (const AnalysisResult*,
- const char* text,
+ void addText (const AnalysisResult*,
+ const char* text,
int32_t length);
- void addValue (const AnalysisResult*,
+ void addValue (const AnalysisResult*,
const RegisteredField* field,
const std::string& value);
- void addValue (const AnalysisResult*,
+ void addValue (const AnalysisResult*,
const RegisteredField* field,
- const unsigned char* data,
+ const unsigned char* data,
uint32_t size);
- void addValue (const AnalysisResult*,
+ void addValue (const AnalysisResult*,
const RegisteredField* field,
int32_t value);
- void addValue (const AnalysisResult*,
+ void addValue (const AnalysisResult*,
const RegisteredField* field,
uint32_t value);
- void addValue (const AnalysisResult*,
+ void addValue (const AnalysisResult*,
const RegisteredField* field,
double value);
void addTriplet (const std::string& subject,
- const std::string& predicate,
+ const std::string& predicate,
const std::string& object);
- void addValue (const AnalysisResult*,
+ void addValue (const AnalysisResult*,
const RegisteredField* field,
- const std::string& name,
+ const std::string& name,
const std::string& value);
void finishAnalysis (const AnalysisResult*);
- void setParams (const gchar *uri_,
+ void setParams (const gchar *uri_,
TrackerSparqlBuilder *metadata_);
gchar *content_type;
@@ -108,8 +108,8 @@ namespace Tracker {
TrackerSparqlBuilder *metadata;
};
- Tracker::TripleCollector::TripleCollector ()
- {
+ Tracker::TripleCollector::TripleCollector ()
+ {
content_type = NULL;
}
@@ -133,8 +133,8 @@ namespace Tracker {
void Tracker::TripleCollector::releaseWriterData (const Strigi::FieldRegister&) { }
void Tracker::TripleCollector::startAnalysis (const AnalysisResult* idx) { }
- void Tracker::TripleCollector::addText (const AnalysisResult* idx,
- const char* text,
+ void Tracker::TripleCollector::addText (const AnalysisResult* idx,
+ const char* text,
int32_t length)
{
tracker_statement_list_insert (metadata, idx->path().c_str(),
@@ -146,7 +146,7 @@ namespace Tracker {
{
/* const gchar *original; */
/* gchar *str, *p; */
-
+
/* original = key.c_str(); */
/* p = strrchr (original, '/'); */
@@ -169,7 +169,7 @@ namespace Tracker {
{
/* const gchar *original; */
/* gchar *str, *p; */
-
+
/* original = field->key().c_str(); */
/* p = strrchr (original, '/'); */
@@ -214,7 +214,7 @@ namespace Tracker {
/* The methods below basically just convert the C++ world to the C world
* of tracker_statement_list_insert. Nothing magical about it. */
- void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
+ void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
const RegisteredField* field,
const std::string& value)
{
@@ -229,15 +229,15 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert (metadata,
- idx->path().c_str(),
+ tracker_statement_list_insert (metadata,
+ idx->path().c_str(),
predicate,
value.c_str());
}
- void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
+ void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
const RegisteredField* field,
- const unsigned char* data,
+ const unsigned char* data,
uint32_t size )
{
const gchar *predicate = predicateMapping (field);
@@ -246,13 +246,13 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert (metadata,
+ tracker_statement_list_insert (metadata,
idx->path().c_str(),
predicate,
(const gchar*) data);
}
- void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
+ void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
const RegisteredField* field,
int32_t value)
{
@@ -262,15 +262,15 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert_with_int (metadata,
- idx->path().c_str(),
+ tracker_statement_list_insert_with_int (metadata,
+ idx->path().c_str(),
predicate,
(gint) value);
}
- void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
+ void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
const RegisteredField* field,
- uint32_t value )
+ uint32_t value )
{
const gchar *predicate = predicateMapping (field);
@@ -278,15 +278,15 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert_with_int (metadata,
+ tracker_statement_list_insert_with_int (metadata,
idx->path().c_str(),
predicate,
(gint) value);
}
- void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
+ void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
const RegisteredField* field,
- double value )
+ double value )
{
const gchar *predicate = predicateMapping (field);
@@ -294,15 +294,15 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert_with_double (metadata,
- idx->path().c_str(),
+ tracker_statement_list_insert_with_double (metadata,
+ idx->path().c_str(),
predicate,
(gdouble) value);
}
void Tracker::TripleCollector::addTriplet (const std::string& subject,
- const std::string& predicate,
- const std::string& object )
+ const std::string& predicate,
+ const std::string& object )
{
const gchar *predicate_str = predicateMapping (predicate);
@@ -310,15 +310,15 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert (metadata,
- subject.c_str(),
+ tracker_statement_list_insert (metadata,
+ subject.c_str(),
predicate_str,
object.c_str());
}
- void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
+ void Tracker::TripleCollector::addValue (const AnalysisResult* idx,
const RegisteredField* field,
- const std::string& name,
+ const std::string& name,
const std::string& value )
{
const gchar *predicate = predicateMapping (field);
@@ -332,7 +332,7 @@ namespace Tracker {
return;
}
- tracker_statement_list_insert (metadata,
+ tracker_statement_list_insert (metadata,
idx->path().c_str(),
predicate,
value.c_str());
@@ -390,8 +390,8 @@ tracker_topanalyzer_shutdown (void)
}
void
-tracker_topanalyzer_extract (const gchar *uri,
- TrackerSparqlBuilder *metadata,
+tracker_topanalyzer_extract (const gchar *uri,
+ TrackerSparqlBuilder *metadata,
gchar **content_type)
{
TrackerTopanalyzerPrivate *priv;
@@ -410,16 +410,16 @@ tracker_topanalyzer_extract (const gchar *uri,
struct stat s;
/* We use our own strategy as writer. Our writer writes to the @metadata
- * array. I decided to call it a collector because that's what its
+ * array. I decided to call it a collector because that's what its
* implementation does (collecting triples) */
priv->m_writer->setParams (uri, metadata);
stat (filename, &s);
- /* The first parameter that we pass here will influence what
+ /* The first parameter that we pass here will influence what
* idx->path() will be above. StreamAnalyzer only ever appends
* path chunks to this initial stringvalue. So if we pass
- * our://URI then idx->path will end up being:
+ * our://URI then idx->path will end up being:
*
* our://URI
* our://URI/child
@@ -435,7 +435,7 @@ tracker_topanalyzer_extract (const gchar *uri,
* not really resemble the URI. Usually it will of course.
*/
- AnalysisResult analysisresult (uri, s.st_mtime, *priv->m_writer,
+ AnalysisResult analysisresult (uri, s.st_mtime, *priv->m_writer,
*priv->streamindexer);
/* If we want a remote stream, then we implement a Stream in C++
diff --git a/src/tracker-extract/tracker-topanalyzer.h b/src/tracker-extract/tracker-topanalyzer.h
index 2903e46..999b0ab 100644
--- a/src/tracker-extract/tracker-topanalyzer.h
+++ b/src/tracker-extract/tracker-topanalyzer.h
@@ -28,8 +28,8 @@
G_BEGIN_DECLS
void tracker_topanalyzer_init (void);
-void tracker_topanalyzer_extract (const gchar *uri,
- TrackerSparqlBuilder *metadata,
+void tracker_topanalyzer_extract (const gchar *uri,
+ TrackerSparqlBuilder *metadata,
gchar **content_type);
void tracker_topanalyzer_shutdown (void);
diff --git a/src/tracker-extract/tracker-xmp.c b/src/tracker-extract/tracker-xmp.c
index 97e08e7..879089b 100644
--- a/src/tracker-extract/tracker-xmp.c
+++ b/src/tracker-extract/tracker-xmp.c
@@ -110,13 +110,13 @@ fix_white_balance (const gchar *wb)
/* We have an array, now recursively iterate over it's children. Set
* 'append' to true so that all values of the array are added under
- * one entry.
+ * one entry.
*/
-static void
+static void
tracker_xmp_iter_array (XmpPtr xmp,
const gchar *uri,
- TrackerXmpData *data,
- const gchar *schema,
+ TrackerXmpData *data,
+ const gchar *schema,
const gchar *path)
{
XmpIteratorPtr iter;
@@ -129,10 +129,10 @@ tracker_xmp_iter_array (XmpPtr xmp,
/* We have an array, now recursively iterate over it's children. Set 'append' to false so that only one item is used. */
static void
-tracker_xmp_iter_alt_text (XmpPtr xmp,
+tracker_xmp_iter_alt_text (XmpPtr xmp,
const gchar *uri,
- TrackerXmpData *data,
- const gchar *schema,
+ TrackerXmpData *data,
+ const gchar *schema,
const gchar *path)
{
XmpIteratorPtr iter;
@@ -144,12 +144,12 @@ tracker_xmp_iter_alt_text (XmpPtr xmp,
/* We have a simple element, but need to iterate over the qualifiers */
static void
-tracker_xmp_iter_simple_qual (XmpPtr xmp,
+tracker_xmp_iter_simple_qual (XmpPtr xmp,
const gchar *uri,
TrackerXmpData *data,
- const gchar *schema,
- const gchar *path,
- const gchar *value,
+ const gchar *schema,
+ const gchar *path,
+ const gchar *value,
gboolean append)
{
XmpIteratorPtr iter;
@@ -182,8 +182,8 @@ tracker_xmp_iter_simple_qual (XmpPtr xmp,
if (g_ascii_strcasecmp (qual_path, "xml:lang") == 0) {
/* Is this a language we should ignore? */
- if (g_ascii_strcasecmp (qual_value, "x-default") != 0 &&
- g_ascii_strcasecmp (qual_value, "x-repair") != 0 &&
+ if (g_ascii_strcasecmp (qual_value, "x-default") != 0 &&
+ g_ascii_strcasecmp (qual_value, "x-repair") != 0 &&
g_ascii_strcasecmp (qual_value, locale) != 0) {
ignore_element = TRUE;
break;
@@ -251,9 +251,9 @@ fix_orientation (const gchar *orientation)
static void
tracker_xmp_iter_simple (const gchar *uri,
TrackerXmpData *data,
- const gchar *schema,
- const gchar *path,
- const gchar *value,
+ const gchar *schema,
+ const gchar *path,
+ const gchar *value,
gboolean append)
{
gchar *name;
@@ -446,10 +446,10 @@ tracker_xmp_iter_simple (const gchar *uri,
* (simple, simple w/qualifiers, or an array) handler.
*/
void
-tracker_xmp_iter (XmpPtr xmp,
- XmpIteratorPtr iter,
+tracker_xmp_iter (XmpPtr xmp,
+ XmpIteratorPtr iter,
const gchar *uri,
- TrackerXmpData *data,
+ TrackerXmpData *data,
gboolean append)
{
XmpStringPtr the_schema = xmp_string_new ();
@@ -490,8 +490,8 @@ tracker_xmp_iter (XmpPtr xmp,
#endif /* HAVE_EXEMPI */
void
-tracker_read_xmp (const gchar *buffer,
- size_t len,
+tracker_read_xmp (const gchar *buffer,
+ size_t len,
const gchar *uri,
TrackerXmpData *data)
{
@@ -527,7 +527,7 @@ insert_keywords (TrackerSparqlBuilder *metadata, const gchar *uri, gchar *keywor
keywords = strchr (keywords, '"');
if (keywords)
keywords++;
- else
+ else
keywords = keyw;
len = strlen (keywords);
@@ -624,7 +624,7 @@ tracker_apply_xmp (TrackerSparqlBuilder *metadata, const gchar *uri, TrackerXmpD
}
if (xmp_data->Make || xmp_data->Model) {
- gchar *final_camera = tracker_merge (" ", 2, xmp_data->Make, xmp_data->Model);
+ gchar *final_camera = tracker_merge (" ", 2, xmp_data->Make, xmp_data->Model);
tracker_sparql_builder_predicate (metadata, "nmm:camera");
tracker_sparql_builder_object_unvalidated (metadata, final_camera);
@@ -632,7 +632,7 @@ tracker_apply_xmp (TrackerSparqlBuilder *metadata, const gchar *uri, TrackerXmpD
}
if (xmp_data->title || xmp_data->Title) {
- gchar *final_title = tracker_coalesce (2, xmp_data->title, xmp_data->Title);
+ gchar *final_title = tracker_coalesce (2, xmp_data->title, xmp_data->Title);
tracker_sparql_builder_predicate (metadata, "nie:title");
tracker_sparql_builder_object_unvalidated (metadata, final_title);
g_free (final_title);
diff --git a/src/tracker-extract/tracker-xmp.h b/src/tracker-extract/tracker-xmp.h
index 0d01760..e298b31 100644
--- a/src/tracker-extract/tracker-xmp.h
+++ b/src/tracker-extract/tracker-xmp.h
@@ -43,8 +43,8 @@ typedef struct {
} TrackerXmpData;
-void tracker_read_xmp (const gchar *buffer,
- size_t len,
+void tracker_read_xmp (const gchar *buffer,
+ size_t len,
const gchar *uri,
TrackerXmpData *data);
diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
index b3fbf89..7af17f9 100644
--- a/src/tracker-miner-fs/tracker-config.c
+++ b/src/tracker-miner-fs/tracker-config.c
@@ -69,7 +69,7 @@ typedef struct {
gboolean index_on_battery;
gboolean index_on_battery_first_time;
gboolean index_mounted_directories;
- gboolean index_removable_devices;
+ gboolean index_removable_devices;
gint low_disk_space_limit;
GSList *index_recursive_directories;
GSList *index_single_directories;
@@ -387,23 +387,23 @@ config_set_property (GObject *object,
tracker_config_set_low_disk_space_limit (TRACKER_CONFIG (object),
g_value_get_int (value));
break;
- case PROP_INDEX_RECURSIVE_DIRECTORIES:
+ case PROP_INDEX_RECURSIVE_DIRECTORIES:
tracker_config_set_index_recursive_directories (TRACKER_CONFIG (object),
g_value_get_pointer (value));
break;
- case PROP_INDEX_SINGLE_DIRECTORIES:
+ case PROP_INDEX_SINGLE_DIRECTORIES:
tracker_config_set_index_single_directories (TRACKER_CONFIG (object),
g_value_get_pointer (value));
break;
- case PROP_IGNORED_DIRECTORIES:
+ case PROP_IGNORED_DIRECTORIES:
tracker_config_set_ignored_directories (TRACKER_CONFIG (object),
g_value_get_pointer (value));
break;
- case PROP_IGNORED_DIRECTORIES_WITH_CONTENT:
+ case PROP_IGNORED_DIRECTORIES_WITH_CONTENT:
tracker_config_set_ignored_directories_with_content (TRACKER_CONFIG (object),
g_value_get_pointer (value));
break;
- case PROP_IGNORED_FILES:
+ case PROP_IGNORED_FILES:
tracker_config_set_ignored_files (TRACKER_CONFIG (object),
g_value_get_pointer (value));
break;
@@ -550,39 +550,39 @@ config_changed (TrackerConfigFile *file)
static void
config_create_with_defaults (TrackerConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite)
{
gboolean added_home_recursively = FALSE;
gint i;
g_message ("Loading defaults into GKeyFile...");
-
+
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
if (!overwrite && has_key) {
continue;
}
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- g_key_file_set_integer (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_int (config,
+ g_key_file_set_integer (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_int (config,
conversions[i].property));
break;
case G_TYPE_BOOLEAN:
- g_key_file_set_boolean (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_boolean (config,
+ g_key_file_set_boolean (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_boolean (config,
conversions[i].property));
break;
@@ -653,10 +653,10 @@ config_create_with_defaults (TrackerConfig *config,
string_list = tracker_gslist_to_string_list (paths);
g_slist_free (paths);
- g_key_file_set_string_list (key_file,
- conversions[i].group,
- conversions[i].key,
- (const gchar * const *) string_list,
+ g_key_file_set_string_list (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ (const gchar * const *) string_list,
g_strv_length (string_list));
g_strfreev (string_list);
@@ -671,37 +671,37 @@ config_create_with_defaults (TrackerConfig *config,
string_list = tracker_gslist_to_string_list (paths);
g_slist_free (paths);
- g_key_file_set_string_list (key_file,
- conversions[i].group,
- conversions[i].key,
- (const gchar * const *) string_list,
+ g_key_file_set_string_list (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ (const gchar * const *) string_list,
g_strv_length (string_list));
g_strfreev (string_list);
} else if (g_strcmp0 (conversions[i].property, "ignored-directories") == 0) {
- const gchar *string_list[] = {
+ const gchar *string_list[] = {
"po", "CVS", ".svn", ".git", "core-dumps", "lost+found",
NULL
};
- g_key_file_set_string_list (key_file,
- conversions[i].group,
- conversions[i].key,
- string_list,
+ g_key_file_set_string_list (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ string_list,
G_N_ELEMENTS (string_list));
} else if (g_strcmp0 (conversions[i].property, "ignored-directories-with-content") == 0) {
- const gchar *string_list[] = {
+ const gchar *string_list[] = {
"backup.metadata",
NULL
};
- g_key_file_set_string_list (key_file,
- conversions[i].group,
- conversions[i].key,
- string_list,
+ g_key_file_set_string_list (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ string_list,
G_N_ELEMENTS (string_list));
} else if (g_strcmp0 (conversions[i].property, "ignored-files") == 0) {
- const gchar *string_list[] = {
+ const gchar *string_list[] = {
"*~", "*.o", "*.la", "*.lo", "*.loT", "*.in",
"*.csproj", "*.m4", "*.rej", "*.gmo", "*.orig",
"*.pc", "*.omf", "*.aux", "*.tmp", "*.po",
@@ -712,18 +712,18 @@ config_create_with_defaults (TrackerConfig *config,
NULL
};
- g_key_file_set_string_list (key_file,
- conversions[i].group,
- conversions[i].key,
- string_list,
+ g_key_file_set_string_list (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ string_list,
G_N_ELEMENTS (string_list));
} else {
const gchar *string_list[] = { NULL };
- g_key_file_set_string_list (key_file,
- conversions[i].group,
- conversions[i].key,
- string_list,
+ g_key_file_set_string_list (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ string_list,
G_N_ELEMENTS (string_list));
}
@@ -733,11 +733,11 @@ config_create_with_defaults (TrackerConfig *config,
g_assert_not_reached ();
}
- g_key_file_set_comment (key_file,
- conversions[i].group,
- conversions[i].key,
+ g_key_file_set_comment (key_file,
+ conversions[i].group,
+ conversions[i].key,
tracker_keyfile_object_blurb (config,
- conversions[i].property),
+ conversions[i].property),
NULL);
}
}
@@ -840,26 +840,26 @@ config_load (TrackerConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
gboolean is_directory_list;
-
- has_key = g_key_file_has_key (file->key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (file->key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_keyfile_object_load_int (G_OBJECT (file),
+ tracker_keyfile_object_load_int (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
case G_TYPE_BOOLEAN:
- tracker_keyfile_object_load_boolean (G_OBJECT (file),
+ tracker_keyfile_object_load_boolean (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -869,10 +869,10 @@ config_load (TrackerConfig *config)
is_directory_list = TRUE;
- tracker_keyfile_object_load_string_list (G_OBJECT (file),
+ tracker_keyfile_object_load_string_list (G_OBJECT (file),
conversions[i].property,
- file->key_file,
- conversions[i].group,
+ file->key_file,
+ conversions[i].group,
conversions[i].key,
is_directory_list);
@@ -880,7 +880,7 @@ config_load (TrackerConfig *config)
strcmp (conversions[i].property, "index-single-directories") != 0) {
continue;
}
-
+
g_object_get (config, conversions[i].property, &dirs, NULL);
for (l = dirs; l; l = l->next) {
@@ -953,17 +953,17 @@ config_save (TrackerConfig *config)
switch (conversions[i].type) {
case G_TYPE_INT:
tracker_keyfile_object_save_int (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
case G_TYPE_BOOLEAN:
tracker_keyfile_object_save_boolean (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -973,7 +973,7 @@ config_save (TrackerConfig *config)
GSList *dirs, *l;
g_object_get (config, conversions[i].property, &dirs, NULL);
-
+
for (l = dirs; l; l = l->next) {
const gchar *dir;
const gchar *path_to_use;
@@ -1006,7 +1006,7 @@ config_save (TrackerConfig *config)
} else {
path_to_use = NULL;
}
-
+
if (path_to_use) {
g_free (l->data);
l->data = g_strdup (path_to_use);
@@ -1015,9 +1015,9 @@ config_save (TrackerConfig *config)
}
tracker_keyfile_object_save_string_list (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -1448,7 +1448,7 @@ tracker_config_set_low_disk_space_limit (TrackerConfig *config,
}
-void
+void
tracker_config_set_index_recursive_directories (TrackerConfig *config,
GSList *roots)
{
@@ -1458,13 +1458,13 @@ tracker_config_set_index_recursive_directories (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
+
l = priv->index_recursive_directories;
if (!roots) {
priv->index_recursive_directories = NULL;
} else {
- priv->index_recursive_directories =
+ priv->index_recursive_directories =
tracker_gslist_copy_with_string_data (roots);
}
@@ -1474,7 +1474,7 @@ tracker_config_set_index_recursive_directories (TrackerConfig *config,
g_object_notify (G_OBJECT (config), "index-recursive-directories");
}
-void
+void
tracker_config_set_index_single_directories (TrackerConfig *config,
GSList *roots)
{
@@ -1484,13 +1484,13 @@ tracker_config_set_index_single_directories (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
+
l = priv->index_single_directories;
if (!roots) {
priv->index_single_directories = NULL;
} else {
- priv->index_single_directories =
+ priv->index_single_directories =
tracker_gslist_copy_with_string_data (roots);
}
@@ -1500,7 +1500,7 @@ tracker_config_set_index_single_directories (TrackerConfig *config,
g_object_notify (G_OBJECT (config), "index-single-directories");
}
-void
+void
tracker_config_set_ignored_directories (TrackerConfig *config,
GSList *roots)
{
@@ -1510,13 +1510,13 @@ tracker_config_set_ignored_directories (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
+
l = priv->ignored_directories;
if (!roots) {
priv->ignored_directories = NULL;
} else {
- priv->ignored_directories =
+ priv->ignored_directories =
tracker_gslist_copy_with_string_data (roots);
}
@@ -1529,7 +1529,7 @@ tracker_config_set_ignored_directories (TrackerConfig *config,
g_object_notify (G_OBJECT (config), "ignored-directories");
}
-void
+void
tracker_config_set_ignored_directories_with_content (TrackerConfig *config,
GSList *roots)
{
@@ -1539,13 +1539,13 @@ tracker_config_set_ignored_directories_with_content (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
+
l = priv->ignored_directories_with_content;
if (!roots) {
priv->ignored_directories_with_content = NULL;
} else {
- priv->ignored_directories_with_content =
+ priv->ignored_directories_with_content =
tracker_gslist_copy_with_string_data (roots);
}
@@ -1565,13 +1565,13 @@ tracker_config_set_ignored_files (TrackerConfig *config,
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
+
l = priv->ignored_files;
if (!files) {
priv->ignored_files = NULL;
} else {
- priv->ignored_files =
+ priv->ignored_files =
tracker_gslist_copy_with_string_data (files);
}
diff --git a/src/tracker-miner-fs/tracker-miner-applications.c b/src/tracker-miner-fs/tracker-miner-applications.c
index 27fef50..6533fa0 100644
--- a/src/tracker-miner-fs/tracker-miner-applications.c
+++ b/src/tracker-miner-fs/tracker-miner-applications.c
@@ -100,7 +100,7 @@ miner_applications_constructed (GObject *object)
GFile *file;
G_OBJECT_CLASS (tracker_miner_applications_parent_class)->constructed (object);
-
+
file = g_file_new_for_path ("/usr/share/applications/");
tracker_miner_fs_add_directory (TRACKER_MINER_FS (object), file, TRUE);
g_object_unref (file);
@@ -353,7 +353,7 @@ miner_applications_process_file_cb (gpointer user_data)
gchar *cat_uri = tracker_uri_printf_escaped (SOFTWARE_CATEGORY_URN_PREFIX "%s", cats[i]);
/* There are also .desktop
- * files that describe these categories, but we can handle
+ * files that describe these categories, but we can handle
* preemptively creating them if we visit a app .desktop
* file that mentions one that we don't yet know about */
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 4733cbb..54c0379 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -119,10 +119,10 @@ static void low_disk_space_limit_cb (GObject *gobject,
static DBusGProxy * extractor_create_proxy (void);
static void extractor_queue_thumbnail_cb (DBusGProxy *proxy,
- const gchar *filename,
+ const gchar *filename,
const gchar *mime_type,
gpointer user_data);
-
+
static gboolean miner_files_check_file (TrackerMinerFS *fs,
GFile *file);
static gboolean miner_files_check_directory (TrackerMinerFS *fs,
@@ -185,11 +185,11 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
priv->storage = tracker_storage_new ();
g_signal_connect (priv->storage, "mount-point-added",
- G_CALLBACK (mount_point_added_cb),
+ G_CALLBACK (mount_point_added_cb),
mf);
g_signal_connect (priv->storage, "mount-point-removed",
- G_CALLBACK (mount_point_removed_cb),
+ G_CALLBACK (mount_point_removed_cb),
mf);
priv->power = tracker_power_new ();
@@ -218,13 +218,13 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
dbus_g_proxy_add_signal (priv->extractor_proxy, "QueueThumbnail",
G_TYPE_STRING,
- G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_INVALID);
dbus_g_proxy_connect_signal (priv->extractor_proxy, "QueueThumbnail",
G_CALLBACK (extractor_queue_thumbnail_cb),
NULL, NULL);
-
+
init_mount_points (mf);
}
@@ -280,7 +280,7 @@ miner_files_finalize (GObject *object)
dbus_g_proxy_disconnect_signal (priv->extractor_proxy, "QueueThumbnail",
G_CALLBACK (extractor_queue_thumbnail_cb),
NULL);
-
+
g_object_unref (priv->extractor_proxy);
g_signal_handlers_disconnect_by_func (priv->config,
@@ -416,10 +416,10 @@ miner_files_constructed (GObject *object)
for (m = mounts; m; m = m->next) {
GFile *file = g_file_new_for_path (m->data);
-
+
g_message (" Adding:'%s'", (gchar*) m->data);
tracker_miner_fs_add_directory (TRACKER_MINER_FS (mf),
- file,
+ file,
TRUE);
g_object_unref (file);
}
@@ -870,11 +870,11 @@ static gboolean
disk_space_check_cb (gpointer user_data)
{
TrackerMinerFiles *mf = user_data;
-
+
if (disk_space_check (mf)) {
/* Don't try to pause again */
if (mf->private->disk_space_pause_cookie == 0) {
- mf->private->disk_space_pause_cookie =
+ mf->private->disk_space_pause_cookie =
tracker_miner_pause (TRACKER_MINER (mf),
_("Low disk space"),
NULL);
@@ -906,7 +906,7 @@ disk_space_check_start (TrackerMinerFiles *mf)
if (limit != -1) {
g_message ("Starting disk space check for every %d seconds",
DISK_SPACE_CHECK_FREQUENCY);
- mf->private->disk_space_check_id =
+ mf->private->disk_space_check_id =
g_timeout_add_seconds (DISK_SPACE_CHECK_FREQUENCY,
disk_space_check_cb,
mf);
@@ -978,13 +978,13 @@ miner_files_check_file (TrackerMinerFS *fs,
}
basename = g_file_get_basename (file);
-
+
for (l = tracker_config_get_ignored_file_patterns (mf->private->config); l; l = l->next) {
if (g_pattern_match_string (l->data, basename)) {
goto done;
}
}
-
+
should_process = TRUE;
done:
@@ -1028,16 +1028,16 @@ miner_files_check_directory (TrackerMinerFS *fs,
/* FIXME: We need to check if the file is actually a
* config specified location before blanket ignoring
- * all hidden files.
+ * all hidden files.
*/
- allowed_directories =
+ allowed_directories =
tracker_config_get_index_recursive_directories (mf->private->config);
if (tracker_string_in_gslist (path, allowed_directories)) {
should_process = TRUE;
}
- allowed_directories =
+ allowed_directories =
tracker_config_get_index_single_directories (mf->private->config);
if (tracker_string_in_gslist (path, allowed_directories)) {
@@ -1131,9 +1131,9 @@ miner_files_monitor_directory (TrackerMinerFS *fs,
if (!tracker_config_get_enable_monitors (mf->private->config)) {
return FALSE;
}
-
+
/* Fallback to the check directory routine, since we don't
- * monitor anything we don't process.
+ * monitor anything we don't process.
*/
return miner_files_check_directory (fs, file);
}
@@ -1218,7 +1218,7 @@ extractor_create_proxy (void)
static void
extractor_queue_thumbnail_cb (DBusGProxy *proxy,
- const gchar *filename,
+ const gchar *filename,
const gchar *mime_type,
gpointer user_data)
{
diff --git a/src/tracker-miner-fs/tracker-thumbnailer.c b/src/tracker-miner-fs/tracker-thumbnailer.c
index 800615c..07a5f80 100644
--- a/src/tracker-miner-fs/tracker-thumbnailer.c
+++ b/src/tracker-miner-fs/tracker-thumbnailer.c
@@ -73,12 +73,12 @@ private_free (gpointer data)
g_slist_foreach (private->mime_types, (GFunc) g_free, NULL);
g_slist_free (private->mime_types);
-
+
g_free (private);
}
inline static gboolean
-should_be_thumbnailed (GStrv list,
+should_be_thumbnailed (GStrv list,
const gchar *mime)
{
gboolean should_thumbnail;
@@ -88,8 +88,8 @@ should_be_thumbnailed (GStrv list,
return TRUE;
}
- for (should_thumbnail = FALSE, i = 0;
- should_thumbnail == FALSE && list[i] != NULL;
+ for (should_thumbnail = FALSE, i = 0;
+ should_thumbnail == FALSE && list[i] != NULL;
i++) {
if (g_ascii_strcasecmp (list[i], mime) == 0) {
should_thumbnail = TRUE;
@@ -130,24 +130,24 @@ tracker_thumbnailer_init (void)
return FALSE;
}
- private->requester_proxy =
+ private->requester_proxy =
dbus_g_proxy_new_for_name (connection,
THUMBNAILER_SERVICE,
THUMBNAILER_PATH,
THUMBNAILER_INTERFACE);
- private->manager_proxy =
+ private->manager_proxy =
dbus_g_proxy_new_for_name (connection,
THUMBNAILER_SERVICE,
THUMBMAN_PATH,
THUMBMAN_INTERFACE);
-
+
dbus_g_proxy_call (private->manager_proxy,
- "GetSupported", &error,
+ "GetSupported", &error,
G_TYPE_INVALID,
- G_TYPE_STRV, &mime_types,
+ G_TYPE_STRV, &mime_types,
G_TYPE_INVALID);
-
+
if (error) {
g_message ("Thumbnailer service did not return supported mime types, %s",
error->message);
@@ -158,7 +158,7 @@ tracker_thumbnailer_init (void)
g_object_unref (private->requester_proxy);
private->requester_proxy = NULL;
}
-
+
if (private->manager_proxy) {
g_object_unref (private->manager_proxy);
private->manager_proxy = NULL;
@@ -166,7 +166,7 @@ tracker_thumbnailer_init (void)
return FALSE;
} else if (mime_types) {
- g_message ("Thumbnailer supports %d mime types",
+ g_message ("Thumbnailer supports %d mime types",
g_strv_length (mime_types));
private->supported_mime_types = mime_types;
@@ -211,7 +211,7 @@ tracker_thumbnailer_move (const gchar *from_uri,
g_debug ("Thumbnailer request to move uri from:'%s' to:'%s', request_id:%d...",
from_uri,
to_uri,
- private->request_id);
+ private->request_id);
if (!strstr (to_uri, "://")) {
to[0] = g_filename_to_uri (to_uri, NULL, NULL);
@@ -239,7 +239,7 @@ tracker_thumbnailer_move (const gchar *from_uri,
}
gboolean
-tracker_thumbnailer_remove (const gchar *uri,
+tracker_thumbnailer_remove (const gchar *uri,
const gchar *mime_type)
{
TrackerThumbnailerPrivate *private;
@@ -270,8 +270,8 @@ tracker_thumbnailer_remove (const gchar *uri,
g_debug ("Thumbnailer request to remove uri:'%s', request_id:%d...",
uri,
- private->request_id);
-
+ private->request_id);
+
dbus_g_proxy_call_no_reply (private->requester_proxy,
"Delete",
G_TYPE_STRV, uris,
@@ -283,7 +283,7 @@ tracker_thumbnailer_remove (const gchar *uri,
return TRUE;
}
-gboolean
+gboolean
tracker_thumbnailer_cleanup (const gchar *uri_prefix)
{
TrackerThumbnailerPrivate *private;
@@ -301,7 +301,7 @@ tracker_thumbnailer_cleanup (const gchar *uri_prefix)
g_debug ("Thumbnailer cleaning up uri:'%s', request_id:%d...",
uri_prefix,
- private->request_id);
+ private->request_id);
dbus_g_proxy_call_no_reply (private->requester_proxy,
"Cleanup",
@@ -378,7 +378,7 @@ tracker_thumbnailer_queue_send (void)
return;
}
- g_message ("Thumbnailer queue sent with %d items to thumbnailer daemon, request ID:%d...",
+ g_message ("Thumbnailer queue sent with %d items to thumbnailer daemon, request ID:%d...",
g_slist_length (private->uris),
private->request_id++);
@@ -392,7 +392,7 @@ tracker_thumbnailer_queue_send (void)
G_TYPE_UINT, 0,
G_TYPE_INVALID,
G_TYPE_INVALID);
-
+
/* Clean up newly created GStrv */
g_strfreev (uri_strv);
g_strfreev (mime_type_strv);
diff --git a/src/tracker-miner-fs/tracker-volume-cleanup.c b/src/tracker-miner-fs/tracker-volume-cleanup.c
index d3a8b80..dcdc9b7 100644
--- a/src/tracker-miner-fs/tracker-volume-cleanup.c
+++ b/src/tracker-miner-fs/tracker-volume-cleanup.c
@@ -103,7 +103,7 @@ check_for_volumes_to_cleanup (gpointer user_data)
* mount_point_uri is like <file:///media/USBStick> */
if (mount_point_uri) {
- g_message (" Cleaning up volumes with mount point:'%s'",
+ g_message (" Cleaning up volumes with mount point:'%s'",
mount_point_uri);
/* Add cleanup items here */
@@ -115,7 +115,7 @@ check_for_volumes_to_cleanup (gpointer user_data)
/* Reset volume date */
_tracker_db_result_set_get_value (result_set, 0, &value);
- volume_uri = g_value_get_string (&value);
+ volume_uri = g_value_get_string (&value);
tracker_data_update_reset_volume (volume_uri);
g_value_unset (&value);
@@ -135,7 +135,7 @@ check_for_volumes_to_cleanup (gpointer user_data)
return TRUE;
}
-void
+void
tracker_volume_cleanup_init (void)
{
TrackerCleanupPrivate *private;
@@ -158,12 +158,12 @@ tracker_volume_cleanup_init (void)
g_free (str);
private->timeout_id =
- g_timeout_add_seconds (SECONDS_PER_DAY + 1,
+ g_timeout_add_seconds (SECONDS_PER_DAY + 1,
check_for_volumes_to_cleanup,
private);
}
-void
+void
tracker_volume_cleanup_shutdown (void)
{
g_static_private_set (&private_key, NULL, NULL);
diff --git a/src/tracker-preferences/tracker-preferences.vala b/src/tracker-preferences/tracker-preferences.vala
index 0a96af4..02901f6 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -152,7 +152,7 @@ public static void add_freevalue (ListStore model) {
public static void add_dir (ListStore model)
{
- FileChooserDialog dialog = new FileChooserDialog (_("Select directory"), window,
+ FileChooserDialog dialog = new FileChooserDialog (_("Select directory"), window,
FileChooserAction.SELECT_FOLDER,
STOCK_CANCEL, ResponseType.CANCEL,
STOCK_OK, ResponseType.ACCEPT);
@@ -321,8 +321,8 @@ fill_in_model (ListStore model, SList<string> list)
static void
setup_standard_treeview (TreeView view, string title)
{
- TreeViewColumn column = new TreeViewColumn.with_attributes (title,
- new CellRendererText (),
+ TreeViewColumn column = new TreeViewColumn.with_attributes (title,
+ new CellRendererText (),
"text", 0);
view.append_column (column);
}
@@ -401,7 +401,7 @@ static int main (string[] args) {
} catch (Error e) {
stderr.printf ("Could not load UI: %s\n", e.message);
return 1;
- }
+ }
return 0;
}
diff --git a/src/tracker-search-bar/tracker-applet.c b/src/tracker-search-bar/tracker-applet.c
index 1ba4cc3..f40e5d0 100644
--- a/src/tracker-search-bar/tracker-applet.c
+++ b/src/tracker-search-bar/tracker-applet.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2009, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -43,8 +43,8 @@ static const BonoboUIVerb applet_menu_verbs [] = {
};
static void
-applet_about_cb (BonoboUIComponent *uic,
- TrackerApplet *applet,
+applet_about_cb (BonoboUIComponent *uic,
+ TrackerApplet *applet,
const gchar *verb_name)
{
GObject *object;
@@ -64,8 +64,8 @@ applet_about_cb (BonoboUIComponent *uic,
}
static gboolean
-applet_event_box_button_press_event_cb (GtkWidget *widget,
- GdkEventButton *event,
+applet_event_box_button_press_event_cb (GtkWidget *widget,
+ GdkEventButton *event,
TrackerApplet *applet)
{
if (applet->results) {
@@ -92,7 +92,7 @@ applet_entry_start_search (TrackerApplet *applet)
applet->results = tracker_results_window_new (applet->parent, text);
- tracker_results_window_popup (TRACKER_RESULTS_WINDOW (applet->results));
+ tracker_results_window_popup (TRACKER_RESULTS_WINDOW (applet->results));
} else {
g_object_set (applet->results, "query", text, NULL);
}
@@ -125,8 +125,8 @@ applet_entry_activate_cb (GtkEntry *entry,
}
static gboolean
-applet_entry_button_press_event_cb (GtkWidget *widget,
- GdkEventButton *event,
+applet_entry_button_press_event_cb (GtkWidget *widget,
+ GdkEventButton *event,
TrackerApplet *applet)
{
panel_applet_request_focus (PANEL_APPLET (applet->parent), event->time);
@@ -135,8 +135,8 @@ applet_entry_button_press_event_cb (GtkWidget *widget,
}
static gboolean
-applet_entry_key_press_event_cb (GtkWidget *widget,
- GdkEventKey *event,
+applet_entry_key_press_event_cb (GtkWidget *widget,
+ GdkEventKey *event,
TrackerApplet *applet)
{
if (event->keyval == GDK_Escape) {
@@ -157,9 +157,9 @@ applet_entry_key_press_event_cb (GtkWidget *widget,
g_source_remove (applet->new_search_id);
}
- applet->new_search_id =
- g_timeout_add (300,
- applet_entry_start_search_cb,
+ applet->new_search_id =
+ g_timeout_add (300,
+ applet_entry_start_search_cb,
applet);
}
@@ -174,7 +174,7 @@ applet_draw (gpointer user_data)
if (applet->box) {
gtk_widget_destroy (applet->box);
}
-
+
switch (applet->orient) {
case GTK_ORIENTATION_VERTICAL:
applet->box = gtk_vbox_new (FALSE, 0);
@@ -185,7 +185,7 @@ applet_draw (gpointer user_data)
default:
g_assert_not_reached ();
break;
- }
+ }
gtk_container_add (GTK_CONTAINER (PANEL_APPLET (applet->parent)), applet->box);
gtk_widget_show (applet->box);
@@ -195,8 +195,8 @@ applet_draw (gpointer user_data)
gtk_widget_show (applet->event_box);
gtk_box_pack_start (GTK_BOX (applet->box), applet->event_box, FALSE, FALSE, 0);
- g_signal_connect (applet->event_box,
- "button_press_event",
+ g_signal_connect (applet->event_box,
+ "button_press_event",
G_CALLBACK (applet_event_box_button_press_event_cb), applet);
applet->image = gtk_image_new ();
@@ -209,16 +209,16 @@ applet_draw (gpointer user_data)
applet->entry = gtk_entry_new ();
gtk_box_pack_start (GTK_BOX (applet->box), applet->entry, TRUE, TRUE, 0);
gtk_entry_set_width_chars (GTK_ENTRY (applet->entry), 12);
- gtk_widget_show (applet->entry);
+ gtk_widget_show (applet->entry);
- g_signal_connect (applet->entry,
+ g_signal_connect (applet->entry,
"activate",
G_CALLBACK (applet_entry_activate_cb), applet);
- g_signal_connect (applet->entry,
- "button_press_event",
+ g_signal_connect (applet->entry,
+ "button_press_event",
G_CALLBACK (applet_entry_button_press_event_cb), applet);
- g_signal_connect (applet->entry,
- "key_press_event",
+ g_signal_connect (applet->entry,
+ "key_press_event",
G_CALLBACK (applet_entry_key_press_event_cb), applet);
applet->idle_draw_id = 0;
@@ -285,18 +285,18 @@ applet_size_allocate_cb (GtkWidget *widget,
if (applet->size != new_size) {
applet->size = new_size;
-
+
gtk_image_set_pixel_size (GTK_IMAGE (applet->image), applet->size - 2);
-
+
/* re-scale the icon, if it was found */
if (applet->icon) {
GdkPixbuf *scaled;
-
+
scaled = gdk_pixbuf_scale_simple (applet->icon,
applet->size - 5,
applet->size - 5,
GDK_INTERP_BILINEAR);
-
+
gtk_image_set_from_pixbuf (GTK_IMAGE (applet->image), scaled);
g_object_unref (scaled);
}
@@ -305,7 +305,7 @@ applet_size_allocate_cb (GtkWidget *widget,
}
static void
-applet_destroy_cb (BonoboObject *object,
+applet_destroy_cb (BonoboObject *object,
TrackerApplet *applet)
{
if (applet->builder) {
@@ -356,7 +356,7 @@ applet_new (PanelApplet *parent_applet)
}
g_print ("Added builder file:'%s'\n", filename);
-
+
applet = g_new0 (TrackerApplet, 1);
applet->parent = GTK_WIDGET (parent_applet);
@@ -370,7 +370,7 @@ applet_new (PanelApplet *parent_applet)
applet_queue_draw (applet);
- panel_applet_set_flags (PANEL_APPLET (applet->parent),
+ panel_applet_set_flags (PANEL_APPLET (applet->parent),
PANEL_APPLET_EXPAND_MINOR);
panel_applet_set_background_widget (PANEL_APPLET (applet->parent),
GTK_WIDGET (applet->parent));
@@ -380,7 +380,7 @@ applet_new (PanelApplet *parent_applet)
PKGDATADIR "/GNOME_Search_Bar_Applet.xml",
NULL,
applet_menu_verbs,
- applet);
+ applet);
gtk_widget_show (applet->parent);
@@ -401,8 +401,8 @@ applet_new (PanelApplet *parent_applet)
* of the applet.
*/
static gboolean
-applet_factory (PanelApplet *applet,
- const gchar *iid,
+applet_factory (PanelApplet *applet,
+ const gchar *iid,
gpointer data)
{
if (!strcmp (iid, "OAFIID:GNOME_Search_Bar_Applet")) {
diff --git a/src/tracker-search-bar/tracker-results-window.c b/src/tracker-search-bar/tracker-results-window.c
index df6aec6..73b1300 100644
--- a/src/tracker-search-bar/tracker-results-window.c
+++ b/src/tracker-search-bar/tracker-results-window.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* Copyright (C) 2009, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -357,7 +357,7 @@ tree_view_row_activated_cb (GtkTreeView *treeview,
GError *error = NULL;
success = g_spawn_command_line_async (link, &error);
-
+
if (error) {
g_critical ("Could not launch command line:'%s', %s",
link,
@@ -456,7 +456,7 @@ results_window_set_property (GObject *object,
switch (prop_id) {
case PROP_QUERY:
/* Don't do the search_start() call if the window was
- * just set up.
+ * just set up.
*/
g_free (priv->query);
priv->query = g_value_dup_string (value);
@@ -607,7 +607,7 @@ item_data_free (ItemData *id)
g_free (id->title);
g_free (id->tooltip);
g_free (id->link);
-
+
g_slice_free (ItemData, id);
}
@@ -681,14 +681,14 @@ category_from_string (const gchar *type,
*categories |= CATEGORY_EMAIL_ADDRESS;
}
- if (g_str_has_suffix (type, "nfo#Image") ||
+ if (g_str_has_suffix (type, "nfo#Image") ||
g_str_has_suffix (type, "nfo#RosterImage") ||
g_str_has_suffix (type, "nfo#VectorImage") ||
g_str_has_suffix (type, "nfo#FilesystemImage")) {
*categories |= CATEGORY_IMAGE;
}
- if (g_str_has_suffix (type, "nfo#Audio") ||
+ if (g_str_has_suffix (type, "nfo#Audio") ||
g_str_has_suffix (type, "nmm#MusicPiece")) {
*categories |= CATEGORY_AUDIO;
}
@@ -743,7 +743,7 @@ pixbuf_get (TrackerResultsWindow *window,
g_free (path);
if (error) {
- g_printerr ("Couldn't get pixbuf for urn:'%s', %s\n",
+ g_printerr ("Couldn't get pixbuf for urn:'%s', %s\n",
urn,
error->message);
g_clear_error (&error);
@@ -756,9 +756,9 @@ pixbuf_get (TrackerResultsWindow *window,
}
- attributes =
+ attributes =
G_FILE_ATTRIBUTE_STANDARD_ICON;
-
+
info = g_file_query_info (file,
attributes,
G_FILE_QUERY_INFO_NONE,
@@ -767,7 +767,7 @@ pixbuf_get (TrackerResultsWindow *window,
if (error) {
- g_printerr ("Couldn't get pixbuf for urn:'%s', %s\n",
+ g_printerr ("Couldn't get pixbuf for urn:'%s', %s\n",
urn,
error->message);
g_object_unref (file);
@@ -875,7 +875,7 @@ model_pixbuf_cell_data_func (GtkTreeViewColumn *tree_column,
} else {
/* We do this because there may be no image for a file
* and we don't want to keep requesting the same
- * file's image.
+ * file's image.
*/
gtk_tree_model_get (model, iter, COL_IMAGE, &pixbuf, -1);
}
@@ -962,15 +962,15 @@ model_set_up (TrackerResultsWindow *window)
gtk_tree_view_set_model (view, GTK_TREE_MODEL (store));
- gtk_tree_view_set_row_separator_func (view,
+ gtk_tree_view_set_row_separator_func (view,
model_separator_func,
window,
NULL);
- /* Selection */
+ /* Selection */
selection = gtk_tree_view_get_selection (view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- gtk_tree_selection_set_select_function (selection,
+ gtk_tree_selection_set_select_function (selection,
model_selection_func,
window,
NULL);
@@ -1056,7 +1056,7 @@ model_add (TrackerResultsWindow *window,
/* path = gtk_tree_model_get_path (GTK_TREE_MODEL (window->store), &iter); */
/* gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (window->treeview), tooltip, path); */
/* gtk_tree_path_free (path); */
-
+
/* gtk_tree_selection_select_iter (selection, &iter); */
}
@@ -1088,7 +1088,7 @@ search_window_ensure_not_blank (TrackerResultsWindow *window)
}
inline static void
-search_get_foreach (gpointer value,
+search_get_foreach (gpointer value,
gpointer user_data)
{
SearchQuery *sq;
@@ -1139,7 +1139,7 @@ search_get_cb (GPtrArray *results,
/* If request IDs don't match, data is no longer needed */
if (priv->request_id != sq->request_id) {
- g_message ("Received data from request id:%d, now on request id:%d",
+ g_message ("Received data from request id:%d, now on request id:%d",
sq->request_id,
priv->request_id);
search_query_free (sq);
@@ -1162,7 +1162,7 @@ search_get_cb (GPtrArray *results,
} else {
GSList *l;
- g_print ("Results: %d for category:'%s'\n",
+ g_print ("Results: %d for category:'%s'\n",
results->len,
category_to_string (sq->category));
@@ -1270,7 +1270,7 @@ search_start (TrackerResultsWindow *window)
GtkListStore *store;
priv = TRACKER_RESULTS_WINDOW_GET_PRIVATE (window);
-
+
/* Cancel current requests */
priv->request_id++;
g_message ("Incrementing request ID to %d", priv->request_id);
diff --git a/src/tracker-search-tool/tracker-category-view.gs b/src/tracker-search-tool/tracker-category-view.gs
index 8cc4e52..b42b78c 100644
--- a/src/tracker-search-tool/tracker-category-view.gs
+++ b/src/tracker-search-tool/tracker-category-view.gs
@@ -22,8 +22,8 @@
uses
Gtk
TrackerUtils
-
-
+
+
enum CategoryColumns
Icon
Name
@@ -32,81 +32,81 @@ enum CategoryColumns
const icon_size : int = 16
-
+
class TrackerCategoryView : ScrolledWindow
store : ListStore
treeview : TreeView
lab : Label
catergory : Categories
-
+
prop Query : TrackerQuery
-
+
init
-
+
hscrollbar_policy = PolicyType.NEVER
vscrollbar_policy = PolicyType.AUTOMATIC
shadow_type = ShadowType.ETCHED_OUT
-
+
store = new ListStore (CategoryColumns.NumOfCols, typeof (Gdk.Pixbuf), typeof (string), typeof (string))
iter : TreeIter
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("system-file-manager", icon_size, get_screen ()), \
CategoryColumns.Name, "All", CategoryColumns.DisplayName, N_("All Files") , -1);
-
+
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("x-office-document", icon_size, get_screen ()), \
CategoryColumns.Name, "nfo:Document", CategoryColumns.DisplayName, N_("Office Documents") , -1);
-
+
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("text-x-generic", icon_size, get_screen ()), \
CategoryColumns.Name, "nfo:TextDocument", CategoryColumns.DisplayName, N_("Text Documents") , -1);
-
+
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("image-x-generic", icon_size, get_screen ()), \
- CategoryColumns.Name, "nfo:Image", CategoryColumns.DisplayName, N_("Images") , -1);
-
+ CategoryColumns.Name, "nfo:Image", CategoryColumns.DisplayName, N_("Images") , -1);
+
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("audio-x-generic", icon_size, get_screen ()), \
- CategoryColumns.Name, "nmm:MusicPiece", CategoryColumns.DisplayName, N_("Music") , -1);
-
+ CategoryColumns.Name, "nmm:MusicPiece", CategoryColumns.DisplayName, N_("Music") , -1);
+
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("video-x-generic", icon_size, get_screen ()), \
- CategoryColumns.Name, "nmm:Video", CategoryColumns.DisplayName, N_("Videos") , -1);
-
+ CategoryColumns.Name, "nmm:Video", CategoryColumns.DisplayName, N_("Videos") , -1);
+
store.append (out iter);
store.set (iter, CategoryColumns.Icon, GetThemePixbufByName ("system-run", icon_size, get_screen ()), \
- CategoryColumns.Name, "nfo:SoftwareApplication", CategoryColumns.DisplayName, N_("Applications") , -1);
-
+ CategoryColumns.Name, "nfo:SoftwareApplication", CategoryColumns.DisplayName, N_("Applications") , -1);
+
treeview = new TreeView.with_model (store)
treeview.insert_column_with_attributes (-1, "icon", new CellRendererPixbuf (), "pixbuf", 0, null)
treeview.insert_column_with_attributes (-1, "name", new CellRendererText (), "text", 2, null)
treeview.set_headers_visible (false)
-
+
var category_selection = treeview.get_selection ()
category_selection.set_mode (SelectionMode.BROWSE)
-
- category_selection.changed += selection_changed
-
+
+ category_selection.changed += selection_changed
+
add (treeview)
-
+
show_all ()
def selection_changed (sel : TreeSelection)
iter : TreeIter
model : TreeModel
-
+
sel.get_selected (out model , out iter)
-
+
name : weak string
-
+
store.get (iter, CategoryColumns.Name, out name);
-
+
if Query is not null
Query.Category = name
-
-
-
-
+
+
+
+
diff --git a/src/tracker-search-tool/tracker-metadata-tile.gs b/src/tracker-search-tool/tracker-metadata-tile.gs
index 509ccfe..30cf89b 100644
--- a/src/tracker-search-tool/tracker-metadata-tile.gs
+++ b/src/tracker-search-tool/tracker-metadata-tile.gs
@@ -23,32 +23,32 @@
uses
Gtk
TrackerUtils
-
-
+
+
class TrackerMetadataTile : HBox
uri : string
- category : Categories
+ category : Categories
image : Image
name_link : LinkButton
table : Table
-
-
+
+
/* metadata fields */
info_label1 : Label
info_value1 : Label
-
+
info_label2 : Label
info_value2 : Label
-
+
info_label3 : Label
info_value3 : Label
-
+
info_label4 : Label
info_value4 : Label
-
+
info_label5 : Label
info_value5 : Label
-
+
info_label6 : Label
info_value6 : Label
@@ -57,85 +57,85 @@ class TrackerMetadataTile : HBox
info_label8 : Label
info_value8 : Label
-
+
_result_grid : TrackerResultGrid
-
-
+
+
prop Query : TrackerQuery
-
+
prop ResultGrid : TrackerResultGrid
get
return _result_grid
set
if value is not null
_result_grid = value
-
+
_result_grid.SelectionChanged += def (path)
- LoadUri (path)
-
-
+ LoadUri (path)
+
+
init
border_width = 8
-
+
table = new Table (3, 7, false)
table.set_col_spacings (6)
table.set_row_spacings (6)
-
+
add (table)
image = new Image.from_icon_name ("text-x-generic", IconSize.DIALOG)
table.attach (image, 0, 1, 0, 3, AttachOptions.FILL, AttachOptions.FILL, 12, 0)
-
+
name_link = new LinkButton ("")
name_link.xalign = 0
table.attach (name_link, 1, 7, 0, 1, AttachOptions.FILL, AttachOptions.FILL, 0, 0)
-
+
info_label1 = CreateLabel (N_("Type:"), false)
AttachToTable (info_label1, 1, 2, 1, 2, false)
-
+
info_value1 = CreateLabel ("-", true)
AttachToTable (info_value1, 2, 3, 1, 2, true)
-
+
info_label2 = CreateLabel (N_("Size:"), false)
AttachToTable (info_label2, 3, 4, 1, 2, false)
-
- info_value2 = CreateLabel ("-", true)
+
+ info_value2 = CreateLabel ("-", true)
AttachToTable (info_value2, 4, 5, 1, 2, true)
-
- info_label3 = CreateLabel (N_("Modified:"), false)
+
+ info_label3 = CreateLabel (N_("Modified:"), false)
AttachToTable (info_label3, 5, 6, 1, 2, false)
-
- info_value3 = CreateLabel ("-", true)
+
+ info_value3 = CreateLabel ("-", true)
AttachToTable (info_value3, 6, 7, 1, 2, true)
-
+
info_label4 = CreateLabel (N_("Title:"), false)
AttachToTable (info_label4, 1, 2, 2, 3, false)
-
- info_value4 = CreateLabel ("-", true)
+
+ info_value4 = CreateLabel ("-", true)
AttachToTable (info_value4, 2, 3, 2, 3, true)
-
- info_label5 = CreateLabel (N_("Author/Artist:"), false)
+
+ info_label5 = CreateLabel (N_("Author/Artist:"), false)
AttachToTable (info_label5, 3, 4, 2, 3, false)
-
- info_value5 = CreateLabel ("-", true)
+
+ info_value5 = CreateLabel ("-", true)
AttachToTable (info_value5, 4, 5, 2, 3, true)
-
- info_label6 = CreateLabel ("Comments:", false)
+
+ info_label6 = CreateLabel ("Comments:", false)
AttachToTable (info_label6, 5, 6, 2, 3, false)
-
- info_value6 = CreateLabel ("-", true)
+
+ info_value6 = CreateLabel ("-", true)
AttachToTable (info_value6, 6, 7, 2, 3, true)
-
+
show_all ()
-
-
-
+
+
+
def private AttachToTable (lab : Label, l : int, r : int, t : int, b : int, e : bool)
if e is true
table.attach (lab, l, r, t, b, AttachOptions.FILL | AttachOptions.EXPAND , AttachOptions.FILL, 0, 0)
else
table.attach (lab, l, r, t, b, AttachOptions.FILL, AttachOptions.FILL, 0, 0)
-
+
def private CreateLabel (s : string, e : bool) : Label
var l = new Label (s)
l.xalign = 0
@@ -143,10 +143,10 @@ class TrackerMetadataTile : HBox
if e is true
l.ellipsize = Pango.EllipsizeMode.END
-
+
return l
-
-
+
+
def ClearLabels ()
info_value1.set_text ("")
info_value2.set_text ("")
@@ -156,59 +156,59 @@ class TrackerMetadataTile : HBox
info_value6.set_text ("")
name_link.uri = ""
name_link.label = ""
-
-
-
+
+
+
def LoadUri (path : TreePath?)
ClearLabels ()
-
+
if path is null
image.set_from_icon_name ("text-x-generic", IconSize.DIALOG)
return
-
+
iter : TreeIter
uri : weak string
display_name : weak string
- icon : Gdk.Pixbuf
-
+ icon : Gdk.Pixbuf
+
_result_grid.store.get_iter (out iter, path)
_result_grid.store.get (iter, ResultColumns.Uri, out uri, ResultColumns.Icon, out icon, ResultColumns.DisplayName, out display_name)
image.set_from_pixbuf (icon)
-
+
var file = File.new_for_uri (uri)
var filepath = file.get_basename ()
name_link.uri = uri
name_link.label = filepath
-
+
// get metadata
// var query = "SELECT ?mimetype ?size ?mtime WHERE {<%s> nie:byteSize ?size; nie:contentLastModified ?mtime; nie:mimeType ?mimeType.}".printf(uri)
var query = "SELECT ?mimetype WHERE {<%s> nie:mimeType ?mimetype.}".printf(uri)
if Query is not null
var result = Query.Query (query)
-
+
if result is not null and result [0,0] is not null
var val1 = "<b>%s</b>".printf (result [0,0])
-
+
info_value1.set_markup (val1)
info_value1.xalign = 0
-
+
try
var info = file.query_info ("standard::size,time::modified", \
- FileQueryInfoFlags.NONE, null)
-
+ FileQueryInfoFlags.NONE, null)
+
var val2 = "<b>%s</b>".printf (info.get_size ().to_string ())
-
+
info_value2.set_markup (val2)
-
+
tm : TimeVal
info.get_modification_time (out tm)
-
+
var val3 = "<b>%s</b>".printf (tm.to_iso8601 ())
-
+
info_value3.set_markup (val3)
-
+
except e:Error
- print "Could not get file info for %s", uri
-
+ print "Could not get file info for %s", uri
+
diff --git a/src/tracker-search-tool/tracker-query.gs b/src/tracker-search-tool/tracker-query.gs
index d5b4029..f455c22 100644
--- a/src/tracker-search-tool/tracker-query.gs
+++ b/src/tracker-search-tool/tracker-query.gs
@@ -21,7 +21,7 @@
[DBus (name = "org.freedesktop.Tracker1.Resources")]
-interface Resources : GLib.Object
+interface Resources : GLib.Object
def abstract SparqlQuery (query : string) : array of string[,] raises DBus.Error
def abstract SparqlUpdate (query : string) raises DBus.Error
@@ -31,8 +31,8 @@ class TrackerQuery : Object
tracker : Resources;
_SearchTerms : string
- event SearchSettingsChanged ()
- event ClearSearchResults ()
+ event SearchSettingsChanged ()
+ event ClearSearchResults ()
prop SearchTerms : string
get
@@ -40,59 +40,59 @@ class TrackerQuery : Object
set
if value is not null
_SearchTerms = value
-
+
prop Category : string
prop SortField : string
prop Fields : array of string
-
-
+
+
init
Category = "All"
-
+
self.notify += def (t, propety)
if propety.name is "Category" or propety.name is "SortField" or propety.name is "Fields"
SearchSettingsChanged ()
- else
- if propety.name is "SearchTerms"
- if SearchTerms is null or SearchTerms.length < 3
+ else
+ if propety.name is "SearchTerms"
+ if SearchTerms is null or SearchTerms.length < 3
ClearSearchResults ()
- else
+ else
SearchSettingsChanged ()
-
+
def Connect () : bool
-
- try
+
+ try
var conn = DBus.Bus.get (DBus.BusType.SESSION)
tracker = conn.get_object ("org.freedesktop.Tracker1", "/org/freedesktop/Tracker1/Resources", "org.freedesktop.Tracker1.Resources") as Resources
except e : DBus.Error
print "Cannot connect to Session bus. Error is %s", e.message
return false
-
+
return true
-
-
+
+
def Search () : array of string[,]?
-
+
cat, query : string
-
- if Category is null or Category is "All"
+
+ if Category is null or Category is "All"
cat = "nfo:FileDataObject"
else
cat = Category
-
- query = "SELECT ?s WHERE { ?s fts:match \"%s\". ?s a %s } limit 100 ".printf (SearchTerms, cat)
+
+ query = "SELECT ?s WHERE { ?s fts:match \"%s\". ?s a %s } limit 100 ".printf (SearchTerms, cat)
// to do : add Fields, Category and SortField
try
return tracker.SparqlQuery (query)
except e:DBus.Error
print "Dbus error : %s", e.message
-
- return null
+
+ return null
+
-
def Query (sparql : string) : array of string[,]?
try
return tracker.SparqlQuery (sparql)
@@ -100,9 +100,9 @@ class TrackerQuery : Object
print "Dbus error : %s", e.message
return null
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/tracker-search-tool/tracker-result-grid.gs b/src/tracker-search-tool/tracker-result-grid.gs
index 03b6b86..c2aa269 100644
--- a/src/tracker-search-tool/tracker-result-grid.gs
+++ b/src/tracker-search-tool/tracker-result-grid.gs
@@ -23,8 +23,8 @@
uses
Gtk
TrackerUtils
-
-
+
+
enum ResultColumns
Uri
Icon
@@ -39,14 +39,14 @@ enum ResultColumns
const targets : array of TargetEntry[] = {{ "text/uri-list", 0, 1 },{ "text/plain", 0, 0 },{ "STRING", 0, 0 }}
-
+
class TrackerResultGrid : ScrolledWindow
store : ListStore
iconview: IconView
_query : TrackerQuery
-
- event SelectionChanged (path : TreePath?)
-
+
+ event SelectionChanged (path : TreePath?)
+
prop Query : TrackerQuery
get
return _query
@@ -57,7 +57,7 @@ class TrackerResultGrid : ScrolledWindow
RefreshQuery ()
_query.ClearSearchResults += def ()
store.clear ()
-
+
def GetSelectedPath () : TreePath?
l : weak GLib.List of TreePath
@@ -65,42 +65,42 @@ class TrackerResultGrid : ScrolledWindow
if l is not null and l.data is not null
return l.data
-
+
return null
-
-
+
+
def GetSelectedUri () : weak string
iter : TreeIter
uri : weak string
-
+
var path = GetSelectedPath ()
if path is not null
store.get_iter (out iter, path)
store.get (iter, ResultColumns.Uri, out uri);
return uri
-
- return ""
-
-
+
+ return ""
+
+
init
-
+
hscrollbar_policy = PolicyType.AUTOMATIC
vscrollbar_policy = PolicyType.AUTOMATIC
shadow_type = ShadowType.ETCHED_OUT
-
+
store = new ListStore (ResultColumns.NumOfCols, typeof (string), typeof (Gdk.Pixbuf), typeof (string), \
typeof (int), typeof (string), typeof (string), typeof (bool), typeof (string))
- // to do add treeview
-
+ // to do add treeview
+
iconview = new IconView.with_model (store)
iconview.set_pixbuf_column (ResultColumns.Icon)
- iconview.set_text_column (ResultColumns.DisplayName)
+ iconview.set_text_column (ResultColumns.DisplayName)
iconview.set_selection_mode (SelectionMode.BROWSE)
iconview.enable_model_drag_source (Gdk.ModifierType.BUTTON1_MASK | Gdk.ModifierType.BUTTON2_MASK, targets, Gdk.DragAction.COPY | Gdk.DragAction.MOVE | Gdk.DragAction.ASK)
iconview.set_item_width (150)
iconview.set_row_spacing (10)
- iconview.item_activated += ActivateUri
+ iconview.item_activated += ActivateUri
iconview.selection_changed += def ()
var path = GetSelectedPath ()
@@ -112,12 +112,12 @@ class TrackerResultGrid : ScrolledWindow
if uri is not null
var s = new array of string [1]
s[0] = uri
- data.set_uris (s)
+ data.set_uris (s)
add (iconview)
show_all ()
-
+
def RefreshQuery ()
if _query is not null
var results = _query.Search ()
@@ -125,20 +125,20 @@ class TrackerResultGrid : ScrolledWindow
iter : TreeIter
store.clear ()
-
+
if results is null do return
-
+
for uri in results
if uri.has_prefix ("file://")
-
+
has_results = true
-
+
var file = File.new_for_uri (uri)
-
+
try
var info = file.query_info ("standard::display-name,standard::icon,thumbnail::path", \
- FileQueryInfoFlags.NONE, null)
-
+ FileQueryInfoFlags.NONE, null)
+
var filetype = info.get_file_type ()
store.append (out iter);
store.set (iter, ResultColumns.Uri, uri, ResultColumns.Icon, GetThumbNail (info, 64, 48, get_screen()), \
@@ -146,29 +146,29 @@ class TrackerResultGrid : ScrolledWindow
(filetype is FileType.DIRECTORY) , -1);
except e:Error
print "Could not get file info for %s", uri
-
+
/* select first result */
if has_results
var path = new TreePath.from_string ("0:0:0")
if path is not null
iconview.select_path (path)
-
-
-
-
+
+
+
+
def ActivateUri (path : TreePath)
iter : TreeIter
is_dir : bool = false
-
+
store.get_iter (out iter, path)
uri : weak string
store.get (iter, ResultColumns.Uri, out uri);
store.get (iter, ResultColumns.IsDirectory, out is_dir);
-
+
OpenUri (uri, is_dir)
-
-
-
-
+
+
+
+
diff --git a/src/tracker-search-tool/tracker-search-tool.gs b/src/tracker-search-tool/tracker-search-tool.gs
index 8a5bbc9..ea5770c 100644
--- a/src/tracker-search-tool/tracker-search-tool.gs
+++ b/src/tracker-search-tool/tracker-search-tool.gs
@@ -33,7 +33,7 @@ const static LICENSE : string =\
"License which can be viewed at:\n" +\
"\n" +\
" http://www.gnu.org/licenses/gpl.txt\n";
-
+
window : Window
service : string?
terms : array of string?
@@ -99,49 +99,49 @@ init
try
builder.add_from_file (SRCDIR + "tst.ui")
-
- except e : GLib.Error
-
+
+ except e : GLib.Error
+
try
builder.add_from_file (UIDIR + "tst.ui")
-
- except e : GLib.Error
-
+
+ except e : GLib.Error
+
var msg = new MessageDialog (null, DialogFlags.MODAL, \
MessageType.ERROR, ButtonsType.OK, \
N_("Failed to load UI\n%s"), e.message)
msg.run ()
Gtk.main_quit()
-
-
+
+
window = builder.get_object ("window") as Window
window.destroy += Gtk.main_quit
-
- /* create tracker widgets */
-
- var
+
+ /* create tracker widgets */
+
+ var
query = new TrackerQuery
entry = new TrackerSearchEntry ()
grid = new TrackerResultGrid ()
categories = new TrackerCategoryView ()
tile = new TrackerMetadataTile ()
-
+
entry_box = builder.get_object ("EntryBox") as Container
grid_box = builder.get_object ("GridBox") as Container
category_box = builder.get_object ("CategoryBox") as Container
detail_box = builder.get_object ("DetailBox") as Container
-
-
- query.Connect ()
- entry.Query = query
+
+
+ query.Connect ()
+ entry.Query = query
entry_box.add (entry)
-
+
grid.Query = query
grid_box.add (grid)
-
+
categories.Query = query
category_box.add (categories)
-
+
tile.ResultGrid = grid
tile.Query = query
detail_box.add (tile)
diff --git a/src/tracker-search-tool/tracker-utils.gs b/src/tracker-search-tool/tracker-utils.gs
index 462349c..0ae8262 100644
--- a/src/tracker-search-tool/tracker-utils.gs
+++ b/src/tracker-search-tool/tracker-utils.gs
@@ -23,7 +23,7 @@
uses
Gtk
-
+
enum Categories
Application
@@ -39,29 +39,29 @@ enum Categories
Text
Development
Web
- WebHistory
-
+ WebHistory
+
[CCode (cname = "TRACKER_UI_DIR")]
const extern static UIDIR : string
-
+
[CCode (cname = "SRCDIR")]
const extern static SRCDIR : string
-
+
class TrackerUtils
/* static methods only as this is a utility class that wont ever get substantiated */
def static EscapeSparql (sparql : string, add_wildcard : bool) : string
var str = new StringBuilder ()
-
+
if sparql is null
return ""
-
- var len = sparql.length
-
- if len < 3
- return sparql
-
+
+ var len = sparql.length
+
+ if len < 3
+ return sparql
+
p : char* = sparql
while *p is not '\0'
@@ -72,37 +72,37 @@ class TrackerUtils
else
str.append_c (*p)
p++
-
- if add_wildcard
+
+ if add_wildcard
p--
if *p is not ' '
str.append_c ('*')
-
-
- return str.str
-
+
+
+ return str.str
+
def static OpenUri (uri : string, is_dir :bool) : bool
command : string
app_info : AppInfo
-
+
var file = File.new_for_uri (uri)
-
+
try
app_info = file.query_default_handler (null)
except e:Error
var msg = new MessageDialog (null, DialogFlags.MODAL, MessageType.ERROR, ButtonsType.OK, \
N_("Could not get application info for %s\nError: %s\n"), uri, e.message)
msg.run ();
- return false
-
+ return false
+
if is_dir is true and app_info.get_executable() is "nautilus"
command = "nautilus --sm-disable --no-desktop --no-default-window '" + uri + "'"
else
command = app_info.get_executable () + " '" + uri + "'"
-
+
try
Process.spawn_command_line_async (command)
return true
@@ -114,46 +114,46 @@ class TrackerUtils
def static inline GetThemePixbufByName (icon_name : string, size : int, screen : Gdk.Screen) : Gdk.Pixbuf?
-
- var icon = new ThemedIcon (icon_name);
-
+
+ var icon = new ThemedIcon (icon_name);
+
return GetThemeIconPixbuf (icon, size, screen)
def static GetThumbNail (info : FileInfo, thumb_size : int, icon_size : int, screen : Gdk.Screen) : Gdk.Pixbuf?
-
+
pixbuf : Gdk.Pixbuf = null
try
var thumbpath = info.get_attribute_byte_string (FILE_ATTRIBUTE_THUMBNAIL_PATH)
-
+
if thumbpath is not null
pixbuf = new Gdk.Pixbuf.from_file_at_size (thumbpath, thumb_size, thumb_size)
except e: Error
pass
-
+
if pixbuf is null
- pixbuf = GetThemeIconPixbuf (info.get_icon (), icon_size, screen)
-
+ pixbuf = GetThemeIconPixbuf (info.get_icon (), icon_size, screen)
+
if pixbuf is null
pixbuf = GetThemePixbufByName ("text-x-generic", icon_size, screen)
-
+
return pixbuf
def static GetThemeIconPixbuf (icon : Icon, size : int, screen : Gdk.Screen) : Gdk.Pixbuf?
-
+
icon_info : IconInfo
-
+
var theme = IconTheme.get_for_screen (screen)
-
+
icon_info = theme.lookup_by_gicon (icon, size, IconLookupFlags.USE_BUILTIN)
try
return icon_info.load_icon ()
except e: Error
return null
-
-
-
-
+
+
+
+
diff --git a/src/tracker-status-icon/eggaccelerators.c b/src/tracker-status-icon/eggaccelerators.c
index 38724f7..35a1d0f 100644
--- a/src/tracker-status-icon/eggaccelerators.c
+++ b/src/tracker-status-icon/eggaccelerators.c
@@ -197,7 +197,7 @@ is_hyper (const gchar *string)
* can represent various keyboard keys (numlock, meta, hyper, etc.),
* the virtual modifier represents the keyboard key, the concrete
* modifier the actual Mod2-Mod5 bits in the key press event.
- *
+ *
* Returns: %TRUE on success.
*/
gboolean
@@ -209,7 +209,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
GdkModifierType mods;
gint len;
gboolean bad_keyval;
-
+
if (accelerator_key)
*accelerator_key = 0;
if (accelerator_mods)
@@ -218,7 +218,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
g_return_val_if_fail (accelerator != NULL, FALSE);
bad_keyval = FALSE;
-
+
keyval = 0;
mods = 0;
len = strlen (accelerator);
@@ -301,7 +301,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
else
{
gchar last_ch;
-
+
last_ch = *accelerator;
while (last_ch && last_ch != '>')
{
@@ -314,15 +314,15 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
else
{
keyval = gdk_keyval_from_name (accelerator);
-
+
if (keyval == 0)
bad_keyval = TRUE;
-
+
accelerator += len;
- len -= len;
+ len -= len;
}
}
-
+
if (accelerator_key)
*accelerator_key = gdk_keyval_to_lower (keyval);
if (accelerator_mods)
@@ -337,7 +337,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
* @accelerator_key: accelerator keyval
* @accelerator_mods: accelerator modifier mask
* @returns: a newly-allocated accelerator name
- *
+ *
* Converts an accelerator keyval and modifier mask
* into a string parseable by egg_accelerator_parse_virtual().
* For example, if you pass in #GDK_q and #EGG_VIRTUAL_CONTROL_MASK,
@@ -454,7 +454,7 @@ egg_virtual_accelerator_name (guint accelerator_key,
strcpy (accelerator + l, text_super);
l += sizeof (text_super) - 1;
}
-
+
strcpy (accelerator + l, keyval_name);
return accelerator;
@@ -471,11 +471,11 @@ egg_keymap_resolve_virtual_modifiers (GdkKeymap *keymap,
g_return_if_fail (GDK_IS_KEYMAP (keymap));
g_return_if_fail (concrete_mods != NULL);
-
+
modmap = egg_keymap_get_modmap (keymap);
-
+
/* Not so sure about this algorithm. */
-
+
concrete = 0;
i = 0;
while (i < EGG_MODMAP_ENTRY_LAST)
@@ -497,14 +497,14 @@ egg_keymap_virtualize_modifiers (GdkKeymap *keymap,
GdkModifierType virtual;
int i;
const EggModmap *modmap;
-
+
g_return_if_fail (GDK_IS_KEYMAP (keymap));
g_return_if_fail (virtual_mods != NULL);
modmap = egg_keymap_get_modmap (keymap);
-
+
/* Not so sure about this algorithm. */
-
+
virtual = 0;
i = 0;
while (i < EGG_MODMAP_ENTRY_LAST)
@@ -512,12 +512,12 @@ egg_keymap_virtualize_modifiers (GdkKeymap *keymap,
if ((1 << i) & concrete_mods)
{
EggVirtualModifierType cleaned;
-
+
cleaned = modmap->mapping[i] & ~(EGG_VIRTUAL_MOD2_MASK |
EGG_VIRTUAL_MOD3_MASK |
EGG_VIRTUAL_MOD4_MASK |
EGG_VIRTUAL_MOD5_MASK);
-
+
if (cleaned != 0)
{
virtual |= cleaned;
@@ -530,10 +530,10 @@ egg_keymap_virtualize_modifiers (GdkKeymap *keymap,
virtual |= modmap->mapping[i];
}
}
-
+
++i;
}
-
+
*virtual_mods = virtual;
}
@@ -549,7 +549,7 @@ reload_modmap (GdkKeymap *keymap,
xmodmap = XGetModifierMapping (gdk_x11_get_default_xdisplay ());
memset (modmap->mapping, 0, sizeof (modmap->mapping));
-
+
/* there are 8 modifiers, and the first 3 are shift, shift lock,
* and control
*/
@@ -566,7 +566,7 @@ reload_modmap (GdkKeymap *keymap,
int n_entries;
int j;
EggVirtualModifierType mask;
-
+
keys = NULL;
keyvals = NULL;
n_entries = 0;
@@ -574,11 +574,11 @@ reload_modmap (GdkKeymap *keymap,
gdk_keymap_get_entries_for_keycode (keymap,
keycode,
&keys, &keyvals, &n_entries);
-
+
mask = 0;
j = 0;
while (j < n_entries)
- {
+ {
if (keyvals[j] == GDK_Num_Lock)
mask |= EGG_VIRTUAL_NUM_LOCK_MASK;
else if (keyvals[j] == GDK_Scroll_Lock)
@@ -594,19 +594,19 @@ reload_modmap (GdkKeymap *keymap,
mask |= EGG_VIRTUAL_SUPER_MASK;
else if (keyvals[j] == GDK_Mode_switch)
mask |= EGG_VIRTUAL_MODE_SWITCH_MASK;
-
+
++j;
}
/* Mod1Mask is 1 << 3 for example, i.e. the
* fourth modifier, i / keyspermod is the modifier
* index
- */
+ */
modmap->mapping[i/xmodmap->max_keypermod] |= mask;
-
+
g_free (keyvals);
- g_free (keys);
-
+ g_free (keys);
+
++i;
}
@@ -619,7 +619,7 @@ reload_modmap (GdkKeymap *keymap,
modmap->mapping[EGG_MODMAP_ENTRY_MOD3] |= EGG_VIRTUAL_MOD3_MASK;
modmap->mapping[EGG_MODMAP_ENTRY_MOD4] |= EGG_VIRTUAL_MOD4_MASK;
modmap->mapping[EGG_MODMAP_ENTRY_MOD5] |= EGG_VIRTUAL_MOD5_MASK;
-
+
XFreeModifiermap (xmodmap);
}
@@ -631,7 +631,7 @@ egg_keymap_get_modmap (GdkKeymap *keymap)
/* This is all a hack, much simpler when we can just
* modify GDK directly.
*/
-
+
modmap = g_object_get_data (G_OBJECT (keymap),
"egg-modmap");
@@ -642,9 +642,9 @@ egg_keymap_get_modmap (GdkKeymap *keymap)
/* FIXME modify keymap change events with an event filter
* and force a reload if we get one
*/
-
+
reload_modmap (keymap, modmap);
-
+
g_object_set_data_full (G_OBJECT (keymap),
"egg-modmap",
modmap,
@@ -652,6 +652,6 @@ egg_keymap_get_modmap (GdkKeymap *keymap)
}
g_assert (modmap != NULL);
-
+
return modmap;
}
diff --git a/src/tracker-status-icon/tomboykeybinder.c b/src/tracker-status-icon/tomboykeybinder.c
index fc67605..3827c8d 100644
--- a/src/tracker-status-icon/tomboykeybinder.c
+++ b/src/tracker-status-icon/tomboykeybinder.c
@@ -34,21 +34,21 @@ static guint num_lock_mask, caps_lock_mask, scroll_lock_mask;
static void
lookup_ignorable_modifiers (GdkKeymap *keymap)
{
- egg_keymap_resolve_virtual_modifiers (keymap,
+ egg_keymap_resolve_virtual_modifiers (keymap,
EGG_VIRTUAL_LOCK_MASK,
&caps_lock_mask);
- egg_keymap_resolve_virtual_modifiers (keymap,
+ egg_keymap_resolve_virtual_modifiers (keymap,
EGG_VIRTUAL_NUM_LOCK_MASK,
&num_lock_mask);
- egg_keymap_resolve_virtual_modifiers (keymap,
+ egg_keymap_resolve_virtual_modifiers (keymap,
EGG_VIRTUAL_SCROLL_LOCK_MASK,
&scroll_lock_mask);
}
static void
-grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
+grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
Binding *binding,
gboolean grab)
{
@@ -66,23 +66,23 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) {
if (grab) {
- XGrabKey (GDK_WINDOW_XDISPLAY (rootwin),
- binding->keycode,
- binding->modifiers | mod_masks [i],
- GDK_WINDOW_XWINDOW (rootwin),
- False,
+ XGrabKey (GDK_WINDOW_XDISPLAY (rootwin),
+ binding->keycode,
+ binding->modifiers | mod_masks [i],
+ GDK_WINDOW_XWINDOW (rootwin),
+ False,
GrabModeAsync,
GrabModeAsync);
} else {
XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin),
binding->keycode,
- binding->modifiers | mod_masks [i],
+ binding->modifiers | mod_masks [i],
GDK_WINDOW_XWINDOW (rootwin));
}
}
}
-static gboolean
+static gboolean
do_grab_key (Binding *binding)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
@@ -94,14 +94,14 @@ do_grab_key (Binding *binding)
if (keymap == NULL || rootwin == NULL)
return FALSE;
- if (!egg_accelerator_parse_virtual (binding->keystring,
- &keysym,
+ if (!egg_accelerator_parse_virtual (binding->keystring,
+ &keysym,
&virtual_mods))
return FALSE;
TRACE (g_print ("Got accel %d, %d\n", keysym, virtual_mods));
- binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin),
+ binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin),
keysym);
if (binding->keycode == 0)
return FALSE;
@@ -116,8 +116,8 @@ do_grab_key (Binding *binding)
gdk_error_trap_push ();
- grab_ungrab_with_ignorable_modifiers (rootwin,
- binding,
+ grab_ungrab_with_ignorable_modifiers (rootwin,
+ binding,
TRUE /* grab */);
gdk_flush ();
@@ -130,15 +130,15 @@ do_grab_key (Binding *binding)
return TRUE;
}
-static gboolean
+static gboolean
do_ungrab_key (Binding *binding)
{
GdkWindow *rootwin = gdk_get_default_root_window ();
TRACE (g_print ("Removing grab for '%s'\n", binding->keystring));
- grab_ungrab_with_ignorable_modifiers (rootwin,
- binding,
+ grab_ungrab_with_ignorable_modifiers (rootwin,
+ binding,
FALSE /* ungrab */);
return TRUE;
@@ -156,31 +156,31 @@ filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
switch (xevent->type) {
case KeyPress:
- TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n",
- xevent->xkey.keycode,
+ TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n",
+ xevent->xkey.keycode,
xevent->xkey.state));
- /*
+ /*
* Set the last event time for use when showing
* windows to avoid anti-focus-stealing code.
*/
processing_event = TRUE;
last_event_time = xevent->xkey.time;
- event_mods = xevent->xkey.state & ~(num_lock_mask |
- caps_lock_mask |
+ event_mods = xevent->xkey.state & ~(num_lock_mask |
+ caps_lock_mask |
scroll_lock_mask);
for (iter = bindings; iter != NULL; iter = iter->next) {
Binding *binding = (Binding *) iter->data;
-
+
if (binding->keycode == xevent->xkey.keycode &&
binding->modifiers == event_mods) {
- TRACE (g_print ("Calling handler for '%s'...\n",
+ TRACE (g_print ("Calling handler for '%s'...\n",
binding->keystring));
- (binding->handler) (binding->keystring,
+ (binding->handler) (binding->keystring,
binding->user_data);
}
}
@@ -195,7 +195,7 @@ filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
return return_val;
}
-static void
+static void
keymap_changed (GdkKeymap *map)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
@@ -216,7 +216,7 @@ keymap_changed (GdkKeymap *map)
}
}
-void
+void
tomboy_keybinder_init (void)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
@@ -224,17 +224,17 @@ tomboy_keybinder_init (void)
lookup_ignorable_modifiers (keymap);
- gdk_window_add_filter (rootwin,
- filter_func,
+ gdk_window_add_filter (rootwin,
+ filter_func,
NULL);
- g_signal_connect (keymap,
+ g_signal_connect (keymap,
"keys_changed",
G_CALLBACK (keymap_changed),
NULL);
}
-void
+void
tomboy_keybinder_bind (const char *keystring,
TomboyBindkeyHandler handler,
gpointer user_data)
@@ -259,7 +259,7 @@ tomboy_keybinder_bind (const char *keystring,
}
void
-tomboy_keybinder_unbind (const char *keystring,
+tomboy_keybinder_unbind (const char *keystring,
TomboyBindkeyHandler handler)
{
GSList *iter;
@@ -268,7 +268,7 @@ tomboy_keybinder_unbind (const char *keystring,
Binding *binding = (Binding *) iter->data;
if (strcmp (keystring, binding->keystring) != 0 ||
- handler != binding->handler)
+ handler != binding->handler)
continue;
do_ungrab_key (binding);
@@ -281,7 +281,7 @@ tomboy_keybinder_unbind (const char *keystring,
}
}
-/*
+/*
* From eggcellrenderkeys.c.
*/
gboolean
@@ -313,7 +313,7 @@ tomboy_keybinder_is_modifier (guint keycode)
guint32
tomboy_keybinder_get_current_event_time (void)
{
- if (processing_event)
+ if (processing_event)
return last_event_time;
else
return GDK_CURRENT_TIME;
diff --git a/src/tracker-status-icon/tracker-status-icon.c b/src/tracker-status-icon/tracker-status-icon.c
index 44b37fe..7c70d65 100644
--- a/src/tracker-status-icon/tracker-status-icon.c
+++ b/src/tracker-status-icon/tracker-status-icon.c
@@ -384,7 +384,7 @@ status_icon_miner_progress_set (MinerMenuEntry *entry)
progress_str = g_strdup_printf ("%3.0f%%", entry->progress * 100);
gtk_label_set_text (GTK_LABEL (entry->progress_percentage), progress_str);
g_free (progress_str);
-
+
gtk_widget_set_tooltip_text (entry->box, entry->status);
}
@@ -782,12 +782,12 @@ context_menu_about_cb (GtkMenuItem *item,
"it under the terms of the GNU General Public License as published by "
"the Free Software Foundation; either version 2 of the License, or "
"(at your option) any later version."),
- N_("Tracker is distributed in the hope that it will be useful, "
- "but WITHOUT ANY WARRANTY; without even the implied warranty of "
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
+ N_("Tracker is distributed in the hope that it will be useful, "
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
"GNU General Public License for more details."),
- N_("You should have received a copy of the GNU General Public License "
- "along with Tracker; if not, write to the Free Software Foundation, Inc., "
+ N_("You should have received a copy of the GNU General Public License "
+ "along with Tracker; if not, write to the Free Software Foundation, Inc., "
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
};
diff --git a/src/tracker-store/tracker-backup.c b/src/tracker-store/tracker-backup.c
index 3cd82a3..a62f29b 100644
--- a/src/tracker-store/tracker-backup.c
+++ b/src/tracker-store/tracker-backup.c
@@ -135,7 +135,7 @@ tracker_backup_save (TrackerBackup *object,
/* The sqlite3_backup API apparently doesn't much like open transactions,
* this queue_commit will first call the currently open transaction
- * of the open batch (if any), and then in the callback we'll idd
+ * of the open batch (if any), and then in the callback we'll idd
* continue with making the backup itself (using sqlite3_backup's API) */
tracker_store_queue_commit (on_batch_commit, NULL, info, NULL);
@@ -167,9 +167,9 @@ tracker_backup_restore (TrackerBackup *object,
info->context = context;
info->play_journal = TRUE;
- /* This call is mostly synchronous, because we want to block the
+ /* This call is mostly synchronous, because we want to block the
* mainloop during a restore procedure (you're switching the active
- * database here, let's not allow queries during this time)
+ * database here, let's not allow queries during this time)
*
* No need for commits or anything. Whatever is in the current db will
* be eliminated in favor of the data in `backup_uri` and `journal_uri`. */
diff --git a/src/tracker-store/tracker-config.c b/src/tracker-store/tracker-config.c
index f261fde..62ea7dc 100644
--- a/src/tracker-store/tracker-config.c
+++ b/src/tracker-store/tracker-config.c
@@ -66,7 +66,7 @@ static void config_get_property (GObject *object,
static void config_finalize (GObject *object);
static void config_constructed (GObject *object);
static void config_create_with_defaults (TrackerConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite);
static void config_load (TrackerConfig *config);
@@ -189,38 +189,38 @@ config_constructed (GObject *object)
static void
config_create_with_defaults (TrackerConfig *config,
- GKeyFile *key_file,
+ GKeyFile *key_file,
gboolean overwrite)
{
gint i;
g_message ("Loading defaults into GKeyFile...");
-
+
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
if (!overwrite && has_key) {
continue;
}
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- g_key_file_set_integer (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_int (config,
+ g_key_file_set_integer (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_int (config,
conversions[i].property));
break;
case G_TYPE_BOOLEAN:
- g_key_file_set_boolean (key_file,
- conversions[i].group,
- conversions[i].key,
- tracker_keyfile_object_default_boolean (config,
+ g_key_file_set_boolean (key_file,
+ conversions[i].group,
+ conversions[i].key,
+ tracker_keyfile_object_default_boolean (config,
conversions[i].property));
break;
@@ -229,11 +229,11 @@ config_create_with_defaults (TrackerConfig *config,
break;
}
- g_key_file_set_comment (key_file,
- conversions[i].group,
- conversions[i].key,
+ g_key_file_set_comment (key_file,
+ conversions[i].group,
+ conversions[i].key,
tracker_keyfile_object_blurb (config,
- conversions[i].property),
+ conversions[i].property),
NULL);
}
}
@@ -253,26 +253,26 @@ config_load (TrackerConfig *config)
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
gboolean has_key;
-
- has_key = g_key_file_has_key (file->key_file,
- conversions[i].group,
- conversions[i].key,
+
+ has_key = g_key_file_has_key (file->key_file,
+ conversions[i].group,
+ conversions[i].key,
NULL);
-
+
switch (conversions[i].type) {
case G_TYPE_INT:
- tracker_keyfile_object_load_int (G_OBJECT (file),
+ tracker_keyfile_object_load_int (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
case G_TYPE_BOOLEAN:
- tracker_keyfile_object_load_boolean (G_OBJECT (file),
+ tracker_keyfile_object_load_boolean (G_OBJECT (file),
conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
@@ -303,17 +303,17 @@ config_save (TrackerConfig *config)
switch (conversions[i].type) {
case G_TYPE_INT:
tracker_keyfile_object_save_int (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
case G_TYPE_BOOLEAN:
tracker_keyfile_object_save_boolean (file,
- conversions[i].property,
+ conversions[i].property,
file->key_file,
- conversions[i].group,
+ conversions[i].group,
conversions[i].key);
break;
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index 310bfcc..f95c2b2 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -169,10 +169,10 @@ tracker_dbus_shutdown (void)
}
static void
-name_owner_changed_cb (DBusGProxy *proxy,
- gchar *name,
- gchar *old_owner,
- gchar *new_owner,
+name_owner_changed_cb (DBusGProxy *proxy,
+ gchar *name,
+ gchar *old_owner,
+ gchar *new_owner,
gpointer user_data)
{
if (tracker_is_empty_string (new_owner) && !tracker_is_empty_string (old_owner)) {
@@ -182,7 +182,7 @@ name_owner_changed_cb (DBusGProxy *proxy,
}
static void
-name_owner_changed_closure (gpointer data,
+name_owner_changed_closure (gpointer data,
GClosure *closure)
{
}
@@ -222,8 +222,8 @@ tracker_dbus_register_objects (void)
}
dbus_g_proxy_add_signal (gproxy, "NameOwnerChanged",
- G_TYPE_STRING,
- G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_INVALID);
@@ -265,18 +265,18 @@ tracker_dbus_register_objects (void)
classes = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
g_object_unref (result_set);
-
+
if (!classes) {
g_message ("No Nepomuk classes to register on D-Bus");
return TRUE;
}
-
+
for (p = classes; *p; p++) {
TrackerNamespace *namespace;
const gchar *rdf_class;
gchar *namespace_uri;
gchar *replaced, *path, *hash;
-
+
rdf_class = *p;
hash = strrchr (rdf_class, '#');
@@ -284,12 +284,12 @@ tracker_dbus_register_objects (void)
/* Support ontologies whose namespace
* uri does not end in a hash, e.g.
* dc.
- */
+ */
hash = strrchr (rdf_class, '/');
}
-
+
if (!hash) {
- g_critical ("Unknown namespace for class:'%s'",
+ g_critical ("Unknown namespace for class:'%s'",
rdf_class);
continue;
}
@@ -297,21 +297,21 @@ tracker_dbus_register_objects (void)
namespace_uri = g_strndup (rdf_class, hash - rdf_class + 1);
namespace = tracker_ontology_get_namespace_by_uri (namespace_uri);
g_free (namespace_uri);
-
+
if (!namespace) {
- g_critical ("Unknown namespace:'%s' for class:'%s'",
- namespace_uri,
+ g_critical ("Unknown namespace:'%s' for class:'%s'",
+ namespace_uri,
rdf_class);
continue;
}
- replaced = g_strdup_printf ("%s/%s",
- tracker_namespace_get_prefix (namespace),
+ replaced = g_strdup_printf ("%s/%s",
+ tracker_namespace_get_prefix (namespace),
hash + 1);
path = g_strdup_printf (TRACKER_RESOURCES_CLASS_PATH,
replaced);
g_free (replaced);
-
+
/* Add a org.freedesktop.Tracker1.Resources.Class */
object = tracker_resource_class_new (rdf_class);
if (!object) {
@@ -320,21 +320,21 @@ tracker_dbus_register_objects (void)
g_free (path);
return FALSE;
}
-
+
dbus_register_object (connection,
gproxy,
G_OBJECT (object),
&dbus_glib_tracker_resources_class_object_info,
path);
g_free (path);
-
+
/* TrackerResources takes over ownership and unrefs
* the gobjects too.
*/
event_sources = g_slist_prepend (event_sources, g_object_ref (object));
objects = g_slist_prepend (objects, object);
}
-
+
g_strfreev (classes);
tracker_resources_prepare (resources, event_sources);
diff --git a/src/tracker-store/tracker-events.c b/src/tracker-store/tracker-events.c
index 5a6de8e..d07f889 100644
--- a/src/tracker-store/tracker-events.c
+++ b/src/tracker-store/tracker-events.c
@@ -35,7 +35,7 @@ typedef struct {
static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
-static void
+static void
tracker_events_add_allow (const gchar *rdf_class)
{
EventsPrivate *private;
@@ -53,11 +53,11 @@ is_allowed (EventsPrivate *private, const gchar *rdf_class)
return (g_hash_table_lookup (private->allowances, rdf_class) != NULL) ? TRUE : FALSE;
}
-static void
-prepare_event_for_rdf_type (EventsPrivate *private,
- const gchar *rdf_class ,
- const gchar *uri,
- TrackerDBusEventsType type,
+static void
+prepare_event_for_rdf_type (EventsPrivate *private,
+ const gchar *rdf_class ,
+ const gchar *uri,
+ TrackerDBusEventsType type,
const gchar *predicate)
{
GValueArray *event;
@@ -95,11 +95,11 @@ prepare_event_for_rdf_type (EventsPrivate *private,
g_value_unset (&predicate_value);
}
-void
-tracker_events_insert (const gchar *uri,
+void
+tracker_events_insert (const gchar *uri,
const gchar *predicate,
- const gchar *object,
- GPtrArray *rdf_types,
+ const gchar *object,
+ GPtrArray *rdf_types,
TrackerDBusEventsType type)
{
EventsPrivate *private;
@@ -116,7 +116,7 @@ tracker_events_insert (const gchar *uri,
* the value being set to the user's DBus API in tracker-store) */
if (is_allowed (private, rdf_types->pdata[i])) {
- prepare_event_for_rdf_type (private, rdf_types->pdata[i],
+ prepare_event_for_rdf_type (private, rdf_types->pdata[i],
uri, type, predicate);
/* Only once match is needed */
@@ -124,23 +124,23 @@ tracker_events_insert (const gchar *uri,
}
}
} else if (type == TRACKER_DBUS_EVENTS_TYPE_UPDATE) {
- /* In this case we had an INSERT for a resource that didn't exist
+ /* In this case we had an INSERT for a resource that didn't exist
* yet, but it was not the rdf:type predicate being inserted */
if (is_allowed (private, (gpointer) TRACKER_RDFS_PREFIX "Resource")) {
- prepare_event_for_rdf_type (private,
- (gpointer) TRACKER_RDFS_PREFIX "Resource",
+ prepare_event_for_rdf_type (private,
+ (gpointer) TRACKER_RDFS_PREFIX "Resource",
uri, type, predicate);
}
} else {
/* In case of delete and create, object is the rdf:type */
if (is_allowed (private, (gpointer) object)) {
- prepare_event_for_rdf_type (private, (gpointer) object,
+ prepare_event_for_rdf_type (private, (gpointer) object,
uri, type, predicate);
}
}
}
-void
+void
tracker_events_reset (void)
{
EventsPrivate *private;
@@ -177,7 +177,7 @@ free_private (EventsPrivate *private)
g_free (private);
}
-void
+void
tracker_events_init (TrackerNotifyClassGetter callback)
{
EventsPrivate *private;
@@ -213,7 +213,7 @@ tracker_events_init (TrackerNotifyClassGetter callback)
g_strfreev (classes_to_signal);
}
-void
+void
tracker_events_shutdown (void)
{
EventsPrivate *private;
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 5a5b28c..63a2d2f 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -279,14 +279,14 @@ get_notifiable_classes (void)
result_set = tracker_data_query_sparql ("SELECT ?class WHERE { "
" ?class tracker:notify true "
- "}",
+ "}",
NULL);
if (result_set) {
guint count = 0;
- classes_to_signal = tracker_dbus_query_result_to_strv (result_set,
- 0,
+ classes_to_signal = tracker_dbus_query_result_to_strv (result_set,
+ 0,
&count);
g_object_unref (result_set);
}
@@ -303,14 +303,14 @@ get_writeback_predicates (void)
result_set = tracker_data_query_sparql ("SELECT ?predicate WHERE { "
" ?predicate tracker:writeback true "
- "}",
+ "}",
NULL);
if (result_set) {
guint count = 0;
- predicates_to_signal = tracker_dbus_query_result_to_strv (result_set,
- 0,
+ predicates_to_signal = tracker_dbus_query_result_to_strv (result_set,
+ 0,
&count);
g_object_unref (result_set);
}
@@ -350,7 +350,7 @@ main (gint argc, gchar *argv[])
/* Set timezone info */
tzset ();
-
+
/* Translators: this messagge will apper immediately after the
* usage string - Usage: COMMAND <THIS_MESSAGE>
*/
@@ -384,7 +384,7 @@ main (gint argc, gchar *argv[])
initialize_priority ();
/* Public locations */
- private->ttl_backup_file =
+ private->ttl_backup_file =
g_build_filename (g_get_user_data_dir (),
"tracker",
"data",
@@ -429,9 +429,9 @@ main (gint argc, gchar *argv[])
flags |= TRACKER_DB_MANAGER_LOW_MEMORY_MODE;
}
- if (!tracker_data_manager_init (flags,
- NULL,
- &is_first_time_index,
+ if (!tracker_data_manager_init (flags,
+ NULL,
+ &is_first_time_index,
&need_journal)) {
return EXIT_FAILURE;
}
diff --git a/src/tracker-store/tracker-push-registrar.c b/src/tracker-store/tracker-push-registrar.c
index a8ca7f2..f087980 100644
--- a/src/tracker-store/tracker-push-registrar.c
+++ b/src/tracker-store/tracker-push-registrar.c
@@ -213,7 +213,7 @@ tracker_push_registrar_get_object (TrackerPushRegistrar *registrar)
*
* Returns: The DBus proxy.
**/
-DBusGProxy *
+DBusGProxy *
tracker_push_registrar_get_manager (TrackerPushRegistrar *registrar)
{
TrackerPushRegistrarPrivate *priv;
@@ -310,8 +310,8 @@ tracker_push_registrar_set_manager (TrackerPushRegistrar *registrar,
**/
void
tracker_push_registrar_enable (TrackerPushRegistrar *registrar,
- DBusGConnection *connection,
- DBusGProxy *dbus_proxy,
+ DBusGConnection *connection,
+ DBusGProxy *dbus_proxy,
GError **error)
{
if (TRACKER_PUSH_REGISTRAR_GET_CLASS (registrar)->enable) {
diff --git a/src/tracker-store/tracker-push-registrar.h b/src/tracker-store/tracker-push-registrar.h
index 1260328..df2defa 100644
--- a/src/tracker-store/tracker-push-registrar.h
+++ b/src/tracker-store/tracker-push-registrar.h
@@ -47,8 +47,8 @@ struct TrackerPushRegistrarClass {
GObjectClass parent_class;
void (*enable) (TrackerPushRegistrar *registrar,
- DBusGConnection *connection,
- DBusGProxy *dbus_proxy,
+ DBusGConnection *connection,
+ DBusGProxy *dbus_proxy,
GError **error);
void (*disable) (TrackerPushRegistrar *registrar);
@@ -68,9 +68,9 @@ void tracker_push_registrar_set_manager (TrackerPushRegistr
DBusGProxy *manager);
-void tracker_push_registrar_enable (TrackerPushRegistrar *registrar,
- DBusGConnection *connection,
- DBusGProxy *dbus_proxy,
+void tracker_push_registrar_enable (TrackerPushRegistrar *registrar,
+ DBusGConnection *connection,
+ DBusGProxy *dbus_proxy,
GError **error);
void tracker_push_registrar_disable (TrackerPushRegistrar *registrar);
diff --git a/src/tracker-store/tracker-push.c b/src/tracker-store/tracker-push.c
index afc73b8..8f89311 100644
--- a/src/tracker-store/tracker-push.c
+++ b/src/tracker-store/tracker-push.c
@@ -96,10 +96,10 @@ load_modules (PushSupportPrivate *private)
}
static void
-name_owner_changed_cb (DBusGProxy *proxy,
- gchar *name,
- gchar *old_owner,
- gchar *new_owner,
+name_owner_changed_cb (DBusGProxy *proxy,
+ gchar *name,
+ gchar *old_owner,
+ gchar *new_owner,
gpointer user_data)
{
GList *copy;
@@ -127,7 +127,7 @@ name_owner_changed_cb (DBusGProxy *proxy,
if (tracker_is_empty_string (old_owner) && !tracker_is_empty_string (new_owner)) {
GError *error = NULL;
- tracker_push_registrar_enable (registrar,
+ tracker_push_registrar_enable (registrar,
private->connection,
private->dbus_proxy,
&error);
@@ -155,7 +155,7 @@ name_owner_changed_cb (DBusGProxy *proxy,
if (g_strcmp0 (name, service) == 0) {
GError *error = NULL;
- tracker_push_registrar_enable (registrar,
+ tracker_push_registrar_enable (registrar,
private->connection,
private->dbus_proxy,
&error);
@@ -193,7 +193,7 @@ list_names_reply_cb (DBusGProxy *proxy,
g_warning ("%s", error->message);
g_error_free (error);
if (names)
- g_strfreev (names);
+ g_strfreev (names);
return;
}
@@ -210,7 +210,7 @@ list_names_reply_cb (DBusGProxy *proxy,
if (g_strcmp0 (names[i], service) == 0) {
GError *lerror = NULL;
- tracker_push_registrar_enable (registrar,
+ tracker_push_registrar_enable (registrar,
private->connection,
private->dbus_proxy,
&lerror);
@@ -227,7 +227,7 @@ list_names_reply_cb (DBusGProxy *proxy,
i++;
}
- g_strfreev (names);
+ g_strfreev (names);
}
static void
@@ -261,12 +261,12 @@ tracker_push_init (void)
private->connection = dbus_g_connection_ref (connection);
- private->dbus_proxy = dbus_g_proxy_new_for_name (private->connection,
+ private->dbus_proxy = dbus_g_proxy_new_for_name (private->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- /* We listen for NameOwnerChanged to know when the manager's service
+ /* We listen for NameOwnerChanged to know when the manager's service
* comes up and to know when it goes down */
dbus_g_proxy_add_signal (private->dbus_proxy, "NameOwnerChanged",
diff --git a/src/tracker-store/tracker-resource-class.c b/src/tracker-store/tracker-resource-class.c
index 63d2c9c..c7368e4 100644
--- a/src/tracker-store/tracker-resource-class.c
+++ b/src/tracker-store/tracker-resource-class.c
@@ -155,7 +155,7 @@ emit_changed_strings (TrackerResourceClass *object, GPtrArray *array)
stringsb_to_emit[i] = item->predicate;
}
- g_signal_emit (object, signals[SUBJECTS_CHANGED], 0,
+ g_signal_emit (object, signals[SUBJECTS_CHANGED], 0,
stringsa_to_emit, stringsb_to_emit);
/* Normal free, not a GStrv free, we free the items later */
@@ -287,7 +287,7 @@ changed_has_already (GPtrArray *array, const gchar *uri, const gchar *predicate)
}
*/
-void
+void
tracker_resource_class_add_event (TrackerResourceClass *object,
const gchar *uri,
const gchar *predicate,
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index 0a19d74..d43f18a 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -73,7 +73,7 @@ static void
free_event_sources (TrackerResourcesPrivate *priv)
{
if (priv->event_sources) {
- g_slist_foreach (priv->event_sources,
+ g_slist_foreach (priv->event_sources,
(GFunc) g_object_unref, NULL);
g_slist_free (priv->event_sources);
@@ -81,7 +81,7 @@ free_event_sources (TrackerResourcesPrivate *priv)
}
}
-static void
+static void
tracker_resources_finalize (GObject *object)
{
TrackerResourcesPrivate *priv;
@@ -514,7 +514,7 @@ on_statement_deleted (const gchar *graph,
tracker_writeback_check (graph, subject, predicate, object, rdf_types);
}
-void
+void
tracker_resources_prepare (TrackerResources *object,
GSList *event_sources)
{
diff --git a/src/tracker-store/tracker-statistics.c b/src/tracker-store/tracker-statistics.c
index ef37ce4..6421a94 100644
--- a/src/tracker-store/tracker-statistics.c
+++ b/src/tracker-store/tracker-statistics.c
@@ -94,7 +94,7 @@ tracker_statistics_init (TrackerStatistics *object)
/* Do first time stats lookup */
priv->cache = cache_get_latest ();
- priv->cache_timeout_id =
+ priv->cache_timeout_id =
g_timeout_add_seconds (CACHE_LIFETIME,
cache_timeout,
object);
@@ -165,7 +165,7 @@ cache_get_latest (void)
tracker_db_result_set_get (result_set, 0, &count, -1);
- g_hash_table_insert (values,
+ g_hash_table_insert (values,
g_strdup (tracker_class_get_name (cl)),
GINT_TO_POINTER (count));
@@ -176,7 +176,7 @@ cache_get_latest (void)
return values;
}
-static gboolean
+static gboolean
cache_timeout (gpointer user_data)
{
g_message ("Statistics cache has expired, updating...");
@@ -291,27 +291,27 @@ tracker_statistics_signal (void)
const gchar *service_type;
gpointer data;
gint old_count, new_count;
-
+
service_type = key;
new_count = GPOINTER_TO_INT (value);
-
+
data = g_hash_table_lookup (priv->cache, service_type);
old_count = GPOINTER_TO_INT (data);
-
+
if (old_count != new_count) {
GStrv strv;
- g_message (" Updating '%s' with new count:%d, old count:%d, diff:%d",
+ g_message (" Updating '%s' with new count:%d, old count:%d, diff:%d",
service_type,
new_count,
old_count,
new_count - old_count);
-
+
strv = g_new (gchar*, 3);
strv[0] = g_strdup (service_type);
strv[1] = g_strdup_printf ("%d", new_count);
strv[2] = NULL;
-
+
g_ptr_array_add (values, strv);
}
}
@@ -319,12 +319,12 @@ tracker_statistics_signal (void)
if (values->len > 0) {
/* Make sure we sort the results first */
g_ptr_array_sort (values, cache_sort_func);
-
+
g_signal_emit (statistics, signals[UPDATED], 0, values);
} else {
g_message (" No changes in the statistics");
}
-
+
g_ptr_array_foreach (values, (GFunc) g_strfreev, NULL);
g_ptr_array_free (values, TRUE);
diff --git a/src/tracker-store/tracker-statistics.h b/src/tracker-store/tracker-statistics.h
index a3c651a..17c2210 100644
--- a/src/tracker-store/tracker-statistics.h
+++ b/src/tracker-store/tracker-statistics.h
@@ -31,7 +31,7 @@
G_BEGIN_DECLS
#define TRACKER_TYPE_STATISTICS (tracker_statistics_get_type ())
-#define TRACKER_STATISTICS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_STATISTICS, TrackerStatistics))
+#define TRACKER_STATISTICS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_STATISTICS, TrackerStatistics))
#define TRACKER_STATISTICS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_STATISTICS, TrackerStatisticsClass))
#define TRACKER_IS_STATISTICS(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_STATISTICS))
#define TRACKER_IS_STATISTICS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_STATISTICS))
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 72e530e..087c050 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -161,8 +161,8 @@ end_batch (TrackerStorePrivate *private)
tracker_data_commit_transaction ();
/* The on_statements_committed in tracker-resources.c performs
- * the flush on the journal, I can only register one callback
- * for this atm, so that's why it's called over there as a
+ * the flush on the journal, I can only register one callback
+ * for this atm, so that's why it's called over there as a
* tracker_store_flush_journal */
private->batch_mode = FALSE;
@@ -316,7 +316,7 @@ sync_idle_destroy (gpointer user_data)
private->have_sync_handler = FALSE;
}
-void
+void
tracker_store_flush_journal (void)
{
TrackerStorePrivate *private;
diff --git a/src/tracker-store/tracker-writeback.c b/src/tracker-store/tracker-writeback.c
index dd939f2..a6625eb 100644
--- a/src/tracker-store/tracker-writeback.c
+++ b/src/tracker-store/tracker-writeback.c
@@ -49,18 +49,18 @@ copy_rdf_types (GPtrArray *rdf_types)
return new_types;
}
-void
+void
tracker_writeback_check (const gchar *graph,
- const gchar *subject,
+ const gchar *subject,
const gchar *predicate,
const gchar *object,
GPtrArray *rdf_types)
{
WritebackPrivate *private;
- /* When graph is NULL, the graph is the default one. We only do
+ /* When graph is NULL, the graph is the default one. We only do
* writeback reporting in the default graph (update queries that
- * aren't coming from the miner)
+ * aren't coming from the miner)
*/
if (graph != NULL) {
@@ -78,7 +78,7 @@ tracker_writeback_check (const gchar *graph,
(GDestroyNotify) g_strfreev);
}
- g_hash_table_insert (private->events,
+ g_hash_table_insert (private->events,
g_strdup (subject),
copy_rdf_types (rdf_types));
} else {
@@ -86,7 +86,7 @@ tracker_writeback_check (const gchar *graph,
}
}
-void
+void
tracker_writeback_reset (void)
{
WritebackPrivate *private;
@@ -121,7 +121,7 @@ free_private (gpointer user_data)
g_free (private);
}
-void
+void
tracker_writeback_init (TrackerWritebackGetPredicatesFunc func)
{
WritebackPrivate *private;
@@ -135,7 +135,7 @@ tracker_writeback_init (TrackerWritebackGetPredicatesFunc func)
g_static_private_set (&private_key, private, free_private);
- private->allowances = g_hash_table_new_full (g_str_hash,
+ private->allowances = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
NULL);
@@ -157,7 +157,7 @@ tracker_writeback_init (TrackerWritebackGetPredicatesFunc func)
count = g_strv_length (predicates_to_signal);
for (i = 0; i < count; i++) {
g_message (" Adding:'%s'", predicates_to_signal[i]);
- g_hash_table_insert (private->allowances,
+ g_hash_table_insert (private->allowances,
g_strdup (predicates_to_signal[i]),
GINT_TO_POINTER (TRUE));
}
@@ -165,7 +165,7 @@ tracker_writeback_init (TrackerWritebackGetPredicatesFunc func)
g_strfreev (predicates_to_signal);
}
-void
+void
tracker_writeback_shutdown (void)
{
WritebackPrivate *private;
diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c
index c032afe..679cac4 100644
--- a/src/tracker-utils/tracker-info.c
+++ b/src/tracker-utils/tracker-info.c
@@ -146,22 +146,22 @@ main (int argc, char **argv)
g_print ("%s:'%s'\n",
_("Querying information for file"),
*p);
-
+
/* support both, URIs and local file paths */
if (has_valid_uri_scheme (*p)) {
uri = g_strdup (*p);
} else {
GFile *file;
-
+
file = g_file_new_for_commandline_arg (*p);
uri = g_file_get_uri (file);
g_object_unref (file);
}
-
+
query = g_strdup_printf ("SELECT ?predicate ?object WHERE { <%s> ?predicate ?object }", uri);
-
+
results = tracker_resources_sparql_query (client, query, &error);
-
+
g_free (uri);
g_free (query);
@@ -169,26 +169,26 @@ main (int argc, char **argv)
g_printerr (" %s, %s\n",
_("Unable to retrieve data for URI"),
error->message);
-
+
g_error_free (error);
continue;
}
-
+
if (!results) {
g_print (" %s\n",
_("No metadata available for that URI"));
} else {
gint length;
-
+
length = results->len;
-
+
g_print (tracker_dngettext (NULL,
- "Result: %d",
+ "Result: %d",
"Results: %d",
length),
length);
g_print ("\n");
-
+
g_ptr_array_foreach (results, (GFunc) print_property_value, NULL);
g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
g_ptr_array_free (results, TRUE);
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index 69945f6..2e475cb 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -124,7 +124,7 @@ show_limit_warning (void)
* more items.
*/
g_print (" ...\n");
-
+
/* Display warning so the user knows this is
* not the WHOLE data set.
*/
@@ -150,7 +150,7 @@ get_fts_string (GStrv search_words,
g_string_append (fts, search_words[i]);
g_string_append_c (fts, '*');
- if (i < len - 1) {
+ if (i < len - 1) {
if (use_or_operator) {
g_string_append (fts, " OR ");
} else {
@@ -195,14 +195,14 @@ get_files_results (TrackerClient *client,
_("No files were found"));
} else {
g_print (tracker_dngettext (NULL,
- "File: %d",
+ "File: %d",
"Files: %d",
results->len),
results->len);
g_print ("\n");
- g_ptr_array_foreach (results,
- get_files_foreach,
+ g_ptr_array_foreach (results,
+ get_files_foreach,
NULL);
if (results->len >= search_limit) {
@@ -239,7 +239,7 @@ get_document_files (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?document "
@@ -249,7 +249,7 @@ get_document_files (TrackerClient *client,
"ORDER BY ASC(?document) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -283,7 +283,7 @@ get_video_files (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?video "
@@ -293,7 +293,7 @@ get_video_files (TrackerClient *client,
"ORDER BY ASC(?video) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -327,7 +327,7 @@ get_image_files (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?image "
@@ -337,7 +337,7 @@ get_image_files (TrackerClient *client,
"ORDER BY ASC(?image) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -371,7 +371,7 @@ get_music_files (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?song "
@@ -381,7 +381,7 @@ get_music_files (TrackerClient *client,
"ORDER BY ASC(?song) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -426,7 +426,7 @@ get_music_artists (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?artist ?title "
@@ -437,7 +437,7 @@ get_music_artists (TrackerClient *client,
"GROUP BY ?artist "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -460,14 +460,14 @@ get_music_artists (TrackerClient *client,
_("No artists were found"));
} else {
g_print (tracker_dngettext (NULL,
- "Artist: %d",
+ "Artist: %d",
"Artists: %d",
results->len),
results->len);
g_print ("\n");
- g_ptr_array_foreach (results,
- get_music_artists_foreach,
+ g_ptr_array_foreach (results,
+ get_music_artists_foreach,
NULL);
if (results->len >= search_limit) {
@@ -489,14 +489,14 @@ get_music_albums_foreach (gpointer value,
g_print (" "); /*'%s', ", data[1]);*/
g_print (tracker_dngettext (NULL,
- "%d Song",
+ "%d Song",
"%d Songs",
atoi (data[2])),
atoi (data[2]));
g_print (", ");
g_print (tracker_dngettext (NULL,
- "%d Second",
+ "%d Second",
"%d Seconds",
atoi (data[3])),
atoi (data[3]));
@@ -534,7 +534,7 @@ get_music_albums (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?album ?title COUNT(?song) "
@@ -549,7 +549,7 @@ get_music_albums (TrackerClient *client,
"GROUP BY ?album "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -572,14 +572,14 @@ get_music_albums (TrackerClient *client,
_("No music was found"));
} else {
g_print (tracker_dngettext (NULL,
- "Album: %d",
+ "Album: %d",
"Albums: %d",
results->len),
results->len);
g_print ("\n");
- g_ptr_array_foreach (results,
- get_music_albums_foreach,
+ g_ptr_array_foreach (results,
+ get_music_albums_foreach,
NULL);
if (results->len >= search_limit) {
@@ -616,7 +616,7 @@ get_files (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?u "
@@ -626,7 +626,7 @@ get_files (TrackerClient *client,
"ORDER BY ASC(?u) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -660,7 +660,7 @@ get_folders (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?u "
@@ -670,7 +670,7 @@ get_folders (TrackerClient *client,
"ORDER BY ASC(?u) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -682,7 +682,7 @@ get_folders (TrackerClient *client,
}
static void
-get_all_by_search_foreach (gpointer value,
+get_all_by_search_foreach (gpointer value,
gpointer user_data)
{
gchar **metadata;
@@ -705,7 +705,7 @@ get_all_by_search_foreach (gpointer value,
}
static gboolean
-get_all_by_search (TrackerClient *client,
+get_all_by_search (TrackerClient *client,
GStrv search_words,
gint search_offset,
gint search_limit,
@@ -725,13 +725,13 @@ get_all_by_search (TrackerClient *client,
if (detailed_results) {
query = g_strdup_printf ("SELECT ?s ?type ?mimeType WHERE { ?s fts:match \"%s\" ; rdf:type ?type . "
"OPTIONAL { ?s nie:mimeType ?mimeType } } OFFSET %d LIMIT %d",
- fts,
- search_offset,
+ fts,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?s WHERE { ?s fts:match \"%s\" } OFFSET %d LIMIT %d",
- fts,
- search_offset,
+ fts,
+ search_offset,
search_limit);
}
@@ -754,14 +754,14 @@ get_all_by_search (TrackerClient *client,
_("No results were found matching your query"));
} else {
g_print (tracker_dngettext (NULL,
- "Result: %d",
+ "Result: %d",
"Results: %d",
results->len),
results->len);
g_print ("\n");
- g_ptr_array_foreach (results,
- get_all_by_search_foreach,
+ g_ptr_array_foreach (results,
+ get_all_by_search_foreach,
GINT_TO_POINTER (detailed_results));
if (results->len >= search_limit) {
@@ -923,7 +923,7 @@ main (int argc, char **argv)
if (terms) {
gboolean success;
-
+
success = get_all_by_search (client, terms, offset, limit, or_operator, detailed);
tracker_disconnect (client);
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index 1c70ea5..158373f 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -91,16 +91,16 @@ get_class_from_prefix (TrackerClient *client,
const gchar *query;
gchar *found;
gint i;
-
+
query = "SELECT ?prefix ?ns "
"WHERE {"
" ?ns a tracker:Namespace ;"
" tracker:prefix ?prefix "
"}";
-
+
/* We have namespace prefix, get full name */
results = tracker_resources_sparql_query (client, query, &error);
-
+
if (error) {
g_printerr ("%s, %s\n",
_("Could not get namespace prefixes"),
@@ -109,11 +109,11 @@ get_class_from_prefix (TrackerClient *client,
return NULL;
}
-
+
if (!results) {
g_printerr ("%s\n",
_("No namespace prefixes were found"));
-
+
return NULL;
}
@@ -230,7 +230,7 @@ main (int argc, char **argv)
_("No classes were found"));
} else {
g_print (tracker_dngettext (NULL,
- "Class: %d",
+ "Class: %d",
"Classes: %d",
results->len),
results->len);
@@ -268,7 +268,7 @@ main (int argc, char **argv)
_("No class prefixes were found"));
} else {
g_print (tracker_dngettext (NULL,
- "Prefix: %d",
+ "Prefix: %d",
"Prefixes: %d",
results->len),
results->len);
@@ -294,9 +294,9 @@ main (int argc, char **argv)
prefix = g_strdup (list_properties);
p = strchr (prefix, ':');
-
+
if (!p) {
- g_printerr ("%s\n",
+ g_printerr ("%s\n",
_("Could not find property for class prefix, "
"e.g. :Resource in 'rdfs:Resource'"));
g_free (prefix);
@@ -320,7 +320,7 @@ main (int argc, char **argv)
g_free (class_name_no_property);
g_free (property);
}
-
+
query = g_strdup_printf ("SELECT ?prop "
"WHERE {"
" ?prop a rdf:Property ;"
@@ -347,7 +347,7 @@ main (int argc, char **argv)
_("No properties were found"));
} else {
g_print (tracker_dngettext (NULL,
- "Property: %d",
+ "Property: %d",
"Properties: %d",
results->len),
results->len);
@@ -400,7 +400,7 @@ main (int argc, char **argv)
_("Could not run update"),
error->message);
g_error_free (error);
-
+
return FALSE;
}
@@ -435,21 +435,21 @@ main (int argc, char **argv)
_("Could not run query"),
error->message);
g_error_free (error);
-
+
return FALSE;
}
-
+
if (!results) {
g_print ("%s\n",
_("No results found matching your query"));
} else {
g_print (tracker_dngettext (NULL,
- "Result: %d",
+ "Result: %d",
"Results: %d",
results->len),
results->len);
g_print ("\n");
-
+
g_ptr_array_foreach (results, results_foreach, NULL);
g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
g_ptr_array_free (results, TRUE);
diff --git a/src/tracker-utils/tracker-status.c b/src/tracker-utils/tracker-status.c
index 8a4e4c8..f10416b 100644
--- a/src/tracker-utils/tracker-status.c
+++ b/src/tracker-utils/tracker-status.c
@@ -66,11 +66,11 @@ static gboolean print_version;
static GOptionEntry entries[] = {
{ "follow", 'f', 0, G_OPTION_ARG_NONE, &follow,
N_("Follow status changes as they happen"),
- NULL
+ NULL
},
{ "detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed,
N_("Include details with state updates (only applies to --follow)"),
- NULL
+ NULL
},
{ "show-key", 'k', 0, G_OPTION_ARG_NONE, &show_key,
N_("Shows the key used when listing miners and their states"),
@@ -78,15 +78,15 @@ static GOptionEntry entries[] = {
},
{ "list-miners-running", 'l', 0, G_OPTION_ARG_NONE, &list_miners_running,
N_("List all miners currently running"),
- NULL
+ NULL
},
{ "list-miners-available", 'a', 0, G_OPTION_ARG_NONE, &list_miners_available,
N_("List all miners installed"),
- NULL
+ NULL
},
{ "pause-details", 'i', 0, G_OPTION_ARG_NONE, &pause_details,
N_("List pause reasons and applications for a miner"),
- NULL
+ NULL
},
{ "miner", 'm', 0, G_OPTION_ARG_STRING, &miner_name,
N_("Miner to use with other commands (you can use suffixes, e.g. FS or Applications)"),
@@ -102,7 +102,7 @@ static GOptionEntry entries[] = {
},
{ "version", 'V', 0, G_OPTION_ARG_NONE, &print_version,
N_("Print version"),
- NULL
+ NULL
},
{ NULL }
};
@@ -238,9 +238,9 @@ miner_print_state (TrackerMinerManager *manager,
if (detailed) {
now = time ((time_t *) NULL);
local_time = localtime (&now);
- len = strftime (time_str,
- sizeof (time_str) - 1,
- "%d %b %Y, %H:%M:%S:",
+ len = strftime (time_str,
+ sizeof (time_str) - 1,
+ "%d %b %Y, %H:%M:%S:",
local_time);
time_str[len] = '\0';
} else {
@@ -250,7 +250,7 @@ miner_print_state (TrackerMinerManager *manager,
name = tracker_miner_manager_get_display_name (manager, miner_name);
if (is_running) {
- g_print ("%s [%s] %s: %3.0f%%, %s, %s: '%s'\n",
+ g_print ("%s [%s] %s: %3.0f%%, %s, %s: '%s'\n",
time_str,
is_paused ? "P" : "R",
_("Progress"),
@@ -259,7 +259,7 @@ miner_print_state (TrackerMinerManager *manager,
_("Status"),
status ? status : _("Unknown"));
} else {
- g_print ("%s [ ] %s: %3.0f%%, %s\n",
+ g_print ("%s [ ] %s: %3.0f%%, %s\n",
time_str,
_("Progress"),
0.0,
@@ -282,11 +282,11 @@ manager_miner_progress_cb (TrackerMinerManager *manager,
miner_print_state (manager, miner_name, status, progress, TRUE, FALSE);
- g_hash_table_replace (miners_status,
- g_strdup (miner_name),
+ g_hash_table_replace (miners_status,
+ g_strdup (miner_name),
g_strdup (status));
- g_hash_table_replace (miners_progress,
- g_strdup (miner_name),
+ g_hash_table_replace (miners_progress,
+ g_strdup (miner_name),
gvalue);
}
@@ -300,8 +300,8 @@ manager_miner_paused_cb (TrackerMinerManager *manager,
miner_print_state (manager, miner_name,
g_hash_table_lookup (miners_status, miner_name),
- gvalue ? g_value_get_double (gvalue) : 0.0,
- TRUE,
+ gvalue ? g_value_get_double (gvalue) : 0.0,
+ TRUE,
TRUE);
}
@@ -310,13 +310,13 @@ manager_miner_resumed_cb (TrackerMinerManager *manager,
const gchar *miner_name)
{
GValue *gvalue;
-
+
gvalue = g_hash_table_lookup (miners_progress, miner_name);
miner_print_state (manager, miner_name,
g_hash_table_lookup (miners_status, miner_name),
- gvalue ? g_value_get_double (gvalue) : 0.0,
- TRUE,
+ gvalue ? g_value_get_double (gvalue) : 0.0,
+ TRUE,
FALSE);
}
@@ -388,7 +388,7 @@ main (gint argc, gchar *argv[])
g_option_context_free (context);
g_type_init ();
-
+
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
@@ -422,7 +422,7 @@ main (gint argc, gchar *argv[])
if (list_miners_available) {
gchar *str;
-
+
str = g_strdup_printf (_("Found %d miners installed"), g_slist_length (miners_available));
g_print ("%s%s\n", str, g_slist_length (miners_available) > 0 ? ":" : "");
g_free (str);
@@ -434,7 +434,7 @@ main (gint argc, gchar *argv[])
if (list_miners_running) {
gchar *str;
-
+
str = g_strdup_printf (_("Found %d miners running"), g_slist_length (miners_running));
g_print ("%s%s\n", str, g_slist_length (miners_running) > 0 ? ":" : "");
g_free (str);
@@ -472,7 +472,7 @@ main (gint argc, gchar *argv[])
g_slist_foreach (miners_available, (GFunc) g_free, NULL);
g_slist_free (miners_available);
-
+
g_slist_foreach (miners_running, (GFunc) g_free, NULL);
g_slist_free (miners_running);
@@ -499,7 +499,7 @@ main (gint argc, gchar *argv[])
&pause_reasons)) {
continue;
}
-
+
if (!(*pause_applications) || !(*pause_reasons)) {
g_strfreev (pause_applications);
g_strfreev (pause_reasons);
@@ -510,17 +510,17 @@ main (gint argc, gchar *argv[])
if (paused_miners == 1) {
g_print ("%s:\n", _("Miners"));
}
-
+
g_print (" %s:\n", name);
-
+
for (i = 0; pause_applications[i] != NULL; i++) {
- g_print (" %s: '%s', %s: '%s'\n",
+ g_print (" %s: '%s', %s: '%s'\n",
_("Application"),
pause_applications[i],
_("Reason"),
pause_reasons[i]);
}
-
+
g_strfreev (pause_applications);
g_strfreev (pause_reasons);
}
@@ -534,7 +534,7 @@ main (gint argc, gchar *argv[])
g_slist_foreach (miners_running, (GFunc) g_free, NULL);
g_slist_free (miners_running);
-
+
return EXIT_SUCCESS;
}
@@ -571,7 +571,7 @@ main (gint argc, gchar *argv[])
is_paused = *pause_applications || *pause_reasons;
miner_print_state (manager, l->data, status, progress, TRUE, is_paused);
-
+
g_strfreev (pause_applications);
g_strfreev (pause_reasons);
g_free (status);
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 75c4a65..90fb7e4 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -84,7 +84,7 @@ static GOptionEntry entries[] = {
N_("Print version"),
NULL
},
- { G_OPTION_REMAINING, 0,
+ { G_OPTION_REMAINING, 0,
G_OPTION_FLAG_FILENAME,
G_OPTION_ARG_STRING_ARRAY, &files,
N_("FILEâ?¦"),
@@ -99,7 +99,7 @@ show_limit_warning (void)
* more items.
*/
g_print (" ...\n");
-
+
/* Display warning so the user knows this is
* not the WHOLE data set.
*/
@@ -165,7 +165,7 @@ get_fts_string (GStrv search_words,
g_string_append (fts, search_words[i]);
g_string_append_c (fts, '*');
- if (i < len - 1) {
+ if (i < len - 1) {
if (for_regex) {
if (use_or_operator) {
g_string_append (fts, " || ");
@@ -221,7 +221,7 @@ get_filter_string (GStrv files,
g_string_append_printf (filter, "?f = <%s>", uri);
g_free (uri);
- if (i < len - 1) {
+ if (i < len - 1) {
g_string_append (filter, " || ");
}
}
@@ -256,12 +256,12 @@ get_all_tags_foreach (gpointer value,
tag = data[1];
g_print (" %s\n", tag);
-
+
g_print (" %s\n", id);
g_print (" ");
g_print (tracker_dngettext (NULL,
- "%d file",
+ "%d file",
"%d files",
files),
files);
@@ -282,7 +282,7 @@ get_all_tags_foreach (gpointer value,
g_free (query);
if (error) {
- g_print (" %s, %s\n",
+ g_print (" %s, %s\n",
_("Could not get files related to tag"),
error->message);
g_error_free (error);
@@ -291,7 +291,7 @@ get_all_tags_foreach (gpointer value,
for (i = 0; i < results->len; i++) {
GStrv files;
-
+
files = g_ptr_array_index (results, i);
g_print (" %s\n", files[0]);
g_strfreev (files);
@@ -317,7 +317,7 @@ get_all_tags (TrackerClient *client,
if (fts) {
query = g_strdup_printf ("SELECT ?tag ?label COUNT(?urns) AS urns "
- "WHERE {"
+ "WHERE {"
" ?tag a nao:Tag ;"
" nao:prefLabel ?label ."
" OPTIONAL {"
@@ -330,11 +330,11 @@ get_all_tags (TrackerClient *client,
"OFFSET %d "
"LIMIT %d",
fts,
- search_offset,
+ search_offset,
search_limit);
} else {
query = g_strdup_printf ("SELECT ?tag ?label COUNT(?urns) AS urns "
- "WHERE {"
+ "WHERE {"
" ?tag a nao:Tag ;"
" nao:prefLabel ?label ."
" OPTIONAL {"
@@ -345,7 +345,7 @@ get_all_tags (TrackerClient *client,
"ORDER BY ASC(?label) "
"OFFSET %d "
"LIMIT %d",
- search_offset,
+ search_offset,
search_limit);
}
@@ -368,13 +368,13 @@ get_all_tags (TrackerClient *client,
_("No tags were found"));
} else {
g_print (tracker_dngettext (NULL,
- "Tag: %d (shown by name)",
+ "Tag: %d (shown by name)",
"Tags: %d (shown by name)",
results->len),
results->len);
g_print ("\n");
- g_ptr_array_foreach (results,
+ g_ptr_array_foreach (results,
get_all_tags_foreach,
show_files ? client : NULL);
@@ -385,7 +385,7 @@ get_all_tags (TrackerClient *client,
g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
g_ptr_array_free (results, TRUE);
}
-
+
return TRUE;
}
@@ -504,7 +504,7 @@ remove_tag_for_urns (TrackerClient *client,
return FALSE;
}
-
+
if (!results || !results->pdata || !results->pdata[0]) {
g_print ("%s\n",
_("No tags were found by that name"));
@@ -529,7 +529,7 @@ remove_tag_for_urns (TrackerClient *client,
#if 0
filter = get_filter_string (files);
- query = g_strdup_printf ("DELETE {"
+ query = g_strdup_printf ("DELETE {"
" <%s> nao:hasTag ?tag "
"} "
"WHERE {"
@@ -583,8 +583,8 @@ get_tags_by_file_foreach (gpointer value,
g_print (" %s\n", data[1]);
}
-static gboolean
-get_tags_by_file (TrackerClient *client,
+static gboolean
+get_tags_by_file (TrackerClient *client,
const gchar *file)
{
GError *error = NULL;
@@ -617,14 +617,14 @@ get_tags_by_file (TrackerClient *client,
g_print (" %s\n",
_("No tags were found"));
} else {
- g_ptr_array_foreach (results,
+ g_ptr_array_foreach (results,
get_tags_by_file_foreach,
NULL);
g_ptr_array_foreach (results, (GFunc) g_strfreev, NULL);
g_ptr_array_free (results, TRUE);
}
-
+
return TRUE;
}
@@ -698,7 +698,7 @@ main (int argc, char **argv)
return success ? EXIT_SUCCESS : EXIT_FAILURE;
}
-
+
if (add_tag) {
gboolean success;
@@ -735,7 +735,7 @@ main (int argc, char **argv)
tracker_disconnect (client);
/* This is a failure because we should have done something.
- * This code should never be reached in practise.
- */
+ * This code should never be reached in practise.
+ */
return EXIT_FAILURE;
}
diff --git a/src/tracker-writeback/tracker-writeback-consumer.c b/src/tracker-writeback/tracker-writeback-consumer.c
index 0a5b316..a611ef9 100644
--- a/src/tracker-writeback/tracker-writeback-consumer.c
+++ b/src/tracker-writeback/tracker-writeback-consumer.c
@@ -136,7 +136,7 @@ tracker_writeback_consumer_new (void)
}
static gboolean
-sparql_rdf_types_match (const gchar * const *module_types,
+sparql_rdf_types_match (const gchar * const *module_types,
const gchar * const *rdf_types)
{
guint n;
diff --git a/src/tracker-writeback/tracker-writeback-mp3.c b/src/tracker-writeback/tracker-writeback-mp3.c
index b2b7f28..b168099 100644
--- a/src/tracker-writeback/tracker-writeback-mp3.c
+++ b/src/tracker-writeback/tracker-writeback-mp3.c
@@ -72,10 +72,10 @@ tracker_writeback_mp3_init (TrackerWritebackMP3 *wbm)
static const gchar * const *
writeback_mp3_content_types (TrackerWritebackFile *wbf)
{
- static const gchar *content_types[] = {
- "audio/mpeg",
+ static const gchar *content_types[] = {
+ "audio/mpeg",
"audio/x-mp3",
- NULL
+ NULL
};
return content_types;
@@ -119,7 +119,7 @@ writeback_mp3_update_file_metadata (TrackerWritebackFile *writeback_file,
ID3Tag_Update (tag);
/* Apparently this ain't needed (and crashes)
- * ID3Frame_Delete (frame);
+ * ID3Frame_Delete (frame);
*/
ID3Tag_Delete (tag);
}
@@ -143,9 +143,9 @@ writeback_module_create (GTypeModule *module)
const gchar * const *
writeback_module_get_rdf_types (void)
{
- static const gchar *rdftypes[] = {
+ static const gchar *rdftypes[] = {
TRACKER_NFO_PREFIX "Audio",
- NULL
+ NULL
};
return rdftypes;
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index 7aedff6..e92ec2f 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -87,16 +87,16 @@ writeback_xmp_content_types (TrackerWritebackFile *wbf)
"sketch/png", /* .sketch.png files on Maemo*/
"image/jpeg", /* .jpg & .jpeg files */
"image/tiff", /* .tiff & .tif files */
- NULL
+ NULL
};
- /* "image/gif" .gif files
- "application/pdf" .pdf files
- "application/rdf+xml" .xmp files
- "application/postscript" .ps files
- "application/x-shockwave-flash" .swf files
- "video/quicktime" .mov files
- "video/mpeg" .mpeg & .mpg files
+ /* "image/gif" .gif files
+ "application/pdf" .pdf files
+ "application/rdf+xml" .xmp files
+ "application/postscript" .ps files
+ "application/x-shockwave-flash" .swf files
+ "video/quicktime" .mov files
+ "video/mpeg" .mpeg & .mpg files
"audio/mpeg" .mp3, etc files */
return content_types;
@@ -255,22 +255,22 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile *wbf,
}
- /*
+ /*
if (g_strcmp0 (row[1], PHOTO_HAS "contact") == 0) {
Face recognition on the photos
xmp_delete_property (xmp, FACE, "contact");
Fetch full name of the contact?
- xmp_set_array_item (xmp, FACE, "contact", 1, fetched, 0);
+ xmp_set_array_item (xmp, FACE, "contact", 1, fetched, 0);
}
if (g_strcmp0 (row[1], LOCATION_PREFIX "country") == 0) {
xmp_delete_property (xmp, NS_PHOTOSHOP, "Country");
- xmp_set_array_item (xmp, NS_PHOTOSHOP, "Country", 1, row[2], 0);
+ xmp_set_array_item (xmp, NS_PHOTOSHOP, "Country", 1, row[2], 0);
}
if (g_strcmp0 (row[1], LOCATION_PREFIX "city") == 0) {
xmp_delete_property (xmp, NS_PHOTOSHOP, "City");
- xmp_set_array_item (xmp, NS_PHOTOSHOP, "City", 1, row[2], 0);
+ xmp_set_array_item (xmp, NS_PHOTOSHOP, "City", 1, row[2], 0);
} */
}
@@ -314,11 +314,11 @@ writeback_module_create (GTypeModule *module)
const gchar * const *
writeback_module_get_rdf_types (void)
{
- static const gchar *rdf_types[] = {
+ static const gchar *rdf_types[] = {
TRACKER_NFO_PREFIX "Image",
TRACKER_NFO_PREFIX "Audio",
TRACKER_NFO_PREFIX "Video",
- NULL
+ NULL
};
return rdf_types;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3045400..8549d7f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,4 +9,4 @@ SUBDIRS = \
tracker-miner-fs \
tracker-extract \
tracker-store \
- functional-tests
+ functional-tests
diff --git a/tests/functional-tests/tests.xml b/tests/functional-tests/tests.xml
index f758d68..be0c537 100644
--- a/tests/functional-tests/tests.xml
+++ b/tests/functional-tests/tests.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<testdefinition version="0.1">
- <suite name="tracker-tests" domain="tracker-store">
+ <suite name="tracker-tests" domain="tracker-store">
<!-- At least one set per suite, name and description mandatory -->
- <set name="testset1" description="Basic sparql tests" feature="sparql-insert">
+ <set name="testset1" description="Basic sparql tests" feature="sparql-insert">
<pre_steps>
<!-- This doesn't seem to work -->
<step>. /tmp/session_bus_address.user</step>
@@ -26,13 +26,13 @@
<!-- dbus env variables defined here. This works. -->
<step expected_result="0">. /tmp/session_bus_address.user; python2.5 /usr/share/tracker-tests/03-fts-functions.py</step>
</case>
-
+
<!-- Environments optional - tells where the tests are run -->
<environments>
<scratchbox>true</scratchbox>
- <hardware>true</hardware>
+ <hardware>true</hardware>
</environments>
-
+
</set>
</suite>
</testdefinition>
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index 002aa96..986e289 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = $(TEST_PROGS)
# because make distcheck fails. The reason for this is that it
# depends files being installed to $prefix/share which have not
# been installed at this point.
-#
+#
# These tests include:
#
# tracker-field
@@ -44,7 +44,7 @@ tracker_dbus_LDADD = \
$(GCOV_LIBS)
tracker_type_utils_SOURCES = \
- tracker-type-utils-test.c
+ tracker-type-utils-test.c
tracker_type_utils_LDADD = \
$(top_builddir)/tests/common/libtracker-testcommon.la \
@@ -56,7 +56,7 @@ tracker_type_utils_LDADD = \
$(GCOV_LIBS)
tracker_file_utils_SOURCES = \
- tracker-file-utils-test.c
+ tracker-file-utils-test.c
tracker_file_utils_LDADD = \
$(top_builddir)/tests/common/libtracker-testcommon.la \
@@ -68,7 +68,7 @@ tracker_file_utils_LDADD = \
$(GCOV_LIBS)
# tracker_property_SOURCES = \
-# tracker-field-test.c
+# tracker-field-test.c
#
# tracker_property_LDADD = \
# $(top_builddir)/tests/common/libtracker-testcommon.la \
diff --git a/tests/libtracker-common/mock-dbus-gproxy.c b/tests/libtracker-common/mock-dbus-gproxy.c
index 03f34d9..533ade4 100644
--- a/tests/libtracker-common/mock-dbus-gproxy.c
+++ b/tests/libtracker-common/mock-dbus-gproxy.c
@@ -1,6 +1,6 @@
/*
- * To simulate a DBusGProxy in the unit tests, we need a GObject (dbus
- * disconnection does a g_object_unref (). This is a GObject with only
+ * To simulate a DBusGProxy in the unit tests, we need a GObject (dbus
+ * disconnection does a g_object_unref (). This is a GObject with only
* one attribute (an integer), generated with vala.
*/
diff --git a/tests/libtracker-common/mock-dbus-gproxy.h b/tests/libtracker-common/mock-dbus-gproxy.h
index dc02186..b5205c3 100644
--- a/tests/libtracker-common/mock-dbus-gproxy.h
+++ b/tests/libtracker-common/mock-dbus-gproxy.h
@@ -1,6 +1,6 @@
/*
- * To simulate a DBusGProxy in the unit tests, we need a GObject (dbus
- * disconnection does a g_object_unref (). This is a GObject with only
+ * To simulate a DBusGProxy in the unit tests, we need a GObject (dbus
+ * disconnection does a g_object_unref (). This is a GObject with only
* one attribute (an integer), generated with the following vala code:
* (command-line: valac -C mock-dbus-gproxy.vala)
*
diff --git a/tests/libtracker-common/mock-thumbnailer-dbus.c b/tests/libtracker-common/mock-thumbnailer-dbus.c
index f7d0f37..608fe9a 100644
--- a/tests/libtracker-common/mock-thumbnailer-dbus.c
+++ b/tests/libtracker-common/mock-thumbnailer-dbus.c
@@ -27,13 +27,13 @@
#include <dbus/dbus-glib.h>
#include "mock-dbus-gproxy.h"
-DBusGConnection*
+DBusGConnection*
dbus_g_bus_get (DBusBusType type, GError **error)
{
return (DBusGConnection *)g_strdup ("mock connection");
}
-DBusGProxy*
+DBusGProxy*
dbus_g_proxy_new_for_name (DBusGConnection *connection,
const char *name,
const char *path,
@@ -42,7 +42,7 @@ dbus_g_proxy_new_for_name (DBusGConnection *connection,
return (DBusGProxy *)mock_dbus_gproxy_new ();
}
-gboolean
+gboolean
dbus_g_proxy_call (DBusGProxy *proxy,
const char *method,
GError **error,
@@ -62,17 +62,17 @@ dbus_g_proxy_call (DBusGProxy *proxy,
t = va_arg (args, GType*);
mime_types = va_arg (args, GStrv*);
-
+
*mime_types = g_strdupv (mimetypes);
}
va_end (args);
- return TRUE;
+ return TRUE;
}
-void
-dbus_g_proxy_call_no_reply (DBusGProxy *proxy,
- const char *method,
+void
+dbus_g_proxy_call_no_reply (DBusGProxy *proxy,
+ const char *method,
GType first_arg_type,...)
{
g_message ("DBUS-CALL: %s", method);
diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-common/tracker-dbus-test.c
index 85678f1..4b5730c 100644
--- a/tests/libtracker-common/tracker-dbus-test.c
+++ b/tests/libtracker-common/tracker-dbus-test.c
@@ -50,7 +50,7 @@ slist_to_strv (gboolean utf8)
input_as_strv = tracker_dbus_slist_to_strv (input);
}
/* Error message:
- * Could not add string:'/invalid/file/\xe4\xf6\xe590808.' to GStrv, invalid UTF-8
+ * Could not add string:'/invalid/file/\xe4\xf6\xe590808.' to GStrv, invalid UTF-8
*/
g_test_trap_assert_stderr ("*Could not add string:*");
}
@@ -96,14 +96,14 @@ async_queue_to_strv (gboolean utf8)
if (utf8) {
queue_as_strv = tracker_dbus_queue_str_to_strv (queue, g_queue_get_length (queue));
- g_assert_cmpint (g_strv_length (queue_as_strv), ==, strings);
+ g_assert_cmpint (g_strv_length (queue_as_strv), ==, strings);
g_strfreev (queue_as_strv);
} else {
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
queue_as_strv = tracker_dbus_queue_str_to_strv (queue, g_queue_get_length (queue));
}
/* Error message:
- * Could not add string:'/invalid/file/\xe4\xf6\xe590808.' to GStrv, invalid UTF-8
+ * Could not add string:'/invalid/file/\xe4\xf6\xe590808.' to GStrv, invalid UTF-8
*/
g_test_trap_assert_stderr ("*Could not add string:*");
}
diff --git a/tests/libtracker-data/algebra/filter-placement-1.rq b/tests/libtracker-data/algebra/filter-placement-1.rq
index cdabba4..8040481 100644
--- a/tests/libtracker-data/algebra/filter-placement-1.rq
+++ b/tests/libtracker-data/algebra/filter-placement-1.rq
@@ -1,7 +1,7 @@
PREFIX : <http://example/>
-SELECT ?v
-{
- ?s :p ?v .
+SELECT ?v
+{
+ ?s :p ?v .
FILTER (?v = 2)
}
diff --git a/tests/libtracker-data/algebra/filter-placement-2.rq b/tests/libtracker-data/algebra/filter-placement-2.rq
index 0f4e1a3..c6ee4cf 100644
--- a/tests/libtracker-data/algebra/filter-placement-2.rq
+++ b/tests/libtracker-data/algebra/filter-placement-2.rq
@@ -1,7 +1,7 @@
PREFIX : <http://example/>
-SELECT ?v
-{
+SELECT ?v
+{
FILTER (?v = 2)
- ?s :p ?v .
+ ?s :p ?v .
}
diff --git a/tests/libtracker-data/algebra/filter-placement-3.rq b/tests/libtracker-data/algebra/filter-placement-3.rq
index f3be6d2..57f1767 100644
--- a/tests/libtracker-data/algebra/filter-placement-3.rq
+++ b/tests/libtracker-data/algebra/filter-placement-3.rq
@@ -1,9 +1,9 @@
PREFIX : <http://example/>
SELECT ?v ?w
-{
+{
FILTER (?v = 2)
FILTER (?w = 3)
- ?s :p ?v .
+ ?s :p ?v .
?s :q ?w .
}
diff --git a/tests/libtracker-data/bnode-coreference/query.rq b/tests/libtracker-data/bnode-coreference/query.rq
index 2985cf2..f877377 100755
--- a/tests/libtracker-data/bnode-coreference/query.rq
+++ b/tests/libtracker-data/bnode-coreference/query.rq
@@ -1,4 +1,4 @@
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT ?x ?y
diff --git a/tests/libtracker-data/dawg-testcases b/tests/libtracker-data/dawg-testcases
index 4172fa3..26e834c 100644
--- a/tests/libtracker-data/dawg-testcases
+++ b/tests/libtracker-data/dawg-testcases
@@ -48,5 +48,5 @@ DOCUMENTATION.
The name and trademarks of copyright holders may NOT be used in advertising
or publicity pertaining to the software without specific, written prior
permission. Title to copyright in this software and any associated
-documentation will at all times remain with copyright holders.
+documentation will at all times remain with copyright holders.
diff --git a/tests/libtracker-data/expr-ops/query-ge-1.rq b/tests/libtracker-data/expr-ops/query-ge-1.rq
index 9e5c52d..5eadb36 100755
--- a/tests/libtracker-data/expr-ops/query-ge-1.rq
+++ b/tests/libtracker-data/expr-ops/query-ge-1.rq
@@ -1,5 +1,5 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- FILTER(?o >= 3) .
-}
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ FILTER(?o >= 3) .
+}
diff --git a/tests/libtracker-data/expr-ops/query-le-1.rq b/tests/libtracker-data/expr-ops/query-le-1.rq
index e6004e2..f0b17d1 100755
--- a/tests/libtracker-data/expr-ops/query-le-1.rq
+++ b/tests/libtracker-data/expr-ops/query-le-1.rq
@@ -1,6 +1,6 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- FILTER(?o <= 2) .
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ FILTER(?o <= 2) .
}
ORDER BY ?s
diff --git a/tests/libtracker-data/expr-ops/query-minus-1.rq b/tests/libtracker-data/expr-ops/query-minus-1.rq
index 802b438..a4c2767 100755
--- a/tests/libtracker-data/expr-ops/query-minus-1.rq
+++ b/tests/libtracker-data/expr-ops/query-minus-1.rq
@@ -1,6 +1,6 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- ?s2 :p ?o2 .
- FILTER(?o - ?o2 = 3) .
-}
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ ?s2 :p ?o2 .
+ FILTER(?o - ?o2 = 3) .
+}
diff --git a/tests/libtracker-data/expr-ops/query-mul-1.rq b/tests/libtracker-data/expr-ops/query-mul-1.rq
index 1f87678..1ff97da 100755
--- a/tests/libtracker-data/expr-ops/query-mul-1.rq
+++ b/tests/libtracker-data/expr-ops/query-mul-1.rq
@@ -1,7 +1,7 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- ?s2 :p ?o2 .
- FILTER(?o * ?o2 = 4) .
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ ?s2 :p ?o2 .
+ FILTER(?o * ?o2 = 4) .
}
ORDER BY ?s
diff --git a/tests/libtracker-data/expr-ops/query-plus-1.rq b/tests/libtracker-data/expr-ops/query-plus-1.rq
index 6c867c1..8321ac7 100755
--- a/tests/libtracker-data/expr-ops/query-plus-1.rq
+++ b/tests/libtracker-data/expr-ops/query-plus-1.rq
@@ -1,7 +1,7 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- ?s2 :p ?o2 .
- FILTER(?o + ?o2 = 3) .
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ ?s2 :p ?o2 .
+ FILTER(?o + ?o2 = 3) .
}
ORDER BY ?s
diff --git a/tests/libtracker-data/expr-ops/query-unminus-1.rq b/tests/libtracker-data/expr-ops/query-unminus-1.rq
index f308628..f77d556 100755
--- a/tests/libtracker-data/expr-ops/query-unminus-1.rq
+++ b/tests/libtracker-data/expr-ops/query-unminus-1.rq
@@ -1,5 +1,5 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- FILTER(-?o = -2) .
-}
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ FILTER(-?o = -2) .
+}
diff --git a/tests/libtracker-data/expr-ops/query-unplus-1.rq b/tests/libtracker-data/expr-ops/query-unplus-1.rq
index b9ca53c..735e99b 100755
--- a/tests/libtracker-data/expr-ops/query-unplus-1.rq
+++ b/tests/libtracker-data/expr-ops/query-unplus-1.rq
@@ -1,5 +1,5 @@
-PREFIX : <http://example.org/>
-SELECT ?s WHERE {
- ?s :p ?o .
- FILTER(?o = +3) .
-}
+PREFIX : <http://example.org/>
+SELECT ?s WHERE {
+ ?s :p ?o .
+ FILTER(?o = +3) .
+}
diff --git a/tests/libtracker-data/optional/q-opt-complex-1.rq b/tests/libtracker-data/optional/q-opt-complex-1.rq
index 1b91d97..2ff7cb6 100644
--- a/tests/libtracker-data/optional/q-opt-complex-1.rq
+++ b/tests/libtracker-data/optional/q-opt-complex-1.rq
@@ -1,11 +1,11 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT ?person ?nick ?page ?img ?name ?firstN
-{
+{
?person foaf:nick ?nick
- OPTIONAL { ?person foaf:isPrimaryTopicOf ?page }
- OPTIONAL {
- ?person foaf:name ?name
- { ?person foaf:depiction ?img } UNION
- { ?person foaf:firstName ?firstN }
- } FILTER ( bound(?page) || bound(?img) || bound(?firstN) )
+ OPTIONAL { ?person foaf:isPrimaryTopicOf ?page }
+ OPTIONAL {
+ ?person foaf:name ?name
+ { ?person foaf:depiction ?img } UNION
+ { ?person foaf:firstName ?firstN }
+ } FILTER ( bound(?page) || bound(?img) || bound(?firstN) )
}
\ No newline at end of file
diff --git a/tests/libtracker-data/sort/query-sort-4.rq b/tests/libtracker-data/sort/query-sort-4.rq
index 3f8b3ee..a3fb54e 100755
--- a/tests/libtracker-data/sort/query-sort-4.rq
+++ b/tests/libtracker-data/sort/query-sort-4.rq
@@ -1,5 +1,5 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX ex: <http://example.org/things#>
+PREFIX ex: <http://example.org/things#>
SELECT ?name ?emp
WHERE { ?x foaf:name ?name ;
diff --git a/tests/libtracker-data/sort/query-sort-5.rq b/tests/libtracker-data/sort/query-sort-5.rq
index 71bfb00..564fba3 100755
--- a/tests/libtracker-data/sort/query-sort-5.rq
+++ b/tests/libtracker-data/sort/query-sort-5.rq
@@ -1,8 +1,8 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX ex: <http://example.org/things#>
+PREFIX ex: <http://example.org/things#>
SELECT ?name ?emp
-WHERE { ?x foaf:name ?name ;
- ex:empId ?emp
+WHERE { ?x foaf:name ?name ;
+ ex:empId ?emp
}
ORDER BY ?name DESC(?emp)
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index b108b48..ce4f9a2 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -68,7 +68,7 @@ const TestInfo nmo_tests[] = {
{ "nmo/filter-isread-1", "nmo/data-1" },
{ "nmo/filter-isrecent-1", "nmo/data-1" },
{ "nmo/filter-messageid-1", "nmo/data-1" },
- { "nmo/filter-messagesubject-1", "nmo/data-1" },
+ { "nmo/filter-messagesubject-1", "nmo/data-1" },
{ "nmo/filter-plaintextmessagecontent-1", "nmo/data-1" },
{ NULL }
};
@@ -95,7 +95,7 @@ test_query (gconstpointer test_data)
/* initialization */
tracker_data_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
- NULL,
+ NULL,
NULL, NULL);
/* load data set */
@@ -214,11 +214,11 @@ main (int argc, char **argv)
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
-
+
g_test_init (&argc, &argv, NULL);
current_dir = g_get_current_dir ();
-
+
g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
@@ -230,7 +230,7 @@ main (int argc, char **argv)
gchar *testpath;
g_message ("%d", i);
-
+
testpath = g_strconcat ("/libtracker-data/nie/", nie_tests[i].test_name, NULL);
g_test_add_data_func (testpath, &nie_tests[i], test_query);
g_free (testpath);
@@ -240,7 +240,7 @@ main (int argc, char **argv)
gchar *testpath;
g_message ("%d", i);
-
+
testpath = g_strconcat ("/libtracker-data/nmo/", nmo_tests[i].test_name, NULL);
g_test_add_data_func (testpath, &nmo_tests[i], test_query);
g_free (testpath);
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index abad601..32b644d 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -74,7 +74,7 @@ const TestInfo tests[] = {
{ "sort/query-sort-5", "sort/data-sort-4", FALSE },
{ "subqueries/subqueries-1", "subqueries/data-1", FALSE },
/* Bracket error after WHERE */
- { "error/query-error-1", "error/query-error-1", TRUE },
+ { "error/query-error-1", "error/query-error-1", TRUE },
/* Unknown property */
{ "error/query-error-2", "error/query-error-2", TRUE },
@@ -112,7 +112,7 @@ test_sparql_query (gconstpointer test_data)
g_free (prefix);
tracker_data_manager_init (TRACKER_DB_MANAGER_FORCE_REINDEX,
- data_prefix,
+ data_prefix,
NULL, NULL);
/* data_path = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL); */
@@ -242,11 +242,11 @@ main (int argc, char **argv)
if (!g_thread_supported ()) {
g_thread_init (NULL);
}
-
+
g_test_init (&argc, &argv, NULL);
current_dir = g_get_current_dir ();
-
+
g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
g_setenv ("TRACKER_DB_SQL_DIR", TOP_SRCDIR "/data/db/", TRUE);
@@ -257,7 +257,7 @@ main (int argc, char **argv)
/* add test cases */
for (i = 0; tests[i].test_name; i++) {
gchar *testpath;
-
+
testpath = g_strconcat ("/libtracker-data/sparql/", tests[i].test_name, NULL);
g_test_add_data_func (testpath, &tests[i], test_sparql_query);
g_free (testpath);
diff --git a/tests/libtracker-data/turtle/turtle-query-001.rq b/tests/libtracker-data/turtle/turtle-query-001.rq
index e42b4ce..96693ca 100755
--- a/tests/libtracker-data/turtle/turtle-query-001.rq
+++ b/tests/libtracker-data/turtle/turtle-query-001.rq
@@ -1,5 +1,5 @@
-PREFIX foo: <http://example.org/ns#>
-PREFIX : <http://other.example.org/ns#>
+PREFIX foo: <http://example.org/ns#>
+PREFIX : <http://other.example.org/ns#>
SELECT ?foo ?bar WHERE {
foo:bar foo: ?foo .
diff --git a/tests/libtracker-db/Makefile.am b/tests/libtracker-db/Makefile.am
index fd70a79..8397c17 100644
--- a/tests/libtracker-db/Makefile.am
+++ b/tests/libtracker-db/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = $(TEST_PROGS)
# because make distcheck fails. The reason for this is that it
# depends files being installed to $prefix/share which have not
# been installed at this point.
-#
+#
# These tests include:
#
# tracker-db-dbus
@@ -81,7 +81,7 @@ INCLUDES = \
# -lz
#
# tracker_db_dbus_SOURCES = \
-# tracker-db-dbus-test.c
+# tracker-db-dbus-test.c
#
# tracker_db_dbus_LDADD = \
# $(top_builddir)/src/libtracker-common/libtracker-common.la \
diff --git a/tests/libtracker-db/tracker-db-dbus-test.c b/tests/libtracker-db/tracker-db-dbus-test.c
index 4a5a1ac..867d1e3 100644
--- a/tests/libtracker-db/tracker-db-dbus-test.c
+++ b/tests/libtracker-db/tracker-db-dbus-test.c
@@ -66,30 +66,30 @@ get_mock_tracker_db_multi_result (gint results, gint columns, gboolean set_null)
mock = _tracker_db_result_set_new (columns+1);
for (i = 0; i < results; i++) {
-
+
for (multi = 0; multi < 2 ; multi++) {
_tracker_db_result_set_append (mock);
{
GValue id_value = {0,};
-
+
g_value_init (&id_value, G_TYPE_INT);
g_value_set_int (&id_value, i);
_tracker_db_result_set_set_value (mock, 0, &id_value);
-
+
g_value_unset (&id_value);
}
for (j = 1; j < columns+1; j++) {
-
+
GValue value = {0,};
gchar * text = g_strdup_printf ("value %d", j+multi*j%2);
-
+
g_value_init (&value, G_TYPE_STRING);
g_value_set_string (&value, (set_null ? NULL : text));
_tracker_db_result_set_set_value (mock, j, &value);
-
+
g_value_unset (&value);
g_free (text);
}
@@ -114,7 +114,7 @@ get_custom_mock_tracker_db_result ()
{
TrackerDBResultSet *mock;
gint i, j, results = 2, columns = 2;
-
+
mock = _tracker_db_result_set_new (columns);
for (i = 0; i < results; i++) {
@@ -301,8 +301,8 @@ test_dbus_query_result_columns_to_strv ()
/* NULL */
result = tracker_dbus_query_result_columns_to_strv (result_set,
- -1,
- -1,
+ -1,
+ -1,
TRUE);
g_assert_cmpint (g_strv_length (result), ==, 0);
g_strfreev (result);
@@ -326,7 +326,7 @@ test_dbus_query_result_columns_to_strv ()
g_strfreev (result);
g_object_unref (result_set);
-
+
/* 2 results, 1 column */
result_set = get_mock_tracker_db_result (2, 1, FALSE);
result = tracker_dbus_query_result_columns_to_strv (result_set, -1, -1, TRUE);
@@ -348,7 +348,7 @@ test_dbus_query_result_columns_to_strv ()
g_object_unref (result_set);
- /* 2 results, 2 columns with NULL values in (1,1)
+ /* 2 results, 2 columns with NULL values in (1,1)
* first row 0, first column 0
*/
result_set = get_custom_mock_tracker_db_result ();
diff --git a/tests/tracker-extract/data/avi/create_avi_testdata b/tests/tracker-extract/data/avi/create_avi_testdata
index 4dac199..7f75198 100755
--- a/tests/tracker-extract/data/avi/create_avi_testdata
+++ b/tests/tracker-extract/data/avi/create_avi_testdata
@@ -6,4 +6,4 @@ convert -size 320x240 pattern:circles avi_src_3.png
convert -size 320x240 pattern:crosshatch avi_src_4.png
convert -size 320x240 pattern:fishscales avi_src_5.png
-gst-launch multifilesrc location="avi_src_%01d.png" index=1 caps="image/png,framerate=\(fraction\)1/3" ! pngdec ! taginject tags="title=title,artist=artist,copyright=copyright,comment=comments,license=license,location=location,genre=genre" ! ffmpegcolorspace ! xvidenc ! avimux ! filesink location="basic_tags_1.avi"
+gst-launch multifilesrc location="avi_src_%01d.png" index=1 caps="image/png,framerate=\(fraction\)1/3" ! pngdec ! taginject tags="title=title,artist=artist,copyright=copyright,comment=comments,license=license,location=location,genre=genre" ! ffmpegcolorspace ! xvidenc ! avimux ! filesink location="basic_tags_1.avi"
diff --git a/tests/tracker-extract/data/mp3/access_1.mp3 b/tests/tracker-extract/data/mp3/access_1.mp3
index c19c3d5..4fdc9f6 100644
Binary files a/tests/tracker-extract/data/mp3/access_1.mp3 and b/tests/tracker-extract/data/mp3/access_1.mp3 differ
diff --git a/tests/tracker-extract/data/mp3/access_2.mp3 b/tests/tracker-extract/data/mp3/access_2.mp3
index c19c3d5..4fdc9f6 100644
Binary files a/tests/tracker-extract/data/mp3/access_2.mp3 and b/tests/tracker-extract/data/mp3/access_2.mp3 differ
diff --git a/tests/tracker-extract/data/mp3/access_3.mp3 b/tests/tracker-extract/data/mp3/access_3.mp3
index c19c3d5..4fdc9f6 100644
Binary files a/tests/tracker-extract/data/mp3/access_3.mp3 and b/tests/tracker-extract/data/mp3/access_3.mp3 differ
diff --git a/tests/tracker-extract/data/mp3/access_4.mp3 b/tests/tracker-extract/data/mp3/access_4.mp3
index c19c3d5..4fdc9f6 100644
Binary files a/tests/tracker-extract/data/mp3/access_4.mp3 and b/tests/tracker-extract/data/mp3/access_4.mp3 differ
diff --git a/tests/tracker-extract/tracker-extract-gstreamer-test.c b/tests/tracker-extract/tracker-extract-gstreamer-test.c
index 9851fe1..2de7f9c 100644
--- a/tests/tracker-extract/tracker-extract-gstreamer-test.c
+++ b/tests/tracker-extract/tracker-extract-gstreamer-test.c
@@ -49,7 +49,7 @@ main (int argc, char **argv) {
g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/check-extract-data",
data, test_tracker_extract_check_extract_data);
-
+
#if 0
g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/id3v1_basic",
data, test_tracker_extract_mp3_id3v1_basic);
@@ -64,7 +64,7 @@ main (int argc, char **argv) {
if (g_test_perf()) {
g_test_add_data_func ("/tracker-extract/tracker-extract-gstreamer/mp3/performance_cbr",
- data, test_tracker_extract_mp3_performance);
+ data, test_tracker_extract_mp3_performance);
}
path = g_build_filename (MODULESDIR, "libextract-gstreamer", NULL);
diff --git a/tests/tracker-extract/tracker-extract-mp3-test.c b/tests/tracker-extract/tracker-extract-mp3-test.c
index 4a3ffe3..682e2b6 100644
--- a/tests/tracker-extract/tracker-extract-mp3-test.c
+++ b/tests/tracker-extract/tracker-extract-mp3-test.c
@@ -51,7 +51,7 @@ main (int argc, char **argv) {
data, test_tracker_extract_check_extract_data);
g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/access",
- data, test_tracker_extract_mp3_access);
+ data, test_tracker_extract_mp3_access);
#if 0
@@ -71,7 +71,7 @@ main (int argc, char **argv) {
if (g_test_perf()) {
g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/performance_cbr",
- data, test_tracker_extract_mp3_performance);
+ data, test_tracker_extract_mp3_performance);
}
#endif
diff --git a/tests/tracker-extract/tracker-extract-test-utils.c b/tests/tracker-extract/tracker-extract-test-utils.c
index c524fdd..cadb0ca 100644
--- a/tests/tracker-extract/tracker-extract-test-utils.c
+++ b/tests/tracker-extract/tracker-extract-test-utils.c
@@ -83,7 +83,7 @@ parse_file (const gchar *filename)
gchar key[256];
strcpy (key, scanner->value.v_identifier);
-
+
ttype = g_scanner_get_next_token(scanner);
g_assert (ttype == G_TOKEN_EQUAL_SIGN);
@@ -91,14 +91,14 @@ parse_file (const gchar *filename)
switch (ttype) {
case G_TOKEN_STRING:
- g_hash_table_insert (testdata,
- g_strdup(key),
+ g_hash_table_insert (testdata,
+ g_strdup(key),
g_strdup(scanner->value.v_string));
break;
-
+
default:
g_assert_not_reached();
-
+
}
}
}
@@ -208,7 +208,7 @@ tracker_test_extract_get_extract (const gchar *path, const gchar *mime)
} else {
g_error ("Could not get accesspoint to the module");
return;
- }
+ }
/* Search for exact match first */
data_iter = data;
@@ -231,7 +231,7 @@ tracker_test_extract_get_extract (const gchar *path, const gchar *mime)
return NULL;
}
-static void
+static void
free_statements (GPtrArray *metadata)
{
guint i;
@@ -246,8 +246,8 @@ free_statements (GPtrArray *metadata)
}
void
-tracker_test_extract_file (const TrackerExtractData *data,
- const gchar *file,
+tracker_test_extract_file (const TrackerExtractData *data,
+ const gchar *file,
const gchar *test_data_file)
{
GPtrArray *metadata;
@@ -290,7 +290,7 @@ tracker_test_extract_file (const TrackerExtractData *data,
void
tracker_test_extract_file_performance (const TrackerExtractData *data,
- const gchar *file_match,
+ const gchar *file_match,
guint file_count)
{
double perftime;
@@ -299,7 +299,7 @@ tracker_test_extract_file_performance (const TrackerExtractData *data,
g_assert (data != NULL);
g_assert (file_match != NULL);
g_assert (file_count > 0);
-
+
g_test_timer_start ();
for (i = 1; i <= file_count; i++) {
@@ -320,7 +320,7 @@ tracker_test_extract_file_performance (const TrackerExtractData *data,
uri = g_filename_to_uri (filename, NULL, NULL);
(*data->extract) (uri, metadata);
g_free (uri);
-
+
g_assert (metadata->len > 0);
free_statements (metadata);
@@ -335,8 +335,8 @@ tracker_test_extract_file_performance (const TrackerExtractData *data,
}
void
-tracker_test_extract_file_access (const TrackerExtractData *data,
- const gchar *file_match,
+tracker_test_extract_file_access (const TrackerExtractData *data,
+ const gchar *file_match,
guint file_count)
{
guint i;
@@ -344,7 +344,7 @@ tracker_test_extract_file_access (const TrackerExtractData *data,
g_assert (data != NULL);
g_assert (file_match != NULL);
g_assert (file_count > 0);
-
+
for (i = 1; i <= file_count; i++) {
gchar *uri;
GPtrArray *metadata;
diff --git a/tests/tracker-extract/tracker-extract-testsuite-avi.c b/tests/tracker-extract/tracker-extract-testsuite-avi.c
index e4f9a86..a1190e8 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-avi.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-avi.c
@@ -28,12 +28,12 @@ typedef struct {
gchar *testdata;
} ExtractData;
-static const ExtractData data_basic_tags[] = {
+static const ExtractData data_basic_tags[] = {
{ "/avi/basic_tags_1.avi", "/avi/basic_tags_1.data" },
{ NULL, NULL }
};
-void
+void
test_tracker_extract_avi_basic_tags (gconstpointer data)
{
guint i;
@@ -41,7 +41,7 @@ test_tracker_extract_avi_basic_tags (gconstpointer data)
for (i = 0; data_basic_tags[i].filename; i++) {
tracker_test_extract_file (data,
data_basic_tags[i].filename,
- data_basic_tags[i].testdata);
+ data_basic_tags[i].testdata);
}
}
diff --git a/tests/tracker-extract/tracker-extract-testsuite-jpeg.c b/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
index 582e223..248cfeb 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
@@ -28,7 +28,7 @@ typedef struct {
gchar *testdata;
} ExtractData;
-static const ExtractData data_basic_size[] = {
+static const ExtractData data_basic_size[] = {
{ "/jpeg/basic_size_1.jpg", "/jpeg/basic_size_1.data" },
{ "/jpeg/basic_size_2.jpg", "/jpeg/basic_size_2.data" },
{ "/jpeg/basic_size_3.jpg", "/jpeg/basic_size_3.data" },
@@ -37,12 +37,12 @@ static const ExtractData data_basic_size[] = {
{ NULL, NULL }
};
-static const ExtractData data_exif_size[] = {
+static const ExtractData data_exif_size[] = {
{ "/jpeg/exif_size_1.jpg", "/jpeg/exif_size_1.data" },
{ NULL, NULL }
};
-static const ExtractData data_exif_orientation[] = {
+static const ExtractData data_exif_orientation[] = {
{ "/jpeg/exif_orientation_1.jpg", "/jpeg/exif_orientation_1.data" },
{ "/jpeg/exif_orientation_2.jpg", "/jpeg/exif_orientation_2.data" },
{ "/jpeg/exif_orientation_3.jpg", "/jpeg/exif_orientation_3.data" },
@@ -74,7 +74,7 @@ static const ExtractData data_exif_flash[] = {
{ "/jpeg/exif_flash_17.jpg", "/jpeg/exif_flash_17.data" },
{ "/jpeg/exif_flash_18.jpg", "/jpeg/exif_flash_18.data" },
{ "/jpeg/exif_flash_19.jpg", "/jpeg/exif_flash_19.data" },
- { "/jpeg/exif_flash_20.jpg", "/jpeg/exif_flash_20.data" },
+ { "/jpeg/exif_flash_20.jpg", "/jpeg/exif_flash_20.data" },
{ "/jpeg/exif_flash_21.jpg", "/jpeg/exif_flash_21.data" },
{ "/jpeg/exif_flash_22.jpg", "/jpeg/exif_flash_22.data" },
{ "/jpeg/exif_flash_23.jpg", "/jpeg/exif_flash_23.data" },
@@ -105,7 +105,7 @@ static const ExtractData data_xmp_dc[] = {
{ NULL, NULL }
};
-void
+void
test_tracker_extract_jpeg_basic_size (gconstpointer data)
{
guint i;
@@ -113,11 +113,11 @@ test_tracker_extract_jpeg_basic_size (gconstpointer data)
for (i = 0; data_basic_size[i].filename; i++) {
tracker_test_extract_file (data,
data_basic_size[i].filename,
- data_basic_size[i].testdata);
+ data_basic_size[i].testdata);
}
}
-void
+void
test_tracker_extract_jpeg_exif_size (gconstpointer data)
{
guint i;
@@ -125,11 +125,11 @@ test_tracker_extract_jpeg_exif_size (gconstpointer data)
for (i = 0; data_exif_size[i].filename; i++) {
tracker_test_extract_file (data,
data_exif_size[i].filename,
- data_exif_size[i].testdata);
+ data_exif_size[i].testdata);
}
}
-void
+void
test_tracker_extract_jpeg_exif_orientation (gconstpointer data)
{
guint i;
@@ -137,11 +137,11 @@ test_tracker_extract_jpeg_exif_orientation (gconstpointer data)
for (i = 0; data_exif_orientation[i].filename; i++) {
tracker_test_extract_file (data,
data_exif_orientation[i].filename,
- data_exif_orientation[i].testdata);
+ data_exif_orientation[i].testdata);
}
}
-void
+void
test_tracker_extract_jpeg_exif_flash (gconstpointer data)
{
guint i;
@@ -149,11 +149,11 @@ test_tracker_extract_jpeg_exif_flash (gconstpointer data)
for (i = 0; data_exif_flash[i].filename; i++) {
tracker_test_extract_file (data,
data_exif_flash[i].filename,
- data_exif_flash[i].testdata);
+ data_exif_flash[i].testdata);
}
}
-void
+void
test_tracker_extract_jpeg_exif_tags (gconstpointer data)
{
guint i;
@@ -161,7 +161,7 @@ test_tracker_extract_jpeg_exif_tags (gconstpointer data)
for (i = 0; data_exif_tags[i].filename; i++) {
tracker_test_extract_file (data,
data_exif_tags[i].filename,
- data_exif_tags[i].testdata);
+ data_exif_tags[i].testdata);
}
}
diff --git a/tests/tracker-extract/tracker-extract-testsuite-mp3.c b/tests/tracker-extract/tracker-extract-testsuite-mp3.c
index 4a45969..ffbd991 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-mp3.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-mp3.c
@@ -28,21 +28,21 @@ typedef struct {
gchar *testdata;
} ExtractData;
-static const ExtractData data_id3v1_basic[] = {
+static const ExtractData data_id3v1_basic[] = {
{ "/mp3/id3v1_basic_1.mp3", "/mp3/id3v1_basic_1.data" },
{ "/mp3/id3v1_basic_2.mp3", "/mp3/id3v1_basic_2.data" },
{ "/mp3/id3v1_basic_3.mp3", "/mp3/id3v1_basic_3.data" },
{ NULL, NULL }
};
-static const ExtractData data_id3v23_basic[] = {
+static const ExtractData data_id3v23_basic[] = {
{ "/mp3/id3v23_basic_1.mp3", "/mp3/id3v23_basic_1.data" },
{ "/mp3/id3v23_basic_2.mp3", "/mp3/id3v23_basic_2.data" },
{ "/mp3/id3v23_basic_3.mp3", "/mp3/id3v23_basic_3.data" },
{ NULL, NULL }
};
-static const ExtractData data_id3v23_tcon[] = {
+static const ExtractData data_id3v23_tcon[] = {
{ "/mp3/id3v23_tcon_1.mp3", "/mp3/id3v23_tcon_1.data" },
{ "/mp3/id3v23_tcon_2.mp3", "/mp3/id3v23_tcon_2.data" },
{ "/mp3/id3v23_tcon_3.mp3", "/mp3/id3v23_tcon_3.data" },
@@ -52,7 +52,7 @@ static const ExtractData data_id3v23_tcon[] = {
{ NULL, NULL }
};
-static const ExtractData data_id3v23_tags[] = {
+static const ExtractData data_id3v23_tags[] = {
{ "/mp3/id3v23_trck_1.mp3", "/mp3/id3v23_trck_1.data" },
{ "/mp3/id3v23_comm_1.mp3", "/mp3/id3v23_comm_1.data" },
{ "/mp3/id3v23_comm_2.mp3", "/mp3/id3v23_comm_2.data" },
@@ -62,7 +62,7 @@ static const ExtractData data_id3v23_tags[] = {
{ NULL, NULL }
};
-static const ExtractData data_header_bitrate[] = {
+static const ExtractData data_header_bitrate[] = {
{ "/mp3/header_bitrate_mpeg1_1.mp3", "/mp3/header_bitrate_mpeg1_1.data" },
{ "/mp3/header_bitrate_mpeg1_2.mp3", "/mp3/header_bitrate_mpeg1_2.data" },
{ "/mp3/header_bitrate_mpeg1_3.mp3", "/mp3/header_bitrate_mpeg1_3.data" },
@@ -80,14 +80,14 @@ static const ExtractData data_header_bitrate[] = {
{ NULL, NULL }
};
-static const ExtractData data_header_bitrate_vbr[] = {
+static const ExtractData data_header_bitrate_vbr[] = {
{ "/mp3/header_bitrate_vbr_mpeg1_1.mp3", "/mp3/header_bitrate_vbr_mpeg1_1.data" },
{ "/mp3/header_bitrate_vbr_mpeg1_1.mp3", "/mp3/header_bitrate_vbr_mpeg1_1.data" },
{ "/mp3/header_bitrate_vbr_mpeg1_1.mp3", "/mp3/header_bitrate_vbr_mpeg1_1.data" },
{ NULL, NULL }
};
-static const ExtractData data_header_sampling[] = {
+static const ExtractData data_header_sampling[] = {
{ "/mp3/header_sampling_mpeg1_1.mp3", "/mp3/header_sampling_mpeg1_1.data" },
{ "/mp3/header_sampling_mpeg1_2.mp3", "/mp3/header_sampling_mpeg1_2.data" },
{ "/mp3/header_sampling_mpeg1_3.mp3", "/mp3/header_sampling_mpeg1_3.data" },
@@ -100,13 +100,13 @@ static const ExtractData data_header_sampling[] = {
{ NULL, NULL }
};
-void
+void
test_tracker_extract_mp3_access (gconstpointer data)
{
tracker_test_extract_file_access (data, "/mp3/access_%d.mp3", 4);
}
-void
+void
test_tracker_extract_mp3_id3v1_basic (gconstpointer data)
{
guint i;
@@ -114,7 +114,7 @@ test_tracker_extract_mp3_id3v1_basic (gconstpointer data)
for (i = 0; data_id3v1_basic[i].filename; i++) {
tracker_test_extract_file (data,
data_id3v1_basic[i].filename,
- data_id3v1_basic[i].testdata);
+ data_id3v1_basic[i].testdata);
}
}
@@ -126,11 +126,11 @@ test_tracker_extract_mp3_id3v23_basic (gconstpointer data)
for (i = 0; data_id3v23_basic[i].filename; i++) {
tracker_test_extract_file (data,
data_id3v23_basic[i].filename,
- data_id3v23_basic[i].testdata);
+ data_id3v23_basic[i].testdata);
}
}
-void
+void
test_tracker_extract_mp3_id3v23_tags (gconstpointer data)
{
guint i;
@@ -138,11 +138,11 @@ test_tracker_extract_mp3_id3v23_tags (gconstpointer data)
for (i = 0; data_id3v23_tags[i].filename; i++) {
tracker_test_extract_file (data,
data_id3v23_tags[i].filename,
- data_id3v23_tags[i].testdata);
+ data_id3v23_tags[i].testdata);
}
}
-void
+void
test_tracker_extract_mp3_id3v23_tcon(gconstpointer data)
{
guint i;
@@ -150,11 +150,11 @@ test_tracker_extract_mp3_id3v23_tcon(gconstpointer data)
for (i = 0; data_id3v23_tcon[i].filename; i++) {
tracker_test_extract_file (data,
data_id3v23_tcon[i].filename,
- data_id3v23_tcon[i].testdata);
+ data_id3v23_tcon[i].testdata);
}
}
-void
+void
test_tracker_extract_mp3_header_bitrate (gconstpointer data)
{
guint i;
@@ -162,7 +162,7 @@ test_tracker_extract_mp3_header_bitrate (gconstpointer data)
for (i = 0; data_header_bitrate[i].filename; i++) {
tracker_test_extract_file (data,
data_header_bitrate[i].filename,
- data_header_bitrate[i].testdata);
+ data_header_bitrate[i].testdata);
}
}
@@ -174,11 +174,11 @@ test_tracker_extract_mp3_header_bitrate_vbr (gconstpointer data)
for (i = 0; data_header_bitrate_vbr[i].filename; i++) {
tracker_test_extract_file (data,
data_header_bitrate_vbr[i].filename,
- data_header_bitrate_vbr[i].testdata);
+ data_header_bitrate_vbr[i].testdata);
}
}
-void
+void
test_tracker_extract_mp3_header_sampling (gconstpointer data)
{
guint i;
@@ -186,11 +186,11 @@ test_tracker_extract_mp3_header_sampling (gconstpointer data)
for (i = 0; data_header_sampling[i].filename; i++) {
tracker_test_extract_file (data,
data_header_sampling[i].filename,
- data_header_sampling[i].testdata);
+ data_header_sampling[i].testdata);
}
}
-void
+void
test_tracker_extract_mp3_performance (gconstpointer data)
{
tracker_test_extract_file_performance (data, "/mp3/perf_cbr_id3v1_%d.mp3", 1000);
diff --git a/tests/tracker-extract/tracker-extract-testsuite-png.c b/tests/tracker-extract/tracker-extract-testsuite-png.c
index 9cd01da..7e1093c 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-png.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-png.c
@@ -28,7 +28,7 @@ typedef struct {
gchar *testdata;
} ExtractData;
-static const ExtractData data_basic_size[] = {
+static const ExtractData data_basic_size[] = {
{ "/png/basic_size_1.png", "/png/basic_size_1.data" },
{ "/png/basic_size_2.png", "/png/basic_size_2.data" },
{ "/png/basic_size_3.png", "/png/basic_size_3.data" },
@@ -37,7 +37,7 @@ static const ExtractData data_basic_size[] = {
{ NULL, NULL }
};
-static const ExtractData data_xmp_exif_orientation[] = {
+static const ExtractData data_xmp_exif_orientation[] = {
{ "/png/xmp_exif_orientation_1.png", "/png/xmp_exif_orientation_1.data" },
{ "/png/xmp_exif_orientation_2.png", "/png/xmp_exif_orientation_2.data" },
{ "/png/xmp_exif_orientation_3.png", "/png/xmp_exif_orientation_3.data" },
@@ -49,7 +49,7 @@ static const ExtractData data_xmp_exif_orientation[] = {
{ NULL, NULL }
};
-void
+void
test_tracker_extract_png_basic_size (gconstpointer data)
{
guint i;
@@ -57,11 +57,11 @@ test_tracker_extract_png_basic_size (gconstpointer data)
for (i = 0; data_basic_size[i].filename; i++) {
tracker_test_extract_file (data,
data_basic_size[i].filename,
- data_basic_size[i].testdata);
+ data_basic_size[i].testdata);
}
}
-void
+void
test_tracker_extract_png_xmp_exif_orientation (gconstpointer data)
{
guint i;
@@ -69,11 +69,11 @@ test_tracker_extract_png_xmp_exif_orientation (gconstpointer data)
for (i = 0; data_xmp_exif_orientation[i].filename; i++) {
tracker_test_extract_file (data,
data_xmp_exif_orientation[i].filename,
- data_xmp_exif_orientation[i].testdata);
+ data_xmp_exif_orientation[i].testdata);
}
}
-void
+void
test_tracker_extract_png_performance (gconstpointer data)
{
tracker_test_extract_file_performance (data, "/png/perf_png_%d.png", 1000);
diff --git a/tests/tracker-extract/tracker-extract-testsuite-tiff.c b/tests/tracker-extract/tracker-extract-testsuite-tiff.c
index 1872d44..0ad8629 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-tiff.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-tiff.c
@@ -28,7 +28,7 @@ typedef struct {
gchar *testdata;
} ExtractData;
-static const ExtractData data_basic_size[] = {
+static const ExtractData data_basic_size[] = {
{ "/tiff/basic_size_1.tif", "/tiff/basic_size_1.data" },
{ "/tiff/basic_size_2.tif", "/tiff/basic_size_2.data" },
{ "/tiff/basic_size_3.tif", "/tiff/basic_size_3.data" },
@@ -37,12 +37,12 @@ static const ExtractData data_basic_size[] = {
{ NULL, NULL }
};
-static const ExtractData data_exif_size[] = {
+static const ExtractData data_exif_size[] = {
{ "/tiff/exif_size_1.tif", "/tiff/exif_size_1.data" },
{ NULL, NULL }
};
-static const ExtractData data_exif_orientation[] = {
+static const ExtractData data_exif_orientation[] = {
{ "/tiff/exif_orientation_1.tif", "/tiff/exif_orientation_1.data" },
{ "/tiff/exif_orientation_2.tif", "/tiff/exif_orientation_2.data" },
{ "/tiff/exif_orientation_3.tif", "/tiff/exif_orientation_3.data" },
@@ -62,11 +62,11 @@ test_tracker_extract_tiff_basic_size (gconstpointer data)
for (i = 0; data_basic_size[i].filename; i++) {
tracker_test_extract_file (data,
data_basic_size[i].filename,
- data_basic_size[i].testdata);
+ data_basic_size[i].testdata);
}
}
-void
+void
test_tracker_extract_tiff_exif_size (gconstpointer data)
{
guint i;
@@ -76,11 +76,11 @@ test_tracker_extract_tiff_exif_size (gconstpointer data)
tracker_test_extract_file (data,
data_exif_size[i].filename,
- data_exif_size[i].testdata);
+ data_exif_size[i].testdata);
}
}
-void
+void
test_tracker_extract_tiff_exif_orientation (gconstpointer data)
{
guint i;
@@ -88,11 +88,11 @@ test_tracker_extract_tiff_exif_orientation (gconstpointer data)
for (i = 0; data_exif_orientation[i].filename; i++) {
tracker_test_extract_file (data,
data_exif_orientation[i].filename,
- data_exif_orientation[i].testdata);
+ data_exif_orientation[i].testdata);
}
}
-void
+void
test_tracker_extract_tiff_performance (gconstpointer data)
{
tracker_test_extract_file_performance (data, "/tiff/perf_tiff_%d.tif", 1000);
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index 3c9ba7a..7c2506b 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -27,7 +27,7 @@ tracker_metadata_utils_SOURCES = \
$(top_srcdir)/src/tracker-miner-fs/tracker-config.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-marshal.c \
$(top_srcdir)/src/tracker-miner-fs/tracker-thumbnailer.c \
- tracker-metadata-utils-test.c
+ tracker-metadata-utils-test.c
tracker_metadata_utils_LDADD = \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
@@ -42,4 +42,4 @@ tracker_metadata_utils_LDADD = \
$(GTHREAD_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
- $(GLIB2_LIBS)
+ $(GLIB2_LIBS)
diff --git a/tests/tracker-store/tracker-events-test.c b/tests/tracker-store/tracker-events-test.c
index 605318d..a5c8490 100644
--- a/tests/tracker-store/tracker-events-test.c
+++ b/tests/tracker-store/tracker-events-test.c
@@ -71,7 +71,7 @@ test_events_reset (void)
g_assert_cmpint (events->len, ==, 1);
/* Try again without reset to ensure the data is
- * still there
+ * still there
*/
events = tracker_events_get_pending ();
g_assert_cmpint (events->len, ==, 1);
@@ -105,7 +105,7 @@ test_events_insertions (void)
events = tracker_events_get_pending ();
g_assert_cmpint (events->len, ==, 2);
-
+
tracker_events_reset ();
tracker_events_shutdown ();
}
@@ -127,7 +127,7 @@ test_events_no_allows (void)
}
g_assert (tracker_events_get_pending () == NULL);
-
+
tracker_events_shutdown ();
}
diff --git a/utils/data-generators/README b/utils/data-generators/README
index a197365..195e315 100644
--- a/utils/data-generators/README
+++ b/utils/data-generators/README
@@ -15,7 +15,7 @@ Easy method:
./generate-all-and-import.sh
-That's it. All turtle file generators are run, and their contents
+That's it. All turtle file generators are run, and their contents
are imported to tracker.
Detailed method:
@@ -31,10 +31,10 @@ Detailed method:
./id32ttl.py directory/
This script will crawl "directory" extracting the id3 information of
- the files there.
+ the files there.
* To generate information about music according to nmm
- specification:
+ specification:
python id32nmmTurtle.py dir_of_music_files/
@@ -45,11 +45,11 @@ Detailed method:
./generate-data-for-bookmarks.py > bookmarks.ttl
This script uses bookmarks.in to get the data and prints the output
- in the stdout.
+ in the stdout.
* To generate some feeds information:
- ./get-fresh-planets.sh
+ ./get-fresh-planets.sh
(This script gets the atom feeds of planet.maemo and planet.gnome.
Be sure you have internet connection, the proxy correctly setted,
@@ -67,13 +67,13 @@ Other files
===========
Dont touch these files, they are included in the generation scripts
-described before:
+described before:
-* tools.py:
+* tools.py:
Some common functionality
-* bookmarks.in:
+* bookmarks.in:
Input information to generate bookmarks
-* songlist.ttl:
+* songlist.ttl:
The id3 information is harvested from mp3 files in the filesystem.
This is a file with pre-generated information, so can be used to
test even when you dont have a huge mp3 collection in your computer.
diff --git a/utils/data-generators/barnum/README b/utils/data-generators/barnum/README
index f36bb83..cf11c38 100755
--- a/utils/data-generators/barnum/README
+++ b/utils/data-generators/barnum/README
@@ -1,25 +1,25 @@
What is Barnum?
===============
-Barnum is a python-based application for quickly and easily creating
+Barnum is a python-based application for quickly and easily creating
pseudo-random data typically used for application testing.
Why did you create Barnum?
==========================
-I am developing a shopping cart application in Django and realized that I
-needed a bunch of data to simulate the store's behavior under somewhat normal
-production usage.
+I am developing a shopping cart application in Django and realized that I
+needed a bunch of data to simulate the store's behavior under somewhat normal
+production usage.
-I got tired of always trying to think of names and addresses for customers and
+I got tired of always trying to think of names and addresses for customers and
so decided to automate the process a little bit. Such was born Barnum.
Why is Barnum unique?
=====================
-I was able to find some online systems for generating large amounts of test
-data. I could not find any application that had the breadth of data generation
-capabilities nor the ability to easily interface with Django in the way I
+I was able to find some online systems for generating large amounts of test
+data. I could not find any application that had the breadth of data generation
+capabilities nor the ability to easily interface with Django in the way I
wanted to.
One of the most unique aspects of Barnum is that the data is what I'll call
@@ -37,7 +37,7 @@ You should notice a couple of things about this data.
- There's a realistic first and last name
- The street names are also plausible
- Arthur, ND is a real city and the zip code is 58006
- - 701 is an area code used for North Dakota
+ - 701 is an area code used for North Dakota
- The fictional company is somewhat reasonable.
- The job position also makes sense.
@@ -73,7 +73,7 @@ The gen_data.py script is the primary showcase for how to create random data
using Barnum. If you run it from the command line:
python gen_data.py
-
+
You'll see some sample data output.
If you'd like to call it from another script, here's an example or two from the
@@ -114,7 +114,7 @@ endless!
Where does the data come from?
==============================
-I pulled sample data and existing scripts from a bunch of different sources.
+I pulled sample data and existing scripts from a bunch of different sources.
- The names are from 1990 US Census data http://www.census.gov/genealogy/names/names_files.html
- The street names are from real us streets in a few locales.
- Company names are randomly generated by me.
@@ -157,7 +157,7 @@ Where did this name come from?
Choosing names for projects is kind of fun but kind of a hassle. There needs to be a name
but it can't be anything too stupid. I started off thinking of an acronym and ended up with
-PT ("Python Testing") and immediately thought of P.T. Barnum. I really liked the name
+PT ("Python Testing") and immediately thought of P.T. Barnum. I really liked the name
because I was using this for Satchmo and project made in Django. Single word names seemed
cool. Also, I like the fact that P.T. Barnum was really a master at making people think
something was real that wasn't. Which is exactly what this little script does.
diff --git a/utils/data-generators/barnum/convert_data.py b/utils/data-generators/barnum/convert_data.py
index e7915cb..cd9218c 100755
--- a/utils/data-generators/barnum/convert_data.py
+++ b/utils/data-generators/barnum/convert_data.py
@@ -1,6 +1,6 @@
#!/usr/bin/python2.5
"""
-This application converts the various text files stored in the source-data
+This application converts the various text files stored in the source-data
directory into a pickled python object to be used by the random data
generator scripts
@@ -29,10 +29,10 @@ import random
import os
data_dir = "barnum/source-data"
-simple_files_to_process = ['street-names.txt', 'street-types.txt', 'latin-words.txt',
+simple_files_to_process = ['street-names.txt', 'street-types.txt', 'latin-words.txt',
'email-domains.txt', 'job-titles.txt', 'company-names.txt',
'company-types.txt']
-
+
def load_files():
# Process Zip Codes
all_zips = {}
@@ -48,7 +48,7 @@ def load_files():
state_area_codes = {}
for line in area_code_file:
clean_line = line.replace(' ','').rstrip('\n')
- state_area_codes[line.split(':')[0]] = clean_line[3:].split(',')
+ state_area_codes[line.split(':')[0]] = clean_line[3:].split(',')
pickle.dump(state_area_codes, output)
area_code_file.close()
@@ -95,6 +95,6 @@ if __name__ == "__main__":
response = string.lower(raw_input("Type 'yes' to reload the data from source files and create a new source file: "))
if response == 'yes':
load_files()
-
-
+
+
diff --git a/utils/data-generators/barnum/gen_data.py b/utils/data-generators/barnum/gen_data.py
index f4941e6..333ecd6 100755
--- a/utils/data-generators/barnum/gen_data.py
+++ b/utils/data-generators/barnum/gen_data.py
@@ -73,7 +73,7 @@ def create_name(full_name=True, gender=None):
def create_job_title():
return random.choice(job_titles)
-
+
def create_phone(zip_code=None):
if not zip_code:
zip_code = random.choice(all_zips.keys())
@@ -99,7 +99,7 @@ def create_sentence(min=4, max=15):
for word in range(1, random.randint(min, max-1)):
sentence.append(random.choice(latin_words))
return " ".join(sentence) + "."
-
+
def create_paragraphs(num=1, min_sentences=4, max_sentences=7):
paragraphs = []
for para in range(0, num):
@@ -122,9 +122,9 @@ def create_date(numeric=True, past=False, max_years_future=10, max_years_past=10
else:
start = datetime.datetime.today()
num_days = max_years_future * 365
-
+
random_days = random.randint(1, num_days)
- random_date = start + datetime.timedelta(days=random_days)
+ random_date = start + datetime.timedelta(days=random_days)
return(random_date)
def create_birthday(age=random.randint (16, 80)):
@@ -143,7 +143,7 @@ def create_company_name(biz_type=None):
if not biz_type:
biz_type = random.choice(company_type)
if biz_type == "LawFirm":
- name.append( random.choice(last_names)+ ", " + random.choice(last_names) + " & " +
+ name.append( random.choice(last_names)+ ", " + random.choice(last_names) + " & " +
random.choice(last_names))
name.append('LLP')
else:
diff --git a/utils/data-generators/barnum/gencc.py b/utils/data-generators/barnum/gencc.py
index 85dc268..37db52b 100755
--- a/utils/data-generators/barnum/gencc.py
+++ b/utils/data-generators/barnum/gencc.py
@@ -26,10 +26,10 @@ import random
import sys
import copy
-visaPrefixList = [ ['4', '5', '3', '9'],
- ['4', '5', '5', '6'],
+visaPrefixList = [ ['4', '5', '3', '9'],
+ ['4', '5', '5', '6'],
['4', '9', '1', '6'],
- ['4', '5', '3', '2'],
+ ['4', '5', '3', '2'],
['4', '9', '2', '9'],
['4', '0', '2', '4', '0', '0', '7', '1'],
['4', '4', '8', '6'],
@@ -67,8 +67,8 @@ jcbPrefixList16 = [ ['3', '0', '8', '8'],
jcbPrefixList15 = [ ['2', '1', '0', '0'],
['1', '8', '0', '0'] ]
-voyagerPrefixList = [ ['8', '6', '9', '9'] ]
-
+voyagerPrefixList = [ ['8', '6', '9', '9'] ]
+
"""
'prefix' is the start of the CC number as a string, any number of digits.
@@ -85,7 +85,7 @@ def completed_number(prefix, length):
ccnumber.append(digit)
- # Calculate sum
+ # Calculate sum
sum = 0
pos = 0
@@ -113,7 +113,7 @@ def completed_number(prefix, length):
checkdigit = ((sum / 10 + 1) * 10 - sum) % 10
ccnumber.append( str(checkdigit) )
-
+
return ''.join(ccnumber)
def credit_card_number(prefixList, length, howMany):
@@ -121,7 +121,7 @@ def credit_card_number(prefixList, length, howMany):
result = []
for i in range(howMany):
-
+
ccnumber = copy.copy( random.choice(prefixList) )
result.append( completed_number(ccnumber, length) )
diff --git a/utils/data-generators/barnum/genpw.py b/utils/data-generators/barnum/genpw.py
index 446ea0c..f5cb8b8 100755
--- a/utils/data-generators/barnum/genpw.py
+++ b/utils/data-generators/barnum/genpw.py
@@ -1,32 +1,32 @@
#!/usr/bin/python2.5
## Generate a human readable 'random' password
-## password will be generated in the form 'word'+digits+'word'
+## password will be generated in the form 'word'+digits+'word'
## eg.,nice137pass
## parameters: number of 'characters' , number of 'digits'
## Pradeep Kishore Gowda <pradeep at btbytes.com >
-## License : GPL
+## License : GPL
## Date : 2005.April.15
-## Revision 1.2
-## ChangeLog:
-## 1.1 - fixed typos
-## 1.2 - renamed functions _apart & _npart to a_part & n_part as zope does not allow functions to
+## Revision 1.2
+## ChangeLog:
+## 1.1 - fixed typos
+## 1.2 - renamed functions _apart & _npart to a_part & n_part as zope does not allow functions to
## start with _
def nicepass(alpha=6,numeric=2):
"""
- returns a human-readble password (say rol86din instead of
- a difficult to remember K8Yn9muL )
+ returns a human-readble password (say rol86din instead of
+ a difficult to remember K8Yn9muL )
"""
import string
import random
vowels = ['a','e','i','u', 'y']
consonants = [a for a in string.ascii_lowercase if a not in vowels]
digits = string.digits
-
+
####utility functions
def a_part(slen):
ret = ''
- for i in range(slen):
+ for i in range(slen):
if i%2 ==0:
randid = random.randint(0,20) #number of consonants
ret += consonants[randid]
@@ -34,26 +34,26 @@ def nicepass(alpha=6,numeric=2):
randid = random.randint(0,4) #number of vowels
ret += vowels[randid]
return ret
-
+
def n_part(slen):
ret = ''
for i in range(slen):
randid = random.randint(0,9) #number of digits
ret += digits[randid]
return ret
-
- ####
- fpl = alpha/2
+
+ ####
+ fpl = alpha/2
if alpha % 2 :
- fpl = int(alpha/2) + 1
- lpl = alpha - fpl
-
+ fpl = int(alpha/2) + 1
+ lpl = alpha - fpl
+
start = a_part(fpl)
mid = n_part(numeric)
end = a_part(lpl)
-
+
return "%s%s%s" % (start,mid,end)
-
+
if __name__ == "__main__":
for i in range(10):
print nicepass(6,2)
diff --git a/utils/data-generators/generate-all-and-import.sh b/utils/data-generators/generate-all-and-import.sh
index 40c53c5..971e993 100755
--- a/utils/data-generators/generate-all-and-import.sh
+++ b/utils/data-generators/generate-all-and-import.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# generate and import all local .ttl files
-# takes as one parameter the number of entries that should be
+# takes as one parameter the number of entries that should be
# generated in each category
./generate-all.sh $1
diff --git a/utils/data-generators/generate-data-for-contact-messages.py b/utils/data-generators/generate-data-for-contact-messages.py
index 30e16f5..d47ec2b 100755
--- a/utils/data-generators/generate-data-for-contact-messages.py
+++ b/utils/data-generators/generate-data-for-contact-messages.py
@@ -63,7 +63,7 @@ def generatePhoneNumber():
def generatePhoneCalls (many):
for i in range (0, many):
callUID = str(random.randint(0, sys.maxint))
-
+
duration = random.randint (0, 50)
relationType = random.randint (0,100) % 2
if (relationType == 0):
@@ -95,9 +95,9 @@ def generateSMS (many):
#Received SMS
sys.stdout.write('\tnmo:from [a nco:Contact; nco:hasPhoneNumber <' + phoneUri + '>];\n')
sys.stdout.write('\tnmo:to [a nco:Contact; nco:hasPhoneNumber <' + myOwnPhoneNumberURI + '>];\n')
-
+
sys.stdout.write('\tnmo:sentDate "' + getPseudoRandomDate () + '";\n')
- sys.stdout.write('\tnmo:receivedDate "' + getPseudoRandomDate () + '";\n')
+ sys.stdout.write('\tnmo:receivedDate "' + getPseudoRandomDate () + '";\n')
if (random.randint(0, 4) > 3):
sys.stdout.write ('\tnao:hasTag [a nao:Tag ; nao:prefLabel ' + getRandomTag () +'];\n')
sys.stdout.write('\tnmo:plainTextMessageContent "' + str.replace(gen_data.create_paragraphs(1, 5, 8), "\n", "") + '".\n')
@@ -136,7 +136,7 @@ def generateEmail(sys, gen_data, str, random):
ccid = random.randint(0, len(previousContacts) - 1)
sys.stdout.write('\tnmo:cc <urn:uuid:' + previousContacts[ccid] + '>;\n')
sys.stdout.write('\tnmo:messageHeader [a nmo:MessageHeader; nmo:headerName "cc"; nmo:headerValue "' + previousEmailAddresses[ccid] + '"];\n')
-
+
if random.randint(0, 10) > 7 and len(previousContacts) > 1:
bccid = random.randint(0, len(previousContacts) - 1)
sys.stdout.write('\tnmo:bcc <urn:uuid:' + previousContacts[bccid] + '>;\n')
@@ -144,7 +144,7 @@ def generateEmail(sys, gen_data, str, random):
#TODO add some sense to the email titles. Some reply chains as well.
if (random.randint(0, 4) > 3):
sys.stdout.write ('\tnao:hasTag [a nao:Tag ; nao:prefLabel ' + getRandomTag () +'];\n')
-
+
sys.stdout.write('\tnmo:messageSubject "' + str.replace(gen_data.create_paragraphs(1, 2, 2), "\n", "") + '";\n')
sys.stdout.write('\tnmo:plainTextMessageContent "' + str.replace(gen_data.create_paragraphs(1, 2, 3), "\n", "") + '".\n')
@@ -173,7 +173,7 @@ sys.stdout.write("@prefix nid3: <http://www.semanticdesktop.org/ontologies/200
sys.stdout.write("@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#>.\n")
sys.stdout.write("@prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#>.\n")
sys.stdout.write("@prefix nmo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#>.\n")
-sys.stdout.write("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n")
+sys.stdout.write("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n")
sys.stdout.write("@prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#>.\n")
sys.stdout.write("@prefix ncal: <http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#>.\n")
@@ -181,7 +181,7 @@ sys.stdout.write("@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.\n")
sys.stdout.write('<mailto:me me com> a nco:EmailAddress; \n')
sys.stdout.write('\tnco:emailAddress "me me com".\n')
sys.stdout.write('\n')
-sys.stdout.write('<urn:uuid:1> a nco:PersonContact; \n')
+sys.stdout.write('<urn:uuid:1> a nco:PersonContact; \n')
sys.stdout.write('\tnco:fullname "Me Myself";\n')
sys.stdout.write('\tnco:nameGiven "Me";\n')
sys.stdout.write('\tnco:nameFamily "Myself";\n')
@@ -204,7 +204,7 @@ for dummy in range (0, count):
firstName, lastName = gen_data.create_name()
zip, city, state = gen_data.create_city_state_zip()
postalAddressID=str(random.randint(0, sys.maxint))
-
+
UID = str(random.randint(0, sys.maxint))
phoneNumber = gen_data.create_phone()
phoneUri = 'tel:+1' + phoneNumber.translate(allchars,' -()')
@@ -216,11 +216,11 @@ for dummy in range (0, count):
hasPhoneNumber = False
jobTitle = gen_data.create_job_title()
- generatePostalAddress()
- generateEmailAddress()
-
+ generatePostalAddress()
+ generateEmailAddress()
+
#Only every 3rd have Phone or IM to add variation.
- if random.randint(0, 3) > 2 or count == 1:
+ if random.randint(0, 3) > 2 or count == 1:
generateIMAccount(gen_data, str)
hasIMAccount = True
if random.randint(0, 3) > 2 or count == 1:
@@ -229,8 +229,8 @@ for dummy in range (0, count):
if (withPhone): generatePhoneCalls(3)
if (withPhone): generateSMS (4)
-
- sys.stdout.write('<urn:uuid:' + UID + '> a nco:PersonContact; \n')
+
+ sys.stdout.write('<urn:uuid:' + UID + '> a nco:PersonContact; \n')
sys.stdout.write('\tnco:fullname "' + firstName + ' ' + lastName +'";\n')
sys.stdout.write('\tnco:nameGiven "' + firstName + '";\n')
sys.stdout.write('\tnco:nameFamily "' + lastName + '";\n')
@@ -238,26 +238,26 @@ for dummy in range (0, count):
#sys.stdout.write('\tnco:title "'+jobTitle+'";\n')
sys.stdout.write('\tnco:hasEmailAddress <mailto:' + emailAddress + '>;\n')
if hasPhoneNumber: sys.stdout.write('\tnco:hasPhoneNumber <' + phoneUri + '>;\n')
- if hasIMAccount: sys.stdout.write('\tnco:hasIMAccount <xmpp:' + xmppAddress + '>;\n')
+ if hasIMAccount: sys.stdout.write('\tnco:hasIMAccount <xmpp:' + xmppAddress + '>;\n')
if (random.randint(0, 4) > 3):
sys.stdout.write ('\tnao:hasTag [a nao:Tag ; nao:prefLabel ' + getRandomTag () + '];\n')
sys.stdout.write('\tnco:hasPostalAddress <urn:uuid:' + postalAddressID + '>.\n')
sys.stdout.write('\n')
-
+
#calendarEntryID=str(random.randint(0, sys.maxint))
#if random.randint(0, 3)>2 and count>2 and len(previousContacts):
# generateCalendarEntry(gen_data, str, random)
-
- #20% Send emails. Those who do, send 1-30 emails. EMails have CC and BCC people
+
+ #20% Send emails. Those who do, send 1-30 emails. EMails have CC and BCC people
if random.randint(0, 10)>8 or count==1:
- emailcount=random.randint(1, 30)
+ emailcount=random.randint(1, 30)
for dummy in range (0, emailcount):
generateEmail(sys, gen_data, str, random)
sys.stdout.write('\n')
previousContacts.append(UID)
previousEmailAddresses.append(emailAddress)
-
- #TODO INSERT IM - Use just a nmo:Message for that for now.
-
+
+ #TODO INSERT IM - Use just a nmo:Message for that for now.
+
#TODO: Insert bookmarks
diff --git a/utils/data-generators/generate-data-for-music.py b/utils/data-generators/generate-data-for-music.py
index a13c7af..d09e631 100755
--- a/utils/data-generators/generate-data-for-music.py
+++ b/utils/data-generators/generate-data-for-music.py
@@ -41,9 +41,9 @@ def generate_name():
def update_tag(artistid, artistname, albumid, trackid, genreid):
global fileid
-
+
length = random.randint(5000,5000000)
- song = 'SongTitle%03u' % fileid
+ song = 'SongTitle%03u' % fileid
album = 'Album%03u' % albumid
genre = 'Genre%03u' % genreid
trackstr = str(artistid) + '/' + str(trackid)
@@ -55,7 +55,7 @@ def update_tag(artistid, artistname, albumid, trackid, genreid):
random.randint(1, 12),
random.randint(1, 28))
created = modified
-
+
if not artist_UID.has_key(artistname):
#print " The new artist is "+artist
UID = str(random.randint(0, sys.maxint))
@@ -68,8 +68,8 @@ def update_tag(artistid, artistname, albumid, trackid, genreid):
if not album_UID.has_key(album):
album_UID[album] = album
f.write('<urn:album:' + album + '> a nmm:MusicAlbum; \n')
-
- if len(UID)>0:
+
+ if len(UID)>0:
f.write('\tnmm:albumArtist <urn:uuid:' + UID + '>;\n')
f.write('\tnie:title "' + album + '".\n\n')
@@ -77,7 +77,7 @@ def update_tag(artistid, artistname, albumid, trackid, genreid):
UID = artist_UID[artistname]
f.write('<file://' + urllib.pathname2url(fullpath) + '> a nmm:MusicPiece,nfo:FileDataObject;\n')
- if len(song) > 0:
+ if len(song) > 0:
f.write('\tnie:title "' + song + '";\n')
f.write('\tnfo:fileName \"' + artistname + '.mp3\";\n')
@@ -89,7 +89,7 @@ def update_tag(artistid, artistname, albumid, trackid, genreid):
if len(trackstr) > 0:
trackArray = trackstr.split("/")
- if len(trackArray) > 0:
+ if len(trackArray) > 0:
f.write('\tnmm:trackNumber ' + trackArray[0] + ';\n')
f.write('\tnmm:length ' + str(length) + ';\n')
@@ -110,7 +110,7 @@ def create_track(artistid, albumid, genreid, settings):
def generate(settings):
''' A total of TotalTracks files will be generated.
These contain the specified number of albums.'''
- '''
+ '''
filepath = settings['OutputDir']
try:
os.makedirs(filepath)
@@ -118,7 +118,7 @@ def generate(settings):
print 'Directory exists'
'''
- global album_UID
+ global album_UID
genreid = 1
artistid = 1
albumid = 0
@@ -137,36 +137,36 @@ if __name__ == '__main__':
parser = OptionParser()
- parser.add_option("-T", "--TotalTracks",
+ parser.add_option("-T", "--TotalTracks",
dest='TotalTracks',
- help="Specify (mandatory) the total number of files to be generated",
+ help="Specify (mandatory) the total number of files to be generated",
metavar="TotalTracks")
- parser.add_option("-r", "--ArtistCount",
- dest='ArtistCount',
+ parser.add_option("-r", "--ArtistCount",
+ dest='ArtistCount',
default=2,
- help="Specify (mandatory) the total number of Artists." ,
+ help="Specify (mandatory) the total number of Artists." ,
metavar="ArtistCount")
- parser.add_option("-a", "--album-count",
- dest='AlbumCount',
+ parser.add_option("-a", "--album-count",
+ dest='AlbumCount',
default=5,
- help="Specify (mandatory) the number of albums per artist.",
+ help="Specify (mandatory) the number of albums per artist.",
metavar="AlbumCount")
- parser.add_option("-g", "--genre-count",
- dest='GenreCount',
+ parser.add_option("-g", "--genre-count",
+ dest='GenreCount',
default=10,
- help="Specify the genre count" ,
+ help="Specify the genre count" ,
metavar="GenreCount")
- parser.add_option("-o", "--output",
- dest='OutputFileName',
+ parser.add_option("-o", "--output",
+ dest='OutputFileName',
default='generate-data-for-music.ttl',
- help="Specify the output ttl filename. e.g. -T 2000 -r 25 -a 20 -g 10 -o generated_songs.ttl",
+ help="Specify the output ttl filename. e.g. -T 2000 -r 25 -a 20 -g 10 -o generated_songs.ttl",
metavar="OutputFileName")
(options, args) = parser.parse_args()
-
- mandatories = ['TotalTracks', 'ArtistCount', 'AlbumCount']
- for m in mandatories:
- if not options.__dict__[m]:
+
+ mandatories = ['TotalTracks', 'ArtistCount', 'AlbumCount']
+ for m in mandatories:
+ if not options.__dict__[m]:
# Set defaults
if m == "TotalTracks":
options.TotalTracks = 100
diff --git a/utils/data-generators/id32nmmTurtle.py b/utils/data-generators/id32nmmTurtle.py
index 6a98fd7..f338808 100644
--- a/utils/data-generators/id32nmmTurtle.py
+++ b/utils/data-generators/id32nmmTurtle.py
@@ -1,172 +1,172 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-#
-#
-# Copyright (c) 2007 Urho Konttori <urho konttori gmail com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-import os, datetime, time, internals.id3reader as id3reader
-import sys, urllib, random
-indexPath="/Volumes/OSX"
-
-if len(sys.argv)>1:
- indexPath=str(sys.argv[1])
-else:
- print "Usage: python id32nmmTurtle.py <path-to-index>."
- sys.exit (1)
-
-
-songcounter=0
-
-filelist=[]
-folderlist=[]
-foldermap=[]
-depth=0
-artist_UID = {}
-album_UID = {}
-
-class FileProcessor:
-
- def __init__(self):
- self.f=open("./songlist.ttl", 'w' )
-
- self.f.write("@prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#>.\n")
- self.f.write("@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.\n")
- self.f.write("@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#>.\n")
- self.f.write("@prefix nid3: <http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#>.\n")
- self.f.write("@prefix nmm: <http://www.tracker-project.org/temp/nmm#>.\n")
- self.f.write("@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#>.\n")
- self.f.write("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n")
- self.f.write("@prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#>.\n");
- self.f.write("@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.\n")
-
- def addMp3(self, fullpath, fileName):
- global songcounter
- global g_UID
- try:
- year=""
- album=""
- song=""
- artist=""
- trackstr=""
- genre=""
- comment=""
- year=""
- length=0
- id3r = id3reader.Reader(fullpath)
- if id3r.getValue('album'): album = id3r.getValue('album')
- if id3r.getValue('title'): song = id3r.getValue('title')
- if id3r.getValue('performer'): artist = id3r.getValue('performer')
- if id3r.getValue('year'): year = id3r.getValue('year')
- if id3r.getValue('genre'): genre = id3r.getValue('genre')
- if id3r.getValue('comment'): comment = id3r.getValue('comment')
- length=random.randint(5000,5000000 )
- if id3r.getValue('track'):
- trackstr=str(id3r.getValue('track'))
- if id3r.getValue('TPA'):
- partOfSet=id3r.getValue('TPA')
- if partOfSet=="None": partOfSet=""
- modified=time.strftime("%Y-%m-%dT%H:%M:%S",time.localtime(os.path.getmtime(fullpath)))
- created=time.strftime("%Y-%m-%dT%H:%M:%S",time.localtime(os.path.getctime(fullpath)))
- size = os.path.getsize(fullpath)
-
-
- artistUID = ""
- albumUID = ""
- UID=""
- if not artist_UID.has_key(artist):
- #print " The new artist is "+artist
- UID = str(random.randint(0, sys.maxint))
- artist_UID[artist] = UID
- self.f.write('<urn:uuid:'+UID+'> a nco:Contact; \n')
- #self.f.write('<urn:artist:'+artist+'> a nco:Contact; \n')
- self.f.write('\tnco:fullname "'+artist+'".\n\n')
- else :
- #print 'Artist exists ' + artist
- UID = artist_UID[artist]
-
- if not album_UID.has_key(album):
- #print " The new album is "+artist
-
- album_UID[artist] = album
- self.f.write('<urn:album:'+album+'> a nmm:MusicAlbum; \n')
-
- if len(partOfSet)>0:
- setArray=partOfSet.split("/")
- if len(setArray)>0: self.f.write('\tnmm:setNumber '+setArray[0]+';\n')
- if len(setArray)>1: self.f.write('\tnmm:setCount '+setArray[1]+';\n')
- if len(UID)>0: self.f.write('\tnmm:albumArtist <urn:uuid:'+UID+'>;\n')
- self.f.write('\tnie:title "'+album+'".\n\n')
- else :
- #print 'Artist exists ' + artist
- UID = artist_UID[artist]
-
- self.f.write('<file://'+urllib.pathname2url(fullpath)+'> a nmm:MusicPiece,nfo:FileDataObject;\n')
- if len(song)>0: self.f.write('\tnie:title "'+song+'";\n')
- if len(fileName)>0: self.f.write('\tnfo:fileName "'+fileName+'";\n')
- if len(modified)>0: self.f.write('\tnfo:fileLastModified "'+modified+'" ;\n')
- if len(created)>0: self.f.write('\tnfo:fileCreated "'+created+'";\n')
- self.f.write('\tnfo:fileSize '+str(size)+';\n')
- if len(album)>0: self.f.write('\tnmm:musicAlbum <urn:album:'+album+'>;\n')
-# if len(year)>0: self.f.write('\tnid3:recordingYear '+str(year)+';\n')
- if len(genre)>0: self.f.write('\tnmm:genre "'+genre+'";\n')
- if len(trackstr)>0:
- trackArray=trackstr.split("/")
- if len(trackArray)>0: self.f.write('\tnmm:trackNumber '+trackArray[0]+';\n')
-
-
- if length>0: self.f.write('\tnmm:length '+str(length)+';\n')
- if len(UID)>0: self.f.write('\tnmm:performer <urn:uuid:'+UID+'>.\n\n')
-
-
- songcounter+=1
-
-
- if songcounter==1:
- print id3r.dump()
-
-
-
- except IOError, message:
- print "ID TAG ERROR: getIDTags(): IOERROR:", message
-
- def getOSDir(self,addpath, filelist, depth=0):
- try:
- test=os.path.exists(addpath)
- depth=depth+1
- if (test and depth<8):
- #folderlist.append(addpath)
- #folderCounter=len(folderlist)-1
- for fileName in os.listdir (addpath):
- try:
- #filelist.append(addpath+"/"+fileName)
- if fileName.endswith(".mp3") or fileName.endswith(".MP3"):
- self.addMp3(addpath+"/"+fileName, fileName)
- #foldermap.append(folderCounter)
- if os.path.isdir(addpath+"/"+fileName) and not (fileName.find('.')==0) and not (fileName.find("debian")==0) and not (fileName.find('Maps')==0) and not (fileName.find('maps')==0):
- self.getOSDir(addpath+"/"+fileName,filelist, depth)
- except OSError, message:
- print "getOSDir():OSError:", message
- except OSError, message:
- print "getOSDir():OSError:", message
-
-
-fileProcessor=FileProcessor()
-startTime = time.time()
-fileProcessor.getOSDir(indexPath, filelist, depth)
-fileProcessor.f.close()
-print "created "+ str(songcounter) +" songs to turtle file in " + str(time.time()-startTime)+ " seconds."
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+#
+# Copyright (c) 2007 Urho Konttori <urho konttori gmail com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+import os, datetime, time, internals.id3reader as id3reader
+import sys, urllib, random
+indexPath="/Volumes/OSX"
+
+if len(sys.argv)>1:
+ indexPath=str(sys.argv[1])
+else:
+ print "Usage: python id32nmmTurtle.py <path-to-index>."
+ sys.exit (1)
+
+
+songcounter=0
+
+filelist=[]
+folderlist=[]
+foldermap=[]
+depth=0
+artist_UID = {}
+album_UID = {}
+
+class FileProcessor:
+
+ def __init__(self):
+ self.f=open("./songlist.ttl", 'w' )
+
+ self.f.write("@prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#>.\n")
+ self.f.write("@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.\n")
+ self.f.write("@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#>.\n")
+ self.f.write("@prefix nid3: <http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#>.\n")
+ self.f.write("@prefix nmm: <http://www.tracker-project.org/temp/nmm#>.\n")
+ self.f.write("@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#>.\n")
+ self.f.write("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n")
+ self.f.write("@prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#>.\n");
+ self.f.write("@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.\n")
+
+ def addMp3(self, fullpath, fileName):
+ global songcounter
+ global g_UID
+ try:
+ year=""
+ album=""
+ song=""
+ artist=""
+ trackstr=""
+ genre=""
+ comment=""
+ year=""
+ length=0
+ id3r = id3reader.Reader(fullpath)
+ if id3r.getValue('album'): album = id3r.getValue('album')
+ if id3r.getValue('title'): song = id3r.getValue('title')
+ if id3r.getValue('performer'): artist = id3r.getValue('performer')
+ if id3r.getValue('year'): year = id3r.getValue('year')
+ if id3r.getValue('genre'): genre = id3r.getValue('genre')
+ if id3r.getValue('comment'): comment = id3r.getValue('comment')
+ length=random.randint(5000,5000000 )
+ if id3r.getValue('track'):
+ trackstr=str(id3r.getValue('track'))
+ if id3r.getValue('TPA'):
+ partOfSet=id3r.getValue('TPA')
+ if partOfSet=="None": partOfSet=""
+ modified=time.strftime("%Y-%m-%dT%H:%M:%S",time.localtime(os.path.getmtime(fullpath)))
+ created=time.strftime("%Y-%m-%dT%H:%M:%S",time.localtime(os.path.getctime(fullpath)))
+ size = os.path.getsize(fullpath)
+
+
+ artistUID = ""
+ albumUID = ""
+ UID=""
+ if not artist_UID.has_key(artist):
+ #print " The new artist is "+artist
+ UID = str(random.randint(0, sys.maxint))
+ artist_UID[artist] = UID
+ self.f.write('<urn:uuid:'+UID+'> a nco:Contact; \n')
+ #self.f.write('<urn:artist:'+artist+'> a nco:Contact; \n')
+ self.f.write('\tnco:fullname "'+artist+'".\n\n')
+ else :
+ #print 'Artist exists ' + artist
+ UID = artist_UID[artist]
+
+ if not album_UID.has_key(album):
+ #print " The new album is "+artist
+
+ album_UID[artist] = album
+ self.f.write('<urn:album:'+album+'> a nmm:MusicAlbum; \n')
+
+ if len(partOfSet)>0:
+ setArray=partOfSet.split("/")
+ if len(setArray)>0: self.f.write('\tnmm:setNumber '+setArray[0]+';\n')
+ if len(setArray)>1: self.f.write('\tnmm:setCount '+setArray[1]+';\n')
+ if len(UID)>0: self.f.write('\tnmm:albumArtist <urn:uuid:'+UID+'>;\n')
+ self.f.write('\tnie:title "'+album+'".\n\n')
+ else :
+ #print 'Artist exists ' + artist
+ UID = artist_UID[artist]
+
+ self.f.write('<file://'+urllib.pathname2url(fullpath)+'> a nmm:MusicPiece,nfo:FileDataObject;\n')
+ if len(song)>0: self.f.write('\tnie:title "'+song+'";\n')
+ if len(fileName)>0: self.f.write('\tnfo:fileName "'+fileName+'";\n')
+ if len(modified)>0: self.f.write('\tnfo:fileLastModified "'+modified+'" ;\n')
+ if len(created)>0: self.f.write('\tnfo:fileCreated "'+created+'";\n')
+ self.f.write('\tnfo:fileSize '+str(size)+';\n')
+ if len(album)>0: self.f.write('\tnmm:musicAlbum <urn:album:'+album+'>;\n')
+# if len(year)>0: self.f.write('\tnid3:recordingYear '+str(year)+';\n')
+ if len(genre)>0: self.f.write('\tnmm:genre "'+genre+'";\n')
+ if len(trackstr)>0:
+ trackArray=trackstr.split("/")
+ if len(trackArray)>0: self.f.write('\tnmm:trackNumber '+trackArray[0]+';\n')
+
+
+ if length>0: self.f.write('\tnmm:length '+str(length)+';\n')
+ if len(UID)>0: self.f.write('\tnmm:performer <urn:uuid:'+UID+'>.\n\n')
+
+
+ songcounter+=1
+
+
+ if songcounter==1:
+ print id3r.dump()
+
+
+
+ except IOError, message:
+ print "ID TAG ERROR: getIDTags(): IOERROR:", message
+
+ def getOSDir(self,addpath, filelist, depth=0):
+ try:
+ test=os.path.exists(addpath)
+ depth=depth+1
+ if (test and depth<8):
+ #folderlist.append(addpath)
+ #folderCounter=len(folderlist)-1
+ for fileName in os.listdir (addpath):
+ try:
+ #filelist.append(addpath+"/"+fileName)
+ if fileName.endswith(".mp3") or fileName.endswith(".MP3"):
+ self.addMp3(addpath+"/"+fileName, fileName)
+ #foldermap.append(folderCounter)
+ if os.path.isdir(addpath+"/"+fileName) and not (fileName.find('.')==0) and not (fileName.find("debian")==0) and not (fileName.find('Maps')==0) and not (fileName.find('maps')==0):
+ self.getOSDir(addpath+"/"+fileName,filelist, depth)
+ except OSError, message:
+ print "getOSDir():OSError:", message
+ except OSError, message:
+ print "getOSDir():OSError:", message
+
+
+fileProcessor=FileProcessor()
+startTime = time.time()
+fileProcessor.getOSDir(indexPath, filelist, depth)
+fileProcessor.f.close()
+print "created "+ str(songcounter) +" songs to turtle file in " + str(time.time()-startTime)+ " seconds."
diff --git a/utils/data-generators/id32ttl.py b/utils/data-generators/id32ttl.py
index 26bb934..63470c9 100755
--- a/utils/data-generators/id32ttl.py
+++ b/utils/data-generators/id32ttl.py
@@ -38,18 +38,18 @@ foldermap=[]
depth=0
artist_UID = {}
class FileProcessor:
-
+
def __init__(self):
self.f=open("./songlist.ttl", 'w' )
-
+
self.f.write("@prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#>.\n")
self.f.write("@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.\n")
self.f.write("@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#>.\n")
self.f.write("@prefix nid3: <http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#>.\n")
self.f.write("@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#>.\n")
- self.f.write("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n")
+ self.f.write("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n")
self.f.write("@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.\n")
-
+
def addMp3(self, fullpath, fileName):
global songcounter
global g_UID
@@ -79,50 +79,50 @@ class FileProcessor:
modified=time.strftime("%Y-%m-%dT%H:%M:%S",time.localtime(os.path.getmtime(fullpath)))
created=time.strftime("%Y-%m-%dT%H:%M:%S",time.localtime(os.path.getctime(fullpath)))
size = os.path.getsize(fullpath)
-
- #UID=str(random.randint(0, sys.maxint))
+
+ #UID=str(random.randint(0, sys.maxint))
UID = ""
if not artist_UID.has_key(artist):
#print " The new artist is "+artist
UID = str(random.randint(0, sys.maxint))
artist_UID[artist] = UID
- self.f.write('<urn:uuid:'+UID+'> a nco:Contact; \n')
- self.f.write('\tnco:fullname "'+artist+'".\n')
+ self.f.write('<urn:uuid:'+UID+'> a nco:Contact; \n')
+ self.f.write('\tnco:fullname "'+artist+'".\n')
else :
#print 'Artist exists ' + artist
UID = artist_UID[artist]
-
- self.f.write('<file://'+urllib.pathname2url(fullpath)+'> a nid3:ID3Audio,nfo:FileDataObject;\n')
- if len(fileName)>0: self.f.write('\tnfo:fileName "'+fileName+'";\n')
- if len(modified)>0: self.f.write('\tnfo:fileLastModified "'+modified+'" ;\n')
- if len(created)>0: self.f.write('\tnfo:fileCreated "'+created+'";\n')
+
+ self.f.write('<file://'+urllib.pathname2url(fullpath)+'> a nid3:ID3Audio,nfo:FileDataObject;\n')
+ if len(fileName)>0: self.f.write('\tnfo:fileName "'+fileName+'";\n')
+ if len(modified)>0: self.f.write('\tnfo:fileLastModified "'+modified+'" ;\n')
+ if len(created)>0: self.f.write('\tnfo:fileCreated "'+created+'";\n')
self.f.write('\tnfo:fileSize '+str(size)+';\n')
if len(album)>0: self.f.write('\tnid3:albumTitle "'+album+'";\n')
if len(year)>0: self.f.write('\tnid3:recordingYear '+str(year)+';\n')
if len(song)>0: self.f.write('\tnid3:title "'+song+'";\n')
if len(trackstr)>0: self.f.write('\tnid3:trackNumber "'+trackstr+'";\n')
if len(partOfSet)>0: self.f.write('\tnid3:partOfSet "'+partOfSet+'";\n')
-
- if len(genre)>0: self.f.write('\tnid3:contentType "'+genre+'";\n')
+
+ if len(genre)>0: self.f.write('\tnid3:contentType "'+genre+'";\n')
if len(comment)>0: self.f.write('\tnid3:comments "'+comment+'";\n')
if length>0: self.f.write('\tnid3:length '+str(length)+';\n')
if len(UID)>0: self.f.write('\tnid3:leadArtist <urn:uuid:'+UID+'>.\n\n')
-
-
+
+
songcounter+=1
-
-
+
+
if songcounter==1:
print id3r.dump()
-
-
+
+
except IOError, message:
print "ID TAG ERROR: getIDTags(): IOERROR:", message
def getOSDir(self,addpath, filelist, depth=0):
try:
- test=os.path.exists(addpath)
+ test=os.path.exists(addpath)
depth=depth+1
if (test and depth<8):
#folderlist.append(addpath)
@@ -132,8 +132,8 @@ class FileProcessor:
#filelist.append(addpath+"/"+fileName)
if fileName.endswith(".mp3") or fileName.endswith(".MP3"):
self.addMp3(addpath+"/"+fileName, fileName)
- #foldermap.append(folderCounter)
- if os.path.isdir(addpath+"/"+fileName) and not (fileName.find('.')==0) and not (fileName.find("debian")==0) and not (fileName.find('Maps')==0) and not (fileName.find('maps')==0):
+ #foldermap.append(folderCounter)
+ if os.path.isdir(addpath+"/"+fileName) and not (fileName.find('.')==0) and not (fileName.find("debian")==0) and not (fileName.find('Maps')==0) and not (fileName.find('maps')==0):
self.getOSDir(addpath+"/"+fileName,filelist, depth)
except OSError, message:
print "getOSDir():OSError:", message
diff --git a/utils/playlists/Makefile.am b/utils/playlists/Makefile.am
index 740a588..1c34ff0 100644
--- a/utils/playlists/Makefile.am
+++ b/utils/playlists/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-noinst_PROGRAMS =
+noinst_PROGRAMS =
if HAVE_TOTEM_PL_PARSER
noinst_PROGRAMS += playlist2ttl
@@ -11,7 +11,7 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GIO_CFLAGS) \
- $(TOTEM_PL_PARSER_CFLAGS)
+ $(TOTEM_PL_PARSER_CFLAGS)
playlist2ttl_SOURCES = \
playlist2ttl.c
diff --git a/utils/playlists/playlist2ttl.c b/utils/playlists/playlist2ttl.c
index 844c26d..65c7d1d 100644
--- a/utils/playlists/playlist2ttl.c
+++ b/utils/playlists/playlist2ttl.c
@@ -18,7 +18,7 @@ static GOptionEntry entries[] = {
};
static void
-print_header ()
+print_header ()
{
g_print ("@prefix nmo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#>.\n");
g_print ("@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#>.\n");
@@ -35,19 +35,19 @@ static void
entry_parsed (TotemPlParser *parser, const gchar *uri, GHashTable *metadata, gpointer user_data)
{
PlaylistData *playlist_data = (PlaylistData *)user_data;
-
+
playlist_data->tracks += 1;
//uri = g_hash_table_lookup (metadata, TOTEM_PL_PARSER_FIELD_URI);
- g_print ("<%s> nfo:hasMediaFileListEntry [ \n",
+ g_print ("<%s> nfo:hasMediaFileListEntry [ \n",
playlist_data->playlist);
g_print ("\t a nfo:MediaFileListEntry ; \n");
g_print ("\t nfo:listPosition %d ; \n", playlist_data->tracks);
g_print ("\t nfo:entryContent <%s> ] .\n\n", uri);
}
-gint
-main (gint argc, gchar **argv)
+gint
+main (gint argc, gchar **argv)
{
GFile *file;
GOptionContext *context = NULL;
@@ -89,7 +89,7 @@ main (gint argc, gchar **argv)
g_object_set (pl, "recurse", FALSE, "disable-unsafe", TRUE, NULL);
g_signal_connect (G_OBJECT (pl), "entry-parsed", G_CALLBACK (entry_parsed), &playlist_data);
-
+
result = totem_pl_parser_parse (pl, uri, FALSE);
@@ -114,4 +114,4 @@ main (gint argc, gchar **argv)
return 0;
}
-
+
diff --git a/utils/services/data-validator.c b/utils/services/data-validator.c
index 890b9b4..99ef2bf 100644
--- a/utils/services/data-validator.c
+++ b/utils/services/data-validator.c
@@ -32,8 +32,8 @@ static GList *known_items = NULL;
static gboolean
exists_or_already_reported (const gchar *item)
{
- if (!g_list_find_custom (known_items,
- item,
+ if (!g_list_find_custom (known_items,
+ item,
(GCompareFunc) g_strcmp0)){
if (!g_list_find_custom (unknown_items,
item,
@@ -62,19 +62,19 @@ turtle_statement_handler (const gchar *turtle_subject,
const gchar *turtle_object)
{
- /* Check that predicate exists in the ontology
+ /* Check that predicate exists in the ontology
*/
- if (!exists_or_already_reported (turtle_predicate)){
+ if (!exists_or_already_reported (turtle_predicate)){
g_print ("Unknown property %s\n", turtle_predicate);
unknown_items = g_list_prepend (unknown_items, g_strdup (turtle_predicate));
error_flag = TRUE;
}
- /* And if it is a type... check the object is also there
+ /* And if it is a type... check the object is also there
*/
if (!g_strcmp0 (turtle_predicate, IS)) {
-
- if (!exists_or_already_reported (turtle_object)){
+
+ if (!exists_or_already_reported (turtle_object)){
g_print ("Unknown class %s\n", turtle_object);
error_flag = TRUE;
unknown_items = g_list_prepend (unknown_items, g_strdup (turtle_object));
@@ -92,14 +92,14 @@ load_ontology_files (const gchar *services_dir)
GFile *f;
gchar *dir_uri, *fullpath;
gint counter = 0;
-
+
f = g_file_new_for_path (services_dir);
dir_uri = g_file_get_path (f);
services = g_dir_open (dir_uri, 0, NULL);
-
+
conf_file = g_dir_read_name (services);
-
+
while (conf_file) {
TrackerTurtleReader *reader;
GError *error = NULL;
@@ -108,7 +108,7 @@ load_ontology_files (const gchar *services_dir)
conf_file = g_dir_read_name (services);
continue;
}
-
+
fullpath = g_build_filename (dir_uri, conf_file, NULL);
reader = tracker_turtle_reader_new (fullpath, NULL);
@@ -143,7 +143,7 @@ load_ontology_files (const gchar *services_dir)
gint
-main (gint argc, gchar **argv)
+main (gint argc, gchar **argv)
{
GOptionContext *context;
TrackerTurtleReader *reader;
diff --git a/utils/services/gen-doc.sh b/utils/services/gen-doc.sh
index a22cd1c..9882aaa 100755
--- a/utils/services/gen-doc.sh
+++ b/utils/services/gen-doc.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
-# This script generates the HTML documentation from TTL description
+# This script generates the HTML documentation from TTL description
# for the tracker specific ontologies
#
BUILD_DIR="./build/ontologies"
@@ -22,8 +22,8 @@ if [ -e file-class.cache ]; then
rm -f file-class.cache ;
fi
-for f in `find ../../data/ontologies -name "*.ontology"` ; do
- TMPNAME=${f%.ontology}
+for f in `find ../../data/ontologies -name "*.ontology"` ; do
+ TMPNAME=${f%.ontology}
PREFIX=${TMPNAME#*-}
grep "^[a-z]\{1,\}\:[a-zA-Z]" $f |awk -v pr=$PREFIX '{print pr " " $1}' >> file-class.cache
done
@@ -33,14 +33,14 @@ for image in `find ../../docs/ontologies -name "*.dia"` ; do
dia -t png $image -e $BUILD_DIR/$(basename ${image/.dia/.png})
done
-for f in `find ../../data/ontologies -name "*.description"` ; do
+for f in `find ../../data/ontologies -name "*.description"` ; do
# ../../data/ontologies/XX-aaa.description -> PREFIX=aaa
- TMPNAME=${f%.description}
+ TMPNAME=${f%.description}
PREFIX=${TMPNAME#*-}
echo "Generating $PREFIX"
mkdir -p $BUILD_DIR/$PREFIX
# Copy before because we check in the code if the documentation exists
- if [ -e ../../docs/ontologies/$PREFIX ]; then
+ if [ -e ../../docs/ontologies/$PREFIX ]; then
cp -r ../../docs/ontologies/$PREFIX/* $BUILD_DIR/$PREFIX/ ;
fi
./ttl2html -d $f -o $BUILD_DIR/$PREFIX/index.html -l file-class.cache \
diff --git a/utils/services/ontology-validator.c b/utils/services/ontology-validator.c
index 402da36..24bca56 100644
--- a/utils/services/ontology-validator.c
+++ b/utils/services/ontology-validator.c
@@ -33,8 +33,8 @@ static GList *unknown_predicates = NULL;
static gboolean
exists_or_already_reported (const gchar *item)
{
- if (!g_list_find_custom (known_items,
- item,
+ if (!g_list_find_custom (known_items,
+ item,
(GCompareFunc) g_strcmp0)){
if (!g_list_find_custom (unknown_items,
item,
@@ -51,8 +51,8 @@ turtle_load_ontology (const gchar *turtle_subject,
const gchar *turtle_object)
{
- /* nmo:Email a rdfs:Class
- * If rdfs:Class exists, add nmo:Email to the known_items
+ /* nmo:Email a rdfs:Class
+ * If rdfs:Class exists, add nmo:Email to the known_items
**/
if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
@@ -81,18 +81,18 @@ turtle_load_ontology (const gchar *turtle_subject,
g_error ("%s is a %s but %s is not defined",
turtle_subject, turtle_object, turtle_object);
} else {
- /* A new type defined... if it is a predicate,
- * remove it from the maybe list!
+ /* A new type defined... if it is a predicate,
+ * remove it from the maybe list!
*/
if (!g_strcmp0 (turtle_object, RDF_PROPERTY)) {
GList *link;
- link = g_list_find_custom (unknown_predicates,
- turtle_subject,
+ link = g_list_find_custom (unknown_predicates,
+ turtle_subject,
(GCompareFunc)g_strcmp0);
if (link) {
unknown_predicates = g_list_remove_link (unknown_predicates,
link);
- }
+ }
}
known_items = g_list_prepend (known_items, g_strdup (turtle_subject));
}
@@ -116,19 +116,19 @@ turtle_load_ontology (const gchar *turtle_subject,
}
/*
- * The predicate is not type, subclass, range, domain...
+ * The predicate is not type, subclass, range, domain...
* Put it in maybe
*/
if (!exists_or_already_reported (turtle_predicate)
- && !g_list_find_custom (unknown_predicates,
- turtle_predicate,
+ && !g_list_find_custom (unknown_predicates,
+ turtle_predicate,
(GCompareFunc) g_strcmp0)) {
- unknown_predicates = g_list_prepend (unknown_predicates,
+ unknown_predicates = g_list_prepend (unknown_predicates,
g_strdup (turtle_predicate));
}
}
-static void
+static void
process_file (const gchar *ttl_file)
{
TrackerTurtleReader *reader;
@@ -160,22 +160,22 @@ load_ontology_files (const gchar *services_dir)
const gchar *conf_file;
GFile *f;
gchar *dir_uri, *fullpath;
-
+
f = g_file_new_for_path (services_dir);
dir_uri = g_file_get_path (f);
g_print ("dir_uri %s\n", dir_uri);
services = g_dir_open (dir_uri, 0, NULL);
-
+
conf_file = g_dir_read_name (services);
-
+
while (conf_file) {
if (!g_str_has_suffix (conf_file, "ontology")) {
conf_file = g_dir_read_name (services);
continue;
}
-
+
fullpath = g_build_filename (dir_uri, conf_file, NULL);
files = g_list_insert_sorted (files, fullpath, (GCompareFunc) g_strcmp0);
conf_file = g_dir_read_name (services);
@@ -199,7 +199,7 @@ load_basic_classes ()
}
gint
-main (gint argc, gchar **argv)
+main (gint argc, gchar **argv)
{
GOptionContext *context;
GList *it;
diff --git a/utils/services/qname-test.c b/utils/services/qname-test.c
index 7b279c6..658fbf6 100644
--- a/utils/services/qname-test.c
+++ b/utils/services/qname-test.c
@@ -15,7 +15,7 @@ srcdir_qname_init (const gchar *luri, const gchar *lprefix)
}
static void
-test_qname_to_shortname (void)
+test_qname_to_shortname (void)
{
gchar *result = NULL;
@@ -41,7 +41,7 @@ test_qname_to_shortname (void)
}
static void
-test_qname_to_classname (void)
+test_qname_to_classname (void)
{
gchar *result = NULL;
@@ -62,7 +62,7 @@ test_qname_to_classname (void)
result = qname_to_classname ("test://doesnt_exists#Class");
g_assert_cmpstr (result, ==, "test://doesnt_exists#Class");
g_free (result);
-
+
qname_shutdown ();
}
@@ -82,7 +82,7 @@ test_qname_to_link (void)
g_free (result);
/* This is one of the special cases, where the prefix of the class
- * doesn't match with the prefix of the file where it is defined
+ * doesn't match with the prefix of the file where it is defined
*/
result = qname_to_link ("http://www.tracker-project.org/ontologies/tracker#Namespace";);
g_assert_cmpstr (result, ==, "../rdf/index.html#Namespace");
diff --git a/utils/services/qname.c b/utils/services/qname.c
index 709b633..a5ffe9b 100644
--- a/utils/services/qname.c
+++ b/utils/services/qname.c
@@ -35,7 +35,7 @@ Namespace NAMESPACES [] = {
};
-void
+void
qname_init (const gchar *luri, const gchar *lprefix, const gchar *class_location)
{
g_return_if_fail (luri != NULL);
@@ -53,13 +53,13 @@ qname_init (const gchar *luri, const gchar *lprefix, const gchar *class_location
NAMESPACES[0].namespace = (lprefix != NULL ? g_strdup (lprefix) : g_strdup (""));
if (class_location) {
- /* Process a file that contains: dir class pairs by line
+ /* Process a file that contains: dir class pairs by line
*/
gint i;
gchar *raw_content = NULL;
gchar **lines;
gsize length;
-
+
if (!g_file_get_contents (class_location, &raw_content, &length, NULL)) {
g_error ("Unable to load '%s'", class_location);
}
@@ -79,8 +79,8 @@ qname_init (const gchar *luri, const gchar *lprefix, const gchar *class_location
pieces = g_strsplit (lines[i], " ", -1);
g_assert (g_strv_length (pieces) == 2);
- g_hash_table_insert (class_deffile,
- g_strdup(pieces[1]),
+ g_hash_table_insert (class_deffile,
+ g_strdup(pieces[1]),
g_strdup(pieces[0]));
g_strfreev (pieces);
@@ -91,7 +91,7 @@ qname_init (const gchar *luri, const gchar *lprefix, const gchar *class_location
}
-void
+void
qname_shutdown (void)
{
g_free (NAMESPACES[0].namespace);
@@ -128,7 +128,7 @@ split_qname (const gchar *qname, GError **error)
pieces[1] = g_strdup (&qname[i+1]);
pieces[2] = NULL;
break;
- }
+ }
}
if (pieces == NULL) {
@@ -164,7 +164,7 @@ qname_to_link (const gchar *qname)
dir, qname_to_classname (qname));
}
}
-
+
return g_strdup (qname);
}
@@ -180,8 +180,8 @@ qname_to_shortname (const gchar *qname)
if (g_str_has_prefix (qname, NAMESPACES[i].uri)) {
pieces = split_qname (qname, NULL);
- name = g_strdup_printf ("%s:%s",
- NAMESPACES[i].namespace,
+ name = g_strdup_printf ("%s:%s",
+ NAMESPACES[i].namespace,
pieces[1]);
g_strfreev (pieces);
break;
@@ -215,10 +215,10 @@ qname_to_classname (const gchar *qname) {
return classname;
}
-gboolean
+gboolean
qname_is_basic_type (const gchar *qname)
{
- gint i;
+ gint i;
/* dc: or xsd: are basic types */
for (i = 1; NAMESPACES[i].namespace != NULL && i < 3; i++) {
if (g_str_has_prefix (qname, NAMESPACES[i].uri)) {
diff --git a/utils/services/qname.h b/utils/services/qname.h
index dbeca59..4597516 100644
--- a/utils/services/qname.h
+++ b/utils/services/qname.h
@@ -5,7 +5,7 @@
G_BEGIN_DECLS
-void qname_init (const gchar *local_uri,
+void qname_init (const gchar *local_uri,
const gchar *local_prefix,
const gchar *class_location);
void qname_shutdown (void);
diff --git a/utils/services/rdfxml2metadatasample.xsl b/utils/services/rdfxml2metadatasample.xsl
index af9d9a6..b73d70c 100644
--- a/utils/services/rdfxml2metadatasample.xsl
+++ b/utils/services/rdfxml2metadatasample.xsl
@@ -76,4 +76,4 @@ SuperProperties=<xsl:for-each select="rdfs:subPropertyOf">
Description=<xsl:value-of select="rdfs:comment"/></xsl:if>
</xsl:for-each>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/utils/services/rdfxml2servicesample.xsl b/utils/services/rdfxml2servicesample.xsl
index 43d28cd..eb1e114 100644
--- a/utils/services/rdfxml2servicesample.xsl
+++ b/utils/services/rdfxml2servicesample.xsl
@@ -57,5 +57,5 @@ SuperClasses=<xsl:for-each select="rdfs:subClassOf">
Description=<xsl:value-of select="rdfs:comment"/></xsl:if>
</xsl:for-each>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/utils/services/rdfxml2unittest_data.xsl b/utils/services/rdfxml2unittest_data.xsl
index a3375e7..ecd109a 100644
--- a/utils/services/rdfxml2unittest_data.xsl
+++ b/utils/services/rdfxml2unittest_data.xsl
@@ -80,4 +80,4 @@
</xsl:for-each>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/utils/services/rdfxml2unittest_query.xsl b/utils/services/rdfxml2unittest_query.xsl
index d9c22b7..6a55ccb 100644
--- a/utils/services/rdfxml2unittest_query.xsl
+++ b/utils/services/rdfxml2unittest_query.xsl
@@ -82,4 +82,4 @@ ORDER BY ?<xsl:value-of select="substring-after(../@rdf:about, '#')"/>
</xsl:for-each>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/utils/services/rdfxmlsample.xsl b/utils/services/rdfxmlsample.xsl
index 253d049..947d659 100644
--- a/utils/services/rdfxmlsample.xsl
+++ b/utils/services/rdfxmlsample.xsl
@@ -26,18 +26,18 @@
<xsl:variable name="about" select="@rdf:about"/>
public class <xsl:value-of select="rdfs:label" />
-<xsl:if test="count(rdfs:subClassOf) > 0">: <xsl:for-each select="rdfs:subClassOf/rdfs:Class"><xsl:if test="position() > 1">, </xsl:if><xsl:value-of select="substring-after(@rdf:about, '#')"/> </xsl:for-each>
+<xsl:if test="count(rdfs:subClassOf) > 0">: <xsl:for-each select="rdfs:subClassOf/rdfs:Class"><xsl:if test="position() > 1">, </xsl:if><xsl:value-of select="substring-after(@rdf:about, '#')"/> </xsl:for-each>
</xsl:if> {
-
+
<xsl:for-each select="/rdf:RDF/rdf:Property/rdfs:domain[ rdf:resource=$about]">
public <xsl:value-of select="substring-after(../rdfs:range/@rdf:resource, '#')"/><xsl:text> </xsl:text><xsl:value-of select="../rdfs:label"/> {
}
-
+
</xsl:for-each>
}
</xsl:for-each>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/utils/services/resources/LICENSE.txt b/utils/services/resources/LICENSE.txt
index dbec210..0640db6 100644
--- a/utils/services/resources/LICENSE.txt
+++ b/utils/services/resources/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2008, NEPOMUK consortium and contributors
+Copyright (c) 2006-2008, NEPOMUK consortium and contributors
All rights reserved.
diff --git a/utils/services/resources/nepomuk-logo.png b/utils/services/resources/nepomuk-logo.png
index a373c68..91fc407 100644
Binary files a/utils/services/resources/nepomuk-logo.png and b/utils/services/resources/nepomuk-logo.png differ
diff --git a/utils/services/sample.xsl b/utils/services/sample.xsl
index 49d041c..d506a9a 100644
--- a/utils/services/sample.xsl
+++ b/utils/services/sample.xsl
@@ -3,7 +3,7 @@
<xsl:output method="text" />
<xsl:template match="service">
<xsl:for-each select="section">
-// item#<xsl:value-of select="position()"/> for <xsl:value-of select="@fullname" />
+// item#<xsl:value-of select="position()"/> for <xsl:value-of select="@fullname" />
get<xsl:value-of select="@name"/>Of<xsl:value-of select="@prefix" /> {
<xsl:for-each select="item">
<xsl:value-of select="@name"/> {
@@ -15,4 +15,4 @@ get<xsl:value-of select="@name"/>Of<xsl:value-of select="@prefix" /> {
}
</xsl:for-each>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/utils/services/service2rdf-xml.py b/utils/services/service2rdf-xml.py
index a309c55..826efb1 100644
--- a/utils/services/service2rdf-xml.py
+++ b/utils/services/service2rdf-xml.py
@@ -60,7 +60,7 @@ def main():
print ""
- for klass in service.sections():
+ for klass in service.sections():
splitted = klass.split (":")
print "\t<rdfs:Class rdf:about=\"" + uri + "/" + splitted[0] + "#" + splitted[1] + "\">"
print "\t\t<rdfs:label>" + splitted[1] + "</rdfs:label>"
diff --git a/utils/services/ttl2graphviz.c b/utils/services/ttl2graphviz.c
index 0270f94..bbed0d0 100644
--- a/utils/services/ttl2graphviz.c
+++ b/utils/services/ttl2graphviz.c
@@ -22,7 +22,7 @@ static GOptionEntry entries[] = {
};
gint
-main (gint argc, gchar **argv)
+main (gint argc, gchar **argv)
{
GOptionContext *context;
Ontology *ontology = NULL;
@@ -67,7 +67,7 @@ main (gint argc, gchar **argv)
dirname = g_path_get_dirname (desc_file);
ttl_file = g_build_filename (dirname,
- description->relativePath,
+ description->relativePath,
NULL);
ontology = ttl_loader_load_ontology (ttl_file);
@@ -80,7 +80,7 @@ main (gint argc, gchar **argv)
ttl_loader_free_description (description);
g_option_context_free (context);
-
+
fclose (f);
return 0;
diff --git a/utils/services/ttl2html.c b/utils/services/ttl2html.c
index c8a30af..0c4a588 100644
--- a/utils/services/ttl2html.c
+++ b/utils/services/ttl2html.c
@@ -32,7 +32,7 @@ static GOptionEntry entries[] = {
};
gint
-main (gint argc, gchar **argv)
+main (gint argc, gchar **argv)
{
GOptionContext *context;
Ontology *ontology = NULL;
@@ -77,7 +77,7 @@ main (gint argc, gchar **argv)
dirname = g_path_get_dirname (desc_file);
ttl_file = g_build_filename (dirname,
- description->relativePath,
+ description->relativePath,
NULL);
ontology = ttl_loader_load_ontology (ttl_file);
@@ -90,7 +90,7 @@ main (gint argc, gchar **argv)
ttl_loader_free_description (description);
g_option_context_free (context);
-
+
fclose (f);
return 0;
diff --git a/utils/services/ttl_html.c b/utils/services/ttl_html.c
index 211eea9..3355495 100644
--- a/utils/services/ttl_html.c
+++ b/utils/services/ttl_html.c
@@ -119,11 +119,11 @@ print_html_header (FILE *f, OntologyDescription *desc)
}
g_fprintf (f, "</dl>\n <dl>\n");
g_fprintf (f," <dt>Changelog:</dt>\n");
- g_fprintf (f," <dd><a href=\"%s\">Tracker changes</a>",
+ g_fprintf (f," <dd><a href=\"%s\">Tracker changes</a>",
(desc->gitlog ? desc->gitlog : "#"));
g_fprintf (f," </dl>\n");
g_fprintf (f,"</div>\n");
- g_fprintf (f,"<p class=\"copyright\">%s</p>\n",
+ g_fprintf (f,"<p class=\"copyright\">%s</p>\n",
(desc->copyright ? desc->copyright : DEFAULT_COPYRIGHT));
g_fprintf (f,"<hr />\n");
@@ -135,13 +135,13 @@ print_html_explanation (FILE *f, const gchar *explanation_file)
{
gchar *raw_content;
gint length;
-
+
if (explanation_file && g_file_test (explanation_file, G_FILE_TEST_EXISTS)) {
if (!g_file_get_contents (explanation_file, &raw_content, &length, NULL)) {
g_error ("Unable to load '%s'", explanation_file );
}
g_fprintf (f, "%s", raw_content);
- }
+ }
g_fprintf (f,"<hr />\n");
}
@@ -155,7 +155,7 @@ print_html_footer (FILE *f)
static void
-print_ontology_class (gpointer key, gpointer value, gpointer user_data)
+print_ontology_class (gpointer key, gpointer value, gpointer user_data)
{
OntologyClass *def = (OntologyClass *)value;
gchar *name, *anchor;
@@ -165,9 +165,9 @@ print_ontology_class (gpointer key, gpointer value, gpointer user_data)
name = qname_to_shortname (def->classname);
anchor = qname_to_link (def->classname);
-
+
/* Anchor without initial '#' */
- g_fprintf (f,"<a name=\"%s\">\n", &anchor[1]);
+ g_fprintf (f,"<a name=\"%s\">\n", &anchor[1]);
g_free (anchor);
if (def->deprecated) {
@@ -224,7 +224,7 @@ print_ontology_class (gpointer key, gpointer value, gpointer user_data)
}
static void
-print_ontology_property (gpointer key, gpointer value, gpointer user_data)
+print_ontology_property (gpointer key, gpointer value, gpointer user_data)
{
OntologyProperty *def = (OntologyProperty *)value;
gchar *name, *anchor;
@@ -234,9 +234,9 @@ print_ontology_property (gpointer key, gpointer value, gpointer user_data)
name = qname_to_shortname (def->propertyname);
anchor = qname_to_link (def->propertyname);
-
+
/* Anchor without initial '#' */
- g_fprintf (f,"<a name=\"%s\">", &anchor[1]);
+ g_fprintf (f,"<a name=\"%s\">", &anchor[1]);
g_free (anchor);
if (def->deprecated) {
@@ -264,7 +264,7 @@ print_ontology_property (gpointer key, gpointer value, gpointer user_data)
g_fprintf (f,"<td class=\"rowheader\">Range</td>");
print_references_list (f, def->range);
g_fprintf (f,"</tr>\n");
-
+
g_fprintf (f,"<tr>");
g_fprintf (f,"<td class=\"rowheader\">Superproperties</td>");
print_references_list (f, def->superproperties);
@@ -292,7 +292,7 @@ print_ontology_property (gpointer key, gpointer value, gpointer user_data)
-void
+void
ttl_html_print (OntologyDescription *description,
Ontology *ontology,
FILE *f,
diff --git a/utils/services/ttl_loader.c b/utils/services/ttl_loader.c
index dfdc563..3c8310d 100644
--- a/utils/services/ttl_loader.c
+++ b/utils/services/ttl_loader.c
@@ -11,7 +11,7 @@
#define RDFS_RANGE "http://www.w3.org/2000/01/rdf-schema#range";
#define RDFS_DOMAIN "http://www.w3.org/2000/01/rdf-schema#domain";
#define RDFS_COMMENT "http://www.w3.org/2000/01/rdf-schema#comment";
-#define RDFS_LABEL "http://www.w3.org/2000/01/rdf-schema#label";
+#define RDFS_LABEL "http://www.w3.org/2000/01/rdf-schema#label";
#define RDFS_SUBPROPERTYOF "http://www.w3.org/2000/01/rdf-schema#subPropertyOf";
#define NRL_MAX_CARDINALITY "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#maxCardinality";
@@ -37,7 +37,7 @@
#define DSC_LOCALPREFIX DSC_PREFIX "localPrefix"
#define DSC_COPYRIGHT DSC_PREFIX "copyright"
-static gboolean
+static gboolean
string_to_boolean (const gchar *str) {
if (!g_strcmp0 (str, "true")) {
return TRUE;
@@ -60,13 +60,13 @@ load_in_memory (Ontology *ontology,
if (!g_strcmp0 (turtle_predicate, RDFS_TYPE)) {
/* It is a definition of class or property */
if (!g_strcmp0 (turtle_object, RDFS_CLASS)) {
- g_hash_table_insert (ontology->classes,
- g_strdup (turtle_subject),
+ g_hash_table_insert (ontology->classes,
+ g_strdup (turtle_subject),
ttl_model_class_new (turtle_subject));
} else if (!g_strcmp0 (turtle_object, RDF_PROPERTY)) {
g_hash_table_insert (ontology->properties,
- g_strdup (turtle_subject),
+ g_strdup (turtle_subject),
ttl_model_property_new (turtle_subject));
} else {
@@ -85,8 +85,8 @@ load_in_memory (Ontology *ontology,
} else if (!g_strcmp0 (turtle_predicate, RDFS_SUBCLASSOF)) {
/*
- * A subclass of B:
- * - Add B in A->superclasses list
+ * A subclass of B:
+ * - Add B in A->superclasses list
* - Add A in B->subclasses list (if B is in this ontology!)
*/
OntologyClass *def;
@@ -96,12 +96,12 @@ load_in_memory (Ontology *ontology,
g_error ("Something wrong");
}
- def->superclasses = g_list_prepend (def->superclasses,
+ def->superclasses = g_list_prepend (def->superclasses,
g_strdup (turtle_object));
def = g_hash_table_lookup (ontology->classes, turtle_object);
if (def) {
- def->subclasses = g_list_prepend (def->subclasses,
+ def->subclasses = g_list_prepend (def->subclasses,
g_strdup (turtle_subject));
}
} else if (!g_strcmp0 (turtle_predicate, TRACKER_NOTIFY)) {
@@ -154,7 +154,7 @@ load_in_memory (Ontology *ontology,
klass->in_domain_of = g_list_prepend (klass->in_domain_of,
g_strdup (turtle_subject));
}
-
+
} else if (!g_strcmp0 (turtle_predicate, RDFS_RANGE)) {
/*
* (prop A) has range (class B)
@@ -193,7 +193,7 @@ load_in_memory (Ontology *ontology,
* -> add A in B->subproperties (if B is in this ontology)
*/
OntologyProperty *propA, *propB;
-
+
propA = g_hash_table_lookup (ontology->properties, turtle_subject);
if (!propA) {
g_error ("Strange error in subpropertyof (%s doesnt exist!)",
@@ -207,7 +207,7 @@ load_in_memory (Ontology *ontology,
propB->subproperties = g_list_prepend (propB->subproperties,
g_strdup (turtle_subject));
}
-
+
} else if (!g_strcmp0 (turtle_predicate, NAO_DEPRECATED)) {
/*
* X nao:deprecated true
@@ -233,8 +233,8 @@ load_in_memory (Ontology *ontology,
} else if (!g_strcmp0 (turtle_predicate, RDFS_LABEL)) {
/* Intentionaly ignored */
} else {
- /* DEBUG
- g_print ("UNHANDLED %s %s %s\n",
+ /* DEBUG
+ g_print ("UNHANDLED %s %s %s\n",
turtle_subject, turtle_predicate, turtle_object);
*/
}
@@ -258,7 +258,7 @@ load_description (OntologyDescription *desc,
} else if (!g_strcmp0 (turtle_predicate, DSC_EDITOR)) {
desc->editors = g_list_prepend (desc->editors, g_strdup (turtle_object));
} else if (!g_strcmp0 (turtle_predicate, DSC_CONTRIBUTOR)) {
- desc->contributors = g_list_prepend (desc->contributors,
+ desc->contributors = g_list_prepend (desc->contributors,
g_strdup (turtle_object));
} else if (!g_strcmp0 (turtle_predicate, DSC_GITLOG)) {
desc->gitlog = g_strdup (turtle_object);
@@ -282,14 +282,14 @@ ttl_loader_load_ontology (const gchar *ttl_file)
Ontology *ontology;
ontology = g_new0 (Ontology, 1);
- ontology->classes = g_hash_table_new_full (g_str_hash,
+ ontology->classes = g_hash_table_new_full (g_str_hash,
g_str_equal,
- g_free,
+ g_free,
(GDestroyNotify)ttl_model_class_free);
- ontology->properties = g_hash_table_new_full (g_str_hash,
+ ontology->properties = g_hash_table_new_full (g_str_hash,
g_str_equal,
- g_free,
+ g_free,
(GDestroyNotify)ttl_model_property_free);
if (ttl_file) {
@@ -348,8 +348,8 @@ ttl_loader_load_description (const gchar *filename)
}
-void
-ttl_loader_free_ontology (Ontology *ontology)
+void
+ttl_loader_free_ontology (Ontology *ontology)
{
g_hash_table_destroy (ontology->classes);
g_hash_table_destroy (ontology->properties);
diff --git a/utils/services/ttl_model.c b/utils/services/ttl_model.c
index 6b32118..bc72e04 100644
--- a/utils/services/ttl_model.c
+++ b/utils/services/ttl_model.c
@@ -20,7 +20,7 @@ ttl_model_class_new (const gchar *classname)
}
void
-ttl_model_class_free (OntologyClass *def)
+ttl_model_class_free (OntologyClass *def)
{
if (def->classname) {
g_free (def->classname);
@@ -65,7 +65,7 @@ ttl_model_property_free (OntologyProperty *def)
if (def->propertyname) {
g_free (def->propertyname);
}
-
+
g_list_foreach (def->type, (GFunc) g_free, NULL);
g_list_foreach (def->domain, (GFunc) g_free, NULL);
g_list_foreach (def->range, (GFunc) g_free, NULL);
diff --git a/utils/tracker-fts/tracker-fts-test.c b/utils/tracker-fts/tracker-fts-test.c
index d17cc29..08383a8 100644
--- a/utils/tracker-fts/tracker-fts-test.c
+++ b/utils/tracker-fts/tracker-fts-test.c
@@ -30,10 +30,10 @@
#include <glib/gstdio.h>
#include <glib-object.h>
-static gint
-callback (void *NotUsed,
- gint argc,
- gchar **argv,
+static gint
+callback (void *NotUsed,
+ gint argc,
+ gchar **argv,
gchar **azColName)
{
gint i;
@@ -41,28 +41,28 @@ callback (void *NotUsed,
for (i = 0; i < argc; i++) {
printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
}
-
+
printf("\n");
return 0;
}
static void
-exec_sql (sqlite3 *db,
+exec_sql (sqlite3 *db,
const gchar *sql)
{
gchar *zErrMsg;
gint rc;
rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
-
+
if (rc != SQLITE_OK) {
g_printerr ("SQL error: %s\n", zErrMsg);
sqlite3_free (zErrMsg);
}
}
-int
+int
main (int argc, char **argv)
{
sqlite3 *db;
@@ -72,7 +72,7 @@ main (int argc, char **argv)
g_type_init ();
g_thread_init (NULL);
-
+
if (argc != 2) {
g_printerr ("Usage: %s MATCH_TERM\n", argv[0]);
g_printerr ("EG: %s stew\n", argv[0]);
@@ -81,7 +81,7 @@ main (int argc, char **argv)
g_unlink ("/tmp/test.db");
db_exists = g_file_test ("/tmp/test.db", G_FILE_TEST_EXISTS);
-
+
rc = sqlite3_open ("/tmp/test.db", &db);
if (rc) {
g_printerr ("Can't open database: %s\n", sqlite3_errmsg(db));
@@ -92,7 +92,7 @@ main (int argc, char **argv)
if (tracker_fts_init (db) != SQLITE_OK) {
fprintf(stderr, "SQL error\n");
}
-
+
if (!db_exists) {
exec_sql (db, "create virtual table recipe using trackerfts (cat, col_default, col_1, col_2)");
exec_sql (db, "insert into recipe (cat, col_default, col_1, col_2) values (3, 'broccoli stew stew stew', 'broccoli,peppers,cheese and tomatoes', 'mix them all up and have fun')");
@@ -107,8 +107,8 @@ main (int argc, char **argv)
sql = g_strdup_printf ("select rowid, cat, col_default, col_1, col_2, offsets(recipe), rank(recipe) from recipe where recipe match '%s' and Cat<8 order by rank(recipe) desc", argv[1]);
exec_sql (db, sql);
g_free (sql);
-
-
+
+
sqlite3_close(db);
return EXIT_SUCCESS;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
