[Commits] [SCM] claws branch, master, updated. 3.11.1-202-ga3ee5ba

[ticho at claws-mail.org]

The branch, master has been updated
       via  a3ee5bae26abfaf557ac0e1dbe798ed0e68dd956 (commit)
      from  0158a5105c5c4eb3c0239be2fa2bcc0461c760aa (commit)

Summary of changes:
 src/manual.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit a3ee5bae26abfaf557ac0e1dbe798ed0e68dd956
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Jul 9 12:38:50 2015 +0200

    Use g_win32_getlocale() in manual availability detection on Windows.

diff --git a/src/manual.c b/src/manual.c
index 94c26ac..6620720 100644
--- a/src/manual.c
+++ b/src/manual.c
@@ -47,17 +47,13 @@ static gchar *get_language()
 	gchar *c;
 
 #ifdef G_OS_WIN32
-	language = g_strdup(gtk_set_locale());
+	language = g_win32_getlocale();
 #else
-        /* FIXME: Why not using gtk_set_locale here too? -wk */
 	language = g_strdup(setlocale(LC_MESSAGES, NULL));
 #endif
-        /* At least under W32 it is possible that gtk_set_locate
-           returns NULL.  This is not documented but well, it happens
-           and g_strdup is happy with a NULL argument.  We return a
-           standard language string in this case. */
-        if (!language)
-                return g_strdup("en");
+	if (!language)
+		return g_strdup("en");
+
 	if((c = strchr(language, ',')) != NULL)
 		*c = '\0';
 	if((c = strchr(language, '_')) != NULL)

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail