Merge lp:~xdungnguyen/footnote/fix-983699 into lp:footnote

[Nguyễn Xuân Dũng]

[Tom Beckmann (tombeckmann)]

Cool variable name ;)

review: Approve

[Nguyễn Xuân Dũng (xdungnguyen)]

Hi Tom,

I'm really happy with our first contribution to eOS project. Thanks.
See you in my next patches.

2012/4/20 Tom Beckmann <email address hidden>

> The proposal to merge lp:~xdungnguyen/footnote/fix-983699 into lp:footnote
> has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~xdungnguyen/footnote/fix-983699/+merge/102718<https://code.launchpad.net/%7Exdungnguyen/footnote/fix-983699/+merge/102718>
> --
> https://code.launchpad.net/~xdungnguyen/footnote/fix-983699/+merge/102718<https://code.launchpad.net/%7Exdungnguyen/footnote/fix-983699/+merge/102718>
> You are the owner of lp:~xdungnguyen/footnote/fix-983699.
>

=== modified file 'src/Widgets/EditView.vala'
--- src/Widgets/EditView.vala	2012-04-07 01:42:18 +0000
+++ src/Widgets/EditView.vala	2012-04-19 16:07:34 +0000
@@ -98,6 +98,8 @@
                 this.close ();
             });
             cancel.clicked.connect ( () => {
+            	if (current_note.is_brand_new == true)
+            		action_delete_note ();
                 this.close ();
             });
             title.buffer.changed.connect ( () => {

=== modified file 'src/Widgets/Note.vala'
--- src/Widgets/Note.vala	2012-04-14 00:48:01 +0000
+++ src/Widgets/Note.vala	2012-04-19 16:07:34 +0000
@@ -34,6 +34,8 @@
         public int          month;
         public int          year;
         
+        public bool is_brand_new;
+        
         public Gtk.TreeIter bookmarked_iter; //may be null
         
         Gdk.Atom format;
@@ -117,6 +119,8 @@
             this.bookmarked.valign = Gtk.Align.CENTER;
             this.bookmarked.add (new Gtk.Image.from_icon_name ("bookmark-new", Gtk.IconSize.BUTTON));
             
+            this.is_brand_new = true;
+            
             buttons.hexpand = true;
             buttons.pack_start (export,   false);
             buttons.pack_start (new Gtk.Label (""));
@@ -293,6 +297,8 @@
                 q.set_int (":bookmarked", (int)this.bookmarked.active);
                 q.set_int (":id", this.id);
                 q.execute ();
+                if (this.is_brand_new == true)
+                	this.is_brand_new = false;
             } catch (SQLHeavy.Error e) { warning ("Problem saving note, %s", e.message); }
             if (this.bookmarked.active)
                 app.sidebar.setName (app.sidebar.convertToFilter (this.bookmarked_iter), this.title.label);