Commit dbc143a6 authored by Manish Singh's avatar Manish Singh

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
parent 002aa905
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> 1999-09-27 Michael Natterer <mitch@gimp.org>
* app/Makefile.am * app/Makefile.am
......
...@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now) ...@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
qmask_buttons_update (gdisp); qmask_buttons_update (gdisp);
/* ensure the consistency of the tear-off menus */ /* 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); gdisplay_set_menu_sensitivity (gdisp);
} }
...@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) ...@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
gint lind = -1; gint lind = -1;
gint lnum = -1; gint lnum = -1;
g_print ("boo\n");
if (gdisp) if (gdisp)
{ {
fs = (gimage_floating_sel (gdisp->gimage) != NULL); fs = (gimage_floating_sel (gdisp->gimage) != NULL);
......
...@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now) ...@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
qmask_buttons_update (gdisp); qmask_buttons_update (gdisp);
/* ensure the consistency of the tear-off menus */ /* 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); gdisplay_set_menu_sensitivity (gdisp);
} }
...@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) ...@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
gint lind = -1; gint lind = -1;
gint lnum = -1; gint lnum = -1;
g_print ("boo\n");
if (gdisp) if (gdisp)
{ {
fs = (gimage_floating_sel (gdisp->gimage) != NULL); fs = (gimage_floating_sel (gdisp->gimage) != NULL);
......
...@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now) ...@@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
qmask_buttons_update (gdisp); qmask_buttons_update (gdisp);
/* ensure the consistency of the tear-off menus */ /* 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); gdisplay_set_menu_sensitivity (gdisp);
} }
...@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) ...@@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
gint lind = -1; gint lind = -1;
gint lnum = -1; gint lnum = -1;
g_print ("boo\n");
if (gdisp) if (gdisp)
{ {
fs = (gimage_floating_sel (gdisp->gimage) != NULL); fs = (gimage_floating_sel (gdisp->gimage) != NULL);
......
...@@ -118,11 +118,14 @@ main (int argc, char **argv) ...@@ -118,11 +118,14 @@ main (int argc, char **argv)
/* Initialize variables */ /* Initialize variables */
prog_name = argv[0]; prog_name = argv[0];
gtk_init (&argc, &argv);
/* Initialize i18n support */ /* Initialize i18n support */
INIT_LOCALE("gimp"); INIT_LOCALE("gimp");
gtk_init (&argc, &argv);
setlocale(LC_NUMERIC, "C"); /* gtk seems to zap this during init.. */
#ifdef HAVE_PUTENV #ifdef HAVE_PUTENV
display_name = gdk_get_display (); display_name = gdk_get_display ();
display_env = g_new (gchar, strlen (display_name) + 9); display_env = g_new (gchar, strlen (display_name) + 9);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment