[tracker: 4/4] Merge branch 'SCHED_IDLE'
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker: 4/4] Merge branch 'SCHED_IDLE'
- Date: Mon, 26 Sep 2011 09:21:12 +0000 (UTC)
commit 3034185cbb8f8de4760692323e7be2036ec65b0d
Merge: e0afdfb bdde188
Author: Martyn Russell <martyn lanedo com>
Date: Mon Sep 26 10:18:04 2011 +0100
Merge branch 'SCHED_IDLE'
.../org.freedesktop.Tracker.Extract.gschema.xml.in | 10 +
....freedesktop.Tracker.Miner.Files.gschema.xml.in | 10 +
src/libtracker-common/Makefile.am | 2 +
src/libtracker-common/tracker-common.h | 1 +
src/libtracker-common/tracker-enums.h | 6 +
src/libtracker-common/tracker-sched.c | 81 ++++++++
src/libtracker-common/tracker-sched.h | 33 +++
src/miners/fs/tracker-config.c | 39 ++++-
src/miners/fs/tracker-config.h | 3 +
src/miners/fs/tracker-main.c | 26 ++-
src/tracker-extract/Makefile.am | 1 +
src/tracker-extract/tracker-config.c | 38 ++++
src/tracker-extract/tracker-config.h | 21 +-
src/tracker-extract/tracker-main.c | 30 ++-
src/tracker-preferences/tracker-preferences.ui | 217 +++++++++++--------
src/tracker-preferences/tracker-preferences.vala | 126 ++++++++----
16 files changed, 481 insertions(+), 163 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]