? buildit.ksh
? env.sh
? omf.make
? xmldocs.make
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gcalctool/ChangeLog,v
retrieving revision 1.169
diff -u -r1.169 ChangeLog
--- ChangeLog	16 Sep 2003 15:19:22 -0000	1.169
+++ ChangeLog	16 Sep 2003 16:30:11 -0000
@@ -9,6 +9,13 @@
 
 2003-09-16  Rich Burridge <rich.burridge@sun.com>
 
+    * Fixed bug 122373 (http://bugzilla.gnome.org/show_bug.cgi?id=122373)
+      The decimal separator is now a translatable string so that other
+      locales that don't use a period (Italian uses a comma for example),
+      can adjust accordingly.
+
+2003-09-16  Rich Burridge <rich.burridge@sun.com>
+
     * Fixed bug 120605 (http://bugzilla.gnome.org/show_bug.cgi?id=120605)
       Gcalctool contains lots of messages that are (potentially) only 
       displayed if the user starts the application with either the -D or 
Index: NEWS
===================================================================
RCS file: /cvs/gnome/gcalctool/NEWS,v
retrieving revision 1.82
diff -u -r1.82 NEWS
--- NEWS	16 Sep 2003 15:19:22 -0000	1.82
+++ NEWS	16 Sep 2003 16:30:11 -0000
@@ -5,6 +5,13 @@
  *  All Rights Reserved.
  */
 
+Overview of changes in gcalctool 4.3.5
+
+* Fixed bug 122373. The decimal separator is now a translatable string so 
+  that other locales that don't use a period can adjust accordingly.
+
+----
+
 Overview of changes in gcalctool 4.3.4
 
 * Fixed bug 120605. Gcalctool debug messages are no longer translatable 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gcalctool/configure.in,v
retrieving revision 1.169
diff -u -r1.169 configure.in
--- configure.in	16 Sep 2003 15:19:22 -0000	1.169
+++ configure.in	16 Sep 2003 16:30:11 -0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gcalctool, 4.3.4)
+AM_INIT_AUTOMAKE(gcalctool, 4.3.5)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
Index: gcalctool/calctool.h
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/calctool.h,v
retrieving revision 1.38
diff -u -r1.38 calctool.h
--- gcalctool/calctool.h	25 Jul 2003 21:33:32 -0000	1.38
+++ gcalctool/calctool.h	16 Sep 2003 16:30:11 -0000
@@ -91,6 +91,7 @@
 #define KEY_FRAC  b_buttons[22]             /* : */
 #define KEY_RCL   b_buttons[23]             /* R */
 
+#define KEY_SEP   b_buttons[25]             /* . */
 #define KEY_EQ    b_buttons[26]             /* = */
 #define KEY_ADD   b_buttons[27]             /* + */
 #define KEY_REC   b_buttons[28]             /* r */
Index: gcalctool/display.c
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/display.c,v
retrieving revision 1.26
diff -u -r1.26 display.c
--- gcalctool/display.c	25 Jul 2003 21:33:32 -0000	1.26
+++ gcalctool/display.c	16 Sep 2003 16:30:11 -0000
@@ -111,7 +111,7 @@
     char *optr;
     int MP1base[MP_SIZE], MP1[MP_SIZE], MP2[MP_SIZE], MPval[MP_SIZE];
     int ndig;                   /* Total number of digits to generate. */
-    int ddig;                   /* Number of digits to left of . */
+    int ddig;                   /* Number of digits to left of decimal sep. */
     int dval, n;
  
     optr = v->fnum;
@@ -145,7 +145,7 @@
 
     while (ndig-- > 0) {
         if (ddig-- == 0) {
-            *optr++ = '.';
+            *optr++ = KEY_SEP.str[0];
         }
         mpmul(MPval, MP1base, MPval);
         mpcmi(MPval, &dval);
@@ -167,7 +167,7 @@
         while (*optr == '0') {
             optr--;
         }
-        if (*optr != '.') {
+        if (*optr != KEY_SEP.str[0]) {
             optr++;
         }
         *optr = '\0';
@@ -340,7 +340,7 @@
         optr++;
     }
 
-    if (*optr == '.') {
+    if (*optr == KEY_SEP.str[0]) {
         for (i = 1; (inum = char_val(*++optr)) >= 0; i++) {
             mppwr(MPbase, &i, MP1);
             mpcim(&inum, MP2);
Index: gcalctool/functions.c
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/functions.c,v
retrieving revision 1.25
diff -u -r1.25 functions.c
--- gcalctool/functions.c	8 Jul 2003 15:17:08 -0000	1.25
+++ gcalctool/functions.c	16 Sep 2003 16:30:11 -0000
@@ -401,7 +401,7 @@
 
 /* If we've backspaced over the numeric point, clear the pointed flag. */
 
-    if (v->pointed && !(strchr(v->display, '.'))) {
+    if (v->pointed && !(strchr(v->display, KEY_SEP.str[0]))) {
         v->pointed = 0;
     }
 
@@ -425,12 +425,13 @@
 void
 do_expno()           /* Get exponential number. */
 {
-    v->pointed = (strchr(v->display, '.') != NULL);
+    v->pointed = (strchr(v->display, KEY_SEP.str[0]) != NULL);
     if (!v->new_input) {
         STRCPY(v->display, "1.0 +");
         v->new_input = v->pointed = 1;
     } else if (!v->pointed) {
-        STRNCAT(v->display, ". +", 3);
+        STRNCAT(v->display, KEY_SEP.str, 1);
+        STRNCAT(v->display, " +", 2);
         v->pointed = 1;
     } else if (!v->key_exp) {
         STRNCAT(v->display, " +", 2);
@@ -773,10 +774,10 @@
 {
     if (!v->pointed) {
         if (v->toclear) {
-            STRCPY(v->display, ".");
+            STRCPY(v->display, KEY_SEP.str);
             v->toclear = 0;
         } else {
-            STRNCAT(v->display, ".", 1);
+            STRNCAT(v->display, KEY_SEP.str, 1);
         }
         v->pointed = 1;
     }
