Merge lp:~mefrio-g/pantheon-calculator/close-button-fix into lp:~elementary-apps/pantheon-calculator/legacy-trunk

[Mario Guerriero]

[David Gomes (davidgomes)]

It does fix the bug, good code style too.

review: Approve

=== modified file 'Calculator/Widgets/CalculatorWindow.vala'
--- Calculator/Widgets/CalculatorWindow.vala	2011-07-06 03:20:57 +0000
+++ Calculator/Widgets/CalculatorWindow.vala	2013-03-03 19:28:20 +0000
@@ -67,10 +67,15 @@
 			
 			add (Utilities.set_paddings (vbox, 7, 18, 7, 18));
 			
+			close_button.clicked.connect (on_close_clicked);
 			drag_panel.button_press_event.connect (on_drag_panel_button_press);
 			draw.connect (on_draw);
 		}
 		
+		private void on_close_clicked () {
+		    destroy ();
+		}
+		
 		private bool on_drag_panel_button_press (EventButton event) {
 			
 			if (event.button == 1)

=== modified file 'Calculator/Widgets/CloseButton.vala'
--- Calculator/Widgets/CloseButton.vala	2011-06-20 02:32:54 +0000
+++ Calculator/Widgets/CloseButton.vala	2013-03-03 19:28:20 +0000
@@ -25,6 +25,8 @@
 
 	public class CloseButton : Gtk.EventBox {
 		
+		public signal void clicked ();
+		
 		public CloseButton () {
 			
 			// EventBox properties
@@ -45,7 +47,7 @@
 		}
 		
 		protected override bool button_release_event (EventButton event) {
-			Gtk.main_quit ();
+			clicked ();
 			return true;
 		}