[bijiben] noteObj - timeout : Fix crash when note is cancelled

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

commit 2ff9a44c48c2abb420250360332128578fc93204
Author: Pierre-Yves Luyten <py luyten fr>
Date:   Sun Mar 17 00:52:37 2013 +0100

    noteObj - timeout : Fix crash when note is cancelled
    
    When application leaves, timeout should not try to save
    a note that has been cancelled

 src/libbiji/biji-note-obj.c |   16 +++++++++-------
 src/libbiji/biji-timeout.c  |    3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/src/libbiji/biji-note-obj.c b/src/libbiji/biji-note-obj.c
index b8491e3..8da0b2b 100644
--- a/src/libbiji/biji-note-obj.c
+++ b/src/libbiji/biji-note-obj.c
@@ -62,6 +62,7 @@ struct _BijiNoteObjPrivate
 
   /* Signals */
   gulong note_renamed;
+  gulong save;
 };
 
 /* Properties
@@ -108,7 +109,7 @@ biji_note_obj_init (BijiNoteObj *self)
 
   priv->needs_save = FALSE;
   priv->timeout = biji_timeout_new ();
-  g_signal_connect_swapped (priv->timeout, "timeout",
+  priv->save = g_signal_connect_swapped (priv->timeout, "timeout",
                             G_CALLBACK (on_save_timeout), self);
 
   priv->book = NULL ;
@@ -138,7 +139,8 @@ biji_note_obj_finalize (GObject *object)
   BijiNoteObj        *self = BIJI_NOTE_OBJ(object);
   BijiNoteObjPrivate *priv = self->priv;
 
-  g_object_unref (priv->timeout);
+  if (priv->timeout)
+    g_object_unref (priv->timeout);
 
   if (priv->needs_save)
     on_save_timeout (self);
@@ -325,12 +327,15 @@ biji_note_obj_are_same (BijiNoteObj *a, BijiNoteObj* b)
 gboolean
 biji_note_obj_trash (BijiNoteObj *note_to_kill)
 {
+  BijiNoteObjPrivate *priv = note_to_kill->priv;
   GFile *to_trash, *parent, *trash, *backup_file, *icon;
   gchar *note_name, *parent_path, *trash_path, *backup_path, *icon_path;
   GError *error = NULL;
   gboolean result = FALSE;
 
-  biji_timeout_cancel (note_to_kill->priv->timeout);
+  priv->needs_save = FALSE;
+  biji_timeout_cancel (priv->timeout);
+
   to_trash = biji_note_id_get_file (note_to_kill->priv->id);
 
   /* Don't try to backup a file which does not exist */
@@ -651,8 +656,6 @@ note_obj_set_is_template (BijiNoteObj *n,gboolean is_template)
   n->priv->is_template = is_template ;
 }
 
-/* TODO : see if note beeing deleted. set metadata date
- * and last_change date according to a WHAT param */
 void
 biji_note_obj_save_note (BijiNoteObj *self)
 {
@@ -844,8 +847,6 @@ void
 biji_note_obj_set_html_content (BijiNoteObj *note,
                                 gchar *html)
 {
-  // TODO : queue_save with timeout struct
-
   if (html)
   {
     g_free (note->priv->html);
@@ -895,6 +896,7 @@ GtkWidget *
 biji_note_obj_open (BijiNoteObj *note)
 {
   note->priv->editor = biji_webkit_editor_new (note);
+  note->priv->editor = biji_webkit_editor_new (note);
 
   g_signal_connect_swapped (note->priv->editor, "destroy",
                             G_CALLBACK (_biji_note_obj_close), note);
diff --git a/src/libbiji/biji-timeout.c b/src/libbiji/biji-timeout.c
index bd3a3d4..1c59337 100644
--- a/src/libbiji/biji-timeout.c
+++ b/src/libbiji/biji-timeout.c
@@ -59,6 +59,9 @@ biji_timeout_finalize (GObject *object)
 
   biji_timeout_cancel (self);
 
+  if (self->priv->quit !=0)
+    g_signal_handler_disconnect (g_application_get_default(), self->priv->quit);
+
   G_OBJECT_CLASS (biji_timeout_parent_class)->finalize (object);
 }