diff options
| author | Shih-Yuan Lee (FourDollars) <sylee@canonical.com> | 2013-09-03 21:16:59 +0800 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2013-09-04 07:19:24 +0200 |
| commit | fdc62ad245eb76c337cea2abbbeaca7ddf7c60eb (patch) | |
| tree | 81a7cef67692e824f5faba7e3916d8a08ef9ec70 | |
| parent | 347b8b0b93b1e96bfc8a2d54df3d2864ba1d861f (diff) | |
Set locale in daemon and tool
This is necessary to properly show non-UTF8 strings in debug mode (for the
daemon) and upower --dump etc. (for the tool).
| -rw-r--r-- | src/up-main.c | 2 | ||||
| -rw-r--r-- | tools/up-tool.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/up-main.c b/src/up-main.c index a7e6eb6..ba79685 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -32,6 +32,7 @@ #include <glib.h> #include <glib/gi18n-lib.h> #include <glib-object.h> +#include <locale.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> @@ -207,6 +208,7 @@ main (gint argc, gchar **argv) #if !defined(GLIB_VERSION_2_36) g_type_init (); #endif + setlocale(LC_ALL, ""); context = g_option_context_new ("upower daemon"); g_option_context_add_main_entries (context, options, NULL); diff --git a/tools/up-tool.c b/tools/up-tool.c index c82dae4..ad4015e 100644 --- a/tools/up-tool.c +++ b/tools/up-tool.c @@ -30,6 +30,7 @@ #include <sys/time.h> #include <glib.h> #include <glib/gi18n-lib.h> +#include <locale.h> #include "up-client.h" #include "up-device.h" @@ -281,6 +282,7 @@ main (int argc, char **argv) #if !defined(GLIB_VERSION_2_36) g_type_init (); #endif + setlocale(LC_ALL, ""); context = g_option_context_new ("UPower tool"); g_option_context_add_main_entries (context, entries, NULL); |