From dbc143a61e4c4528cc4b20fae127b3a697e5740f Mon Sep 17 00:00:00 2001
From: Manish Singh <yosh@src.gnome.org>
Date: Mon, 27 Sep 1999 22:12:44 +0000
Subject: [PATCH] revert that last set_locale change, it was bogus

* app/main.c: revert that last set_locale change, it was bogus

* app/gdisplay.c: don't update menu sensitivities when flushing
immediately, so that painting isn't slowed by it

-Yosh
---
 ChangeLog                 | 7 +++++++
 app/core/gimpprojection.c | 4 +++-
 app/display/gimpdisplay.c | 4 +++-
 app/gdisplay.c            | 4 +++-
 app/main.c                | 7 +++++--
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30c1c20631..128e013bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 27 15:07:03 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* app/main.c: revert that last set_locale change, it was bogus
+
+	* app/gdisplay.c: don't update menu sensitivities when flushing
+	immediately, so that painting isn't slowed by it
+
 1999-09-27  Michael Natterer  <mitch@gimp.org>
 
 	* app/Makefile.am
diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c
index 7fee0d16ec..beca1a267d 100644
--- a/app/core/gimpprojection.c
+++ b/app/core/gimpprojection.c
@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
   qmask_buttons_update (gdisp);
 
   /*  ensure the consistency of the tear-off menus  */
-  if (gimp_context_get_display (gimp_context_get_user ()) == gdisp)
+  if (!now && gimp_context_get_display (gimp_context_get_user ()) == gdisp)
     gdisplay_set_menu_sensitivity (gdisp);
 }
 
@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
   gint lind = -1;
   gint lnum = -1;
 
+  g_print ("boo\n");
+
   if (gdisp)
     {
       fs = (gimage_floating_sel (gdisp->gimage) != NULL);
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 7fee0d16ec..beca1a267d 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
   qmask_buttons_update (gdisp);
 
   /*  ensure the consistency of the tear-off menus  */
-  if (gimp_context_get_display (gimp_context_get_user ()) == gdisp)
+  if (!now && gimp_context_get_display (gimp_context_get_user ()) == gdisp)
     gdisplay_set_menu_sensitivity (gdisp);
 }
 
@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
   gint lind = -1;
   gint lnum = -1;
 
+  g_print ("boo\n");
+
   if (gdisp)
     {
       fs = (gimage_floating_sel (gdisp->gimage) != NULL);
diff --git a/app/gdisplay.c b/app/gdisplay.c
index 7fee0d16ec..beca1a267d 100644
--- a/app/gdisplay.c
+++ b/app/gdisplay.c
@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
   qmask_buttons_update (gdisp);
 
   /*  ensure the consistency of the tear-off menus  */
-  if (gimp_context_get_display (gimp_context_get_user ()) == gdisp)
+  if (!now && gimp_context_get_display (gimp_context_get_user ()) == gdisp)
     gdisplay_set_menu_sensitivity (gdisp);
 }
 
@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
   gint lind = -1;
   gint lnum = -1;
 
+  g_print ("boo\n");
+
   if (gdisp)
     {
       fs = (gimage_floating_sel (gdisp->gimage) != NULL);
diff --git a/app/main.c b/app/main.c
index eaea981893..c927713364 100644
--- a/app/main.c
+++ b/app/main.c
@@ -118,10 +118,13 @@ main (int argc, char **argv)
   /* Initialize variables */
   prog_name = argv[0];
 
+  /* Initialize i18n support */
+
+  INIT_LOCALE("gimp");
+
   gtk_init (&argc, &argv);
 
-  /* Initialize i18n support */
-  INIT_LOCALE("gimp");
+  setlocale(LC_NUMERIC, "C");  /* gtk seems to zap this during init.. */
 
 #ifdef HAVE_PUTENV
   display_name = gdk_get_display ();