[bijiben] Deleted signal: rename to trashed

[Pierre-Yves Luyten <pyluyten src gnome org>]

commit 5f98872fc859e1187c702fcc4d4d8f00105c7ca4
Author: Pierre-Yves Luyten <py luyten fr>
Date:   Sun Dec 1 09:43:03 2013 +0100

    Deleted signal: rename to trashed

 src/bjb-note-view.c         |   14 +++++++-------
 src/libbiji/biji-note-obj.c |    8 ++++----
 src/libbiji/biji-notebook.c |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/bjb-note-view.c b/src/bjb-note-view.c
index e70f24e..954f6af 100644
--- a/src/bjb-note-view.c
+++ b/src/bjb-note-view.c
@@ -62,7 +62,7 @@ struct _BjbNoteViewPrivate {
 
   /* Signals */
   gulong    destroy ;
-  gulong    deleted ;
+  gulong    trashed ;
   gulong    color;
 };
 
@@ -72,14 +72,14 @@ bjb_note_view_disconnect (BjbNoteViewPrivate *priv)
   if (priv->destroy != 0)
     g_signal_handler_disconnect (priv->window, priv->destroy);
 
-  if (priv->deleted != 0)
-    g_signal_handler_disconnect (priv->note, priv->deleted);
+  if (priv->trashed != 0)
+    g_signal_handler_disconnect (priv->note, priv->trashed);
 
   if (priv->color != 0)
     g_signal_handler_disconnect (priv->note, priv->color);
 
   priv->destroy = 0,
-  priv->deleted = 0;
+  priv->trashed = 0;
   priv->color =0;
 }
 
@@ -181,7 +181,7 @@ just_switch_to_main_view(BjbNoteView *self)
 }
 
 static gboolean
-on_note_deleted(BijiNoteObj *note, BjbNoteView *view)
+on_note_trashed (BijiNoteObj *note, BjbNoteView *view)
 {
   just_switch_to_main_view (view);
   return TRUE;
@@ -268,8 +268,8 @@ bjb_note_view_constructed (GObject *obj)
   priv->view = biji_note_obj_open (priv->note);
 
 
-  priv->deleted = g_signal_connect(priv->note,"deleted",
-                                   G_CALLBACK(on_note_deleted),self);
+  priv->trashed = g_signal_connect(priv->note,"deleted",
+                                   G_CALLBACK(on_note_trashed),self);
 
   priv->destroy = g_signal_connect(priv->window,"destroy",
                                    G_CALLBACK(on_window_closed),
diff --git a/src/libbiji/biji-note-obj.c b/src/libbiji/biji-note-obj.c
index 44ed9b2..051a32e 100644
--- a/src/libbiji/biji-note-obj.c
+++ b/src/libbiji/biji-note-obj.c
@@ -168,7 +168,7 @@ biji_note_obj_finalize (GObject *object)
 // Signals to be used by biji note obj
 enum {
   NOTE_RENAMED,
-  NOTE_DELETED,
+  NOTE_TRASHED,
   NOTE_CHANGED,
   NOTE_COLOR_CHANGED,
   BIJI_OBJ_SIGNALS
@@ -259,7 +259,7 @@ biji_note_obj_trash (BijiItem *item)
   icon = g_file_new_for_path (icon_path);
   g_file_delete (icon, NULL, NULL);
 
-  g_signal_emit (G_OBJECT (note_to_kill), biji_obj_signals[NOTE_DELETED], 0);
+  g_signal_emit (G_OBJECT (note_to_kill), biji_obj_signals[NOTE_TRASHED], 0);
 
   if (icon_path != NULL)
     g_free (icon_path);
@@ -989,8 +989,8 @@ biji_note_obj_class_init (BijiNoteObjClass *klass)
                   G_TYPE_NONE,
                   0);
 
-  biji_obj_signals[NOTE_DELETED] =
-    g_signal_new ("deleted" ,
+  biji_obj_signals[NOTE_TRASHED] =
+    g_signal_new ("trashed" ,
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST,
                   0,
diff --git a/src/libbiji/biji-notebook.c b/src/libbiji/biji-notebook.c
index 247bc31..6cf2b32 100644
--- a/src/libbiji/biji-notebook.c
+++ b/src/libbiji/biji-notebook.c
@@ -400,7 +400,7 @@ biji_notebook_update_collected (GList *result,
     g_signal_connect_swapped (l->data, "color-changed",
                               G_CALLBACK (on_collected_item_change), self);
 
-    g_signal_connect_swapped (l->data, "deleted",
+    g_signal_connect_swapped (l->data, "trashed",
                               G_CALLBACK (on_collected_item_change), self);
   }