luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-07 11:09:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some problems with message handling

Browse Source 
g_printerr() doesn't append a newline, so we have to consistently
do it everywhere. Also, we cannot call gettext on "", ever.
This commit is contained in:
Matthias Clasen 2011-02-12 12:42:18 -05:00
parent a536a1f2d7
commit c3334490c7
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gio/gsettings-tool.c
View File

@ -558,7 +558,7 @@ gsettings_help (gboolean requested,
else else
{ {
g_string_append_printf (string, _("Usage:\n gsettings %s %s\n\n%s\n\n"), g_string_append_printf (string, _("Usage:\n gsettings %s %s\n\n%s\n\n"),
command, _(synopsis), description); command, synopsis[0] ? _(synopsis) : "", description);
if (synopsis[0]) if (synopsis[0])
{ {
@ -592,7 +592,7 @@ gsettings_help (gboolean requested,
if (requested) if (requested)
g_print ("%s", string->str); g_print ("%s", string->str);
else else
g_printerr ("%s", string->str); g_printerr ("%s\n", string->str);
g_string_free (string, TRUE); g_string_free (string, TRUE);
@ -608,6 +608,19 @@ main (int argc, char **argv)
const gchar *key; const gchar *key;
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
textdomain (GETTEXT_PACKAGE);
#ifdef G_OS_WIN32
gchar *tmp = _glib_get_locale_dir ();
bindtextdomain (GETTEXT_PACKAGE, tmp);
g_free (tmp);
#else
bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
#endif
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
if (argc < 2) if (argc < 2)
return gsettings_help (FALSE, NULL); return gsettings_help (FALSE, NULL);
@ -659,7 +672,7 @@ main (int argc, char **argv)
if (argv[2][0] == '\0') if (argv[2][0] == '\0')
{ {
g_printerr (_("Empty schema name given")); g_printerr (_("Empty schema name given\n"));
return 1; return 1;
} }