[gnome-calculator/gnome-3-14: 19/19] Drop fixes.vapi



commit 19a6488e761fb9f9f56d37e7b23ef385ac142ef7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Oct 24 09:50:17 2014 -0500

    Drop fixes.vapi
    
    The bindings in vala 0.24 (which we already depend on) now work fine.

 src/Makefile.am           |    5 -----
 src/fixes.vapi            |    9 ---------
 src/gcalccmd.vala         |    4 ++--
 src/gnome-calculator.vala |    4 ++--
 src/serializer.vala       |    4 ++--
 5 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index b2d06d0..28ff7c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,6 @@ resources.c: $(top_srcdir)/data/gnome-calculator.gresource.xml $(shell $(GLIB_CO
 
 gnome_calculator_SOURCES = \
        config.vapi \
-       fixes.vapi \
        gnome-calculator.vala \
        currency.vala \
        equation.vala \
@@ -54,7 +53,6 @@ gnome_calculator_LDADD = \
 
 gcalccmd_SOURCES = \
        config.vapi \
-       fixes.vapi \
        gcalccmd.vala \
        currency.vala \
        equation.vala \
@@ -78,7 +76,6 @@ gcalccmd_LDADD = \
 
 test_number_SOURCES = \
        config.vapi \
-       fixes.vapi \
        test-number.vala \
        number.vala \
        serializer.vala
@@ -95,7 +92,6 @@ test_number_LDADD = \
 
 test_equation_SOURCES = \
        config.vapi \
-       fixes.vapi \
        test-equation.vala \
        currency.vala \
        equation.vala \
@@ -119,7 +115,6 @@ test_equation_LDADD = \
 
 test_serializer_SOURCES = \
        config.vapi \
-       fixes.vapi \
        test-serializer.vala \
        number.vala \
        serializer.vala
diff --git a/src/gcalccmd.vala b/src/gcalccmd.vala
index 10f29c8..88bf3f6 100644
--- a/src/gcalccmd.vala
+++ b/src/gcalccmd.vala
@@ -15,11 +15,11 @@ private static Serializer result_serializer;
 
 static void solve (string equation)
 {
-    var tsep_string = nl_langinfo (NLItem.THOUSEP);
+    var tsep_string = Posix.nl_langinfo (Posix.NLItem.THOUSEP);
     if (tsep_string == null || tsep_string == "")
         tsep_string = " ";
 
-    var decimal = nl_langinfo (NLItem.RADIXCHAR);
+    var decimal = Posix.nl_langinfo (Posix.NLItem.RADIXCHAR);
     if (decimal == null)
         decimal = "";
 
diff --git a/src/gnome-calculator.vala b/src/gnome-calculator.vala
index 4b9ca88..694d384 100644
--- a/src/gnome-calculator.vala
+++ b/src/gnome-calculator.vala
@@ -146,11 +146,11 @@ public class Calculator : Gtk.Application
         if (options.contains ("solve"))
         {
             var solve_equation = (string) options.lookup_value ("solve", VariantType.STRING);
-            var tsep_string = nl_langinfo (NLItem.THOUSEP);
+            var tsep_string = Posix.nl_langinfo (Posix.NLItem.THOUSEP);
             if (tsep_string == null || tsep_string == "")
                 tsep_string = " ";
 
-            var decimal = nl_langinfo (NLItem.RADIXCHAR);
+            var decimal = Posix.nl_langinfo (Posix.NLItem.RADIXCHAR);
             if (decimal == null)
                 decimal = "";
 
diff --git a/src/serializer.vala b/src/serializer.vala
index dbbefc8..3568b33 100644
--- a/src/serializer.vala
+++ b/src/serializer.vala
@@ -34,12 +34,12 @@ public class Serializer : Object
 
     public Serializer (DisplayFormat format, int number_base, int trailing_digits)
     {
-        var radix_string = nl_langinfo (NLItem.RADIXCHAR);
+        var radix_string = Posix.nl_langinfo (Posix.NLItem.RADIXCHAR);
         if (radix_string != null && radix_string != "")
             radix = radix_string.locale_to_utf8 (-1, null, null).get_char (0);
         else
             radix = '.';
-        var tsep_string = nl_langinfo (NLItem.THOUSEP);
+        var tsep_string = Posix.nl_langinfo (Posix.NLItem.THOUSEP);
         if (tsep_string != null && tsep_string != "")
             tsep = tsep_string.locale_to_utf8 (-1, null, null).get_char (0);
         else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]