Merge lp:~embik/pantheon-calculator/two-and-a-half-bugfixes into lp:~elementary-apps/pantheon-calculator/trunk

[Marvin Beckers]

fixed bug #1415049 and bug #1415054

Fixes two very minor bugs:

* bug #1415049 (clicked around, got result -0)
* bug #1415054 (e Button has no function)

[Cody Garver (codygarver)]

Needs to be resubmitted, conflicts with trunk.

review: Needs Resubmitting

Unmerged revisions

98. By Marvin Beckers on 2015-02-09

now displaying '0' and not '-0'

97. By Marvin Beckers on 2015-02-08

added 'e' back to list of buttons

=== modified file 'src/Core/Evaluation.vala'
--- src/Core/Evaluation.vala	2015-01-20 22:04:24 +0000
+++ src/Core/Evaluation.vala	2015-02-09 18:24:33 +0000
@@ -85,7 +85,12 @@
                         d = e.eval_postfix (tokenlist);
                     } catch (Error e) { throw new OUT_ERROR.EVAL_ERROR (e.message); }
                 } catch (Error e) { throw new OUT_ERROR.SHUNTING_ERROR (e.message); }
-                return e.cut (d, d_places);
+
+                string cut = e.cut (d, d_places);
+                if (cut == "-0")
+                    cut = "0";
+
+                return cut;
             } catch (Error e) { throw new OUT_ERROR.SCANNER_ERROR (e.message); }
         }
 

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2015-01-24 15:37:13 +0000
+++ src/MainWindow.vala	2015-02-09 18:24:33 +0000
@@ -54,7 +54,7 @@
         private string[] regular_buttons = {   "0", "1", "2", "3", "4", "5", 
                                                 "6", "7", "8", "9", "0", " + ",
                                                 " − ", " × ", " ÷ ", "%", ".", "(", 
-                                                ")", "^", "π"};
+                                                ")", "^", "π", "e"};
 
         private string[] function_buttons = {  "sin", "cos", "tan", "√", "sinh", "cosh",
                                                 "tanh" , "sqrt"};