[tracker] libtracker-miner: Do alias lookups for pause/resume
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-miner: Do alias lookups for pause/resume
- Date: Mon, 1 Feb 2010 20:54:17 +0000 (UTC)
commit 15477db87fbb9138cab239bef2f0a778d8b7f33d
Author: Martyn Russell <martyn lanedo com>
Date: Mon Feb 1 20:20:17 2010 +0000
libtracker-miner: Do alias lookups for pause/resume
This means we can use "Files" instead of org.freedesktop... for miner names.
src/libtracker-miner/tracker-miner-manager.c | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index d462a48..06e7220 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -186,7 +186,8 @@ tracker_miner_manager_class_init (TrackerMinerManagerClass *klass)
static DBusGProxy *
find_miner_proxy (TrackerMinerManager *manager,
- const gchar *name)
+ const gchar *name,
+ gboolean try_suffix)
{
TrackerMinerManagerPrivate *priv;
GHashTableIter iter;
@@ -199,6 +200,12 @@ find_miner_proxy (TrackerMinerManager *manager,
if (g_strcmp0 (name, (gchar *) value) == 0) {
return key;
}
+
+ if (try_suffix) {
+ if (g_str_has_suffix (value, name)) {
+ return key;
+ }
+ }
}
return NULL;
@@ -216,7 +223,7 @@ name_owner_changed_cb (DBusGProxy *proxy,
priv = TRACKER_MINER_MANAGER_GET_PRIVATE (manager);
- if (find_miner_proxy (manager, name) != NULL) {
+ if (find_miner_proxy (manager, name, FALSE) != NULL) {
if (new_owner && (!old_owner || !*old_owner)) {
g_signal_emit (manager, signals[MINER_ACTIVATED], 0, name);
} else if (old_owner && (!new_owner || !*new_owner)) {
@@ -613,7 +620,7 @@ tracker_miner_manager_pause (TrackerMinerManager *manager,
g_return_val_if_fail (miner != NULL, FALSE);
g_return_val_if_fail (reason != NULL, FALSE);
- proxy = find_miner_proxy (manager, miner);
+ proxy = find_miner_proxy (manager, miner, TRUE);
if (!proxy) {
g_critical ("No D-Bus proxy found for miner '%s'", miner);
@@ -663,7 +670,7 @@ tracker_miner_manager_resume (TrackerMinerManager *manager,
g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), FALSE);
g_return_val_if_fail (miner != NULL, FALSE);
- proxy = find_miner_proxy (manager, miner);
+ proxy = find_miner_proxy (manager, miner, TRUE);
if (!proxy) {
g_critical ("No D-Bus proxy found for miner '%s'", miner);
@@ -742,7 +749,7 @@ tracker_miner_manager_get_status (TrackerMinerManager *manager,
g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), FALSE);
g_return_val_if_fail (miner != NULL, FALSE);
- proxy = find_miner_proxy (manager, miner);
+ proxy = find_miner_proxy (manager, miner, TRUE);
if (!proxy) {
g_critical ("No D-Bus proxy found for miner '%s'", miner);
@@ -825,7 +832,7 @@ tracker_miner_manager_is_paused (TrackerMinerManager *manager,
g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), TRUE);
g_return_val_if_fail (miner != NULL, TRUE);
- proxy = find_miner_proxy (manager, miner);
+ proxy = find_miner_proxy (manager, miner, TRUE);
if (!proxy) {
g_critical ("No D-Bus proxy found for miner '%s'", miner);
@@ -946,7 +953,7 @@ tracker_miner_manager_writeback (TrackerMinerManager *manager,
g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), FALSE);
g_return_val_if_fail (miner != NULL, FALSE);
- proxy = find_miner_proxy (manager, miner);
+ proxy = find_miner_proxy (manager, miner, TRUE);
if (!proxy) {
g_warning ("No D-Bus proxy found for miner '%s'", miner);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]