Merge lp:~embik/pantheon-calculator/gtk314-fix into lp:~elementary-apps/pantheon-calculator/trunk

[Marvin Beckers]

fixed HistoryDialog after GTK+ 3.14 update

fixed HistoryDialog after GTK+ 3.14 update

=== modified file 'src/HistoryDialog.vala'
--- src/HistoryDialog.vala	2015-01-14 19:50:02 +0000
+++ src/HistoryDialog.vala	2015-01-16 17:12:34 +0000
@@ -52,9 +52,9 @@
             main_grid = new Gtk.Grid ();
             main_grid.expand = true;
             main_grid.margin = 12;
+            main_grid.margin_top = 0;
             main_grid.row_spacing = 10;
             main_grid.column_spacing = 20;
-            main_grid.halign = Gtk.Align.END;
             content.add (main_grid);
 
             if (history.length () > 0) {
@@ -90,9 +90,11 @@
             main_grid.attach (add_label, 0, 1, 1, 1);
 
             result_radio = new Gtk.RadioButton.with_label (null, _("Result"));
+            result_radio.halign = Gtk.Align.END;
             main_grid.attach (result_radio, 2, 1, 1, 1);
 
             expression_radio = new Gtk.RadioButton.with_label_from_widget (result_radio, _("Expression"));
+            expression_radio.halign = Gtk.Align.END;
             main_grid.attach (expression_radio, 1, 1, 1, 1);
         }