Fix for #137993. There is a chance that we'll have to revert this fix,

2004-12-07  Glynn Foster  <glynn.foster@sun.com>

	* src/main.c: Fix for #137993. There is a chance that we'll have
	to revert this fix, given the comments in /etc/X11/gdm/Xsession:

        # Note that this should only go to zenity dialogs which always
	#  expect utf8
        gettextfunc () {
          if [ "x$gdmtranslate" != "x" ] ; then
            "$gdmtranslate" --utf8 "$1"
          else
            echo "$1"
          fi
        }

	So I guess we may be over a barrel with our original guarantee.
	Let's just change this in 2.9.x and see if anyone notices or cares
        enough. Patch from Leonardo Boshell <p@kapcoweb.com>.
This commit is contained in:
Glynn Foster 2004-12-07 01:26:00 +00:00 committed by Glynn Foster
parent 6798192ed8
commit 69e094a457
2 changed files with 20 additions and 1 deletions

View File

@ -1,3 +1,22 @@
2004-12-07 Glynn Foster <glynn.foster@sun.com>
* src/main.c: Fix for #137993. There is a chance that we'll have
to revert this fix, given the comments in /etc/X11/gdm/Xsession:
# Note that this should only go to zenity dialogs which always
# expect utf8
gettextfunc () {
if [ "x$gdmtranslate" != "x" ] ; then
"$gdmtranslate" --utf8 "$1"
else
echo "$1"
fi
}
So I guess we may be over a barrel with our original guarantee.
Let's just change this in 2.9.x and see if anyone notices or cares
enough. Patch from Leonardo Boshell <p@kapcoweb.com>.
2004-12-07 Glynn Foster <glynn.foster@sun.com> 2004-12-07 Glynn Foster <glynn.foster@sun.com>
* src/option.c: Fix spacing issue. * src/option.c: Fix spacing issue.

View File

@ -44,11 +44,11 @@ main (gint argc, gchar **argv) {
#endif #endif
bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(GETTEXT_PACKAGE); textdomain(GETTEXT_PACKAGE);
results = zenity_option_parse (argc, argv); results = zenity_option_parse (argc, argv);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
switch (results->mode) { switch (results->mode) {