Merge lp:~bkerensa/ubuntu/raring/gnome-calculator/fix-for-1155590 into lp:ubuntu/raring/gnome-calculator

[Benjamin Kerensa]

Fix duplicate subtraction symbols upon single input

[Jeremy Bícha (jbicha)]

Why aren't you using the full commit from GNOME?

https://git.gnome.org/browse/gnome-calculator/commit/?id=a692c1100

[Benjamin Kerensa (bkerensa)]

Ahh epic fail... Let me fix this up... Good thing we have peer review eh? (early morning for me)

[lp:~bkerensa/ubuntu/raring/gnome-calculator/fix-for-1155590]

6. By Benjamin Kerensa on 2013-04-05

Add other upstream changes for complete fix

[Benjamin Kerensa (bkerensa)]

This is now fixed

[Jeremy Bícha (jbicha)]

Could you re-do this using debian/patches/ ?

review: Needs Fixing

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-27 09:59:36 +0000
+++ debian/changelog	2013-04-05 17:40:23 +0000
@@ -1,3 +1,10 @@
+gnome-calculator (1:3.8.0-0ubuntu2) raring; urgency=low
+
+    [PioneerAxon]
+  * Fix Subtract button inserts additional minus (LP #: 1155590)
+
+ -- Benjamin Kerensa <[e-mail]>  Fri, 05 Apr 2013 09:48:21 -0700
+
 gnome-calculator (1:3.8.0-0ubuntu1) raring; urgency=low
 
   * New upstream version
 
=== modified file 'src/math-buttons.vala'
--- src/math-buttons.vala	2013-02-19 11:14:23 +0000
+++ src/math-buttons.vala	2013-04-05 17:40:23 +0000
@@ -309,7 +309,7 @@
         /* Tooltip for the add button */
         setup_button (builder, "add",                "+", _("Add [+]"));
         /* Tooltip for the subtract button */
-        setup_button (builder, "subtract",           "−", _("Subtract [-]"));
+        setup_button (builder, "subtract",           "−", _("Subtract [-]"), false);
         /* Tooltip for the multiply button */
         setup_button (builder, "multiply",           "×", _("Multiply [*]"));
         /* Tooltip for the divide button */
@@ -616,7 +616,7 @@
         return panel;
     }
 
-    private void setup_button (Gtk.Builder builder, string name, string? data, string? tooltip)
+    private void setup_button (Gtk.Builder builder, string name, string? data, string? tooltip, bool connect = true)
     {
         var widget_name = "calc_%s_button".printf (name);
         var button = builder.get_object (widget_name) as Gtk.Button;
@@ -626,7 +626,10 @@
         if (data != null)
         {
             button.set_data<string> ("calc_text", data);
-            button.clicked.connect ((widget) =>  { equation.insert (widget.get_data<string> ("calc_text")); });
+            if (connect)
+            {
+                button.clicked.connect ((widget) => { equation.insert (widget.get_data<string> ("calc_text")); });
+            }
         }
 
         if (tooltip != null)