[bijiben] restore-delete : do not remove from tracker until note is deleted
- From: Pierre-Yves Luyten <pyluyten src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [bijiben] restore-delete : do not remove from tracker until note is deleted
- Date: Sun, 16 Mar 2014 23:05:32 +0000 (UTC)
commit 0f07743a16ce5456246b131439f4f2759756de50
Author: Pierre-Yves Luyten <py luyten fr>
Date: Sun Mar 16 22:42:36 2014 +0100
restore-delete : do not remove from tracker until note is deleted
trashed notes are still indexed.
src/libbiji/biji-local-note.c | 1 +
src/libbiji/biji-note-obj.c | 2 +-
src/libbiji/provider/biji-own-cloud-note.c | 7 ++++---
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/libbiji/biji-local-note.c b/src/libbiji/biji-local-note.c
index 3de3ec2..3274a51 100644
--- a/src/libbiji/biji-local-note.c
+++ b/src/libbiji/biji-local-note.c
@@ -285,6 +285,7 @@ local_note_delete (BijiItem *item)
if (self->priv->trashed == TRUE)
{
+ biji_note_delete_from_tracker (BIJI_NOTE_OBJ (self));
g_file_delete_async (self->priv->location,
G_PRIORITY_LOW,
NULL, /* Cancellable */
diff --git a/src/libbiji/biji-note-obj.c b/src/libbiji/biji-note-obj.c
index d3b3c9a..f23e5ca 100644
--- a/src/libbiji/biji-note-obj.c
+++ b/src/libbiji/biji-note-obj.c
@@ -231,6 +231,7 @@ biji_note_obj_are_same (BijiNoteObj *a, BijiNoteObj* b)
return biji_note_id_equal (a->priv->id, b->priv->id);
}
+
/* First cancel timeout
* this func is most probably stupid it might exists (move file) */
gboolean
@@ -252,7 +253,6 @@ biji_note_obj_trash (BijiItem *item)
priv->needs_save = FALSE;
biji_timeout_cancel (priv->timeout);
- biji_note_delete_from_tracker (note_to_kill);
result = BIJI_NOTE_OBJ_GET_CLASS (note_to_kill)->archive (note_to_kill);
diff --git a/src/libbiji/provider/biji-own-cloud-note.c b/src/libbiji/provider/biji-own-cloud-note.c
index 0308401..5cd5ff8 100644
--- a/src/libbiji/provider/biji-own-cloud-note.c
+++ b/src/libbiji/provider/biji-own-cloud-note.c
@@ -328,10 +328,11 @@ note_no (BijiNoteObj *item)
static gboolean
ocloud_note_delete (BijiNoteObj *note)
{
- BijiOwnCloudNote *ocl;
+ BijiOwnCloudNote *self;
- ocl = BIJI_OWN_CLOUD_NOTE (note);
- return g_file_delete (ocl->priv->location, NULL, NULL);
+ self = BIJI_OWN_CLOUD_NOTE (note);
+ biji_note_delete_from_tracker (BIJI_NOTE_OBJ (self));
+ return g_file_delete (self->priv->location, NULL, NULL);
}
static gchar *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]