[gimp] app: add some blank lines to gimp_help_get_locales() and fix comment syntax
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add some blank lines to gimp_help_get_locales() and fix comment syntax
- Date: Fri, 21 Apr 2017 23:00:22 +0000 (UTC)
commit 61d9197dd47509ee80881f439fc993c400d048d6
Author: Michael Natterer <mitch gimp org>
Date: Fri Apr 21 19:59:35 2017 -0300
app: add some blank lines to gimp_help_get_locales() and fix comment syntax
app/widgets/gimphelp.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c
index c226a9d..de4664c 100644
--- a/app/widgets/gimphelp.c
+++ b/app/widgets/gimphelp.c
@@ -612,10 +612,12 @@ gimp_help_get_locales (Gimp *gimp)
c = strchr (locale, '.');
if (c)
*c = '\0';
- /* We don't care about variants as well. */
+
+ /* We don't care about variants either. */
c = strchr (locale, '@');
if (c)
*c = '\0';
+
/* Apparently some systems (i.e. Windows) would return a value as
* IETF language tag, which is a different format from POSIX
* locale; especially it would separate the lang and the region
@@ -631,6 +633,7 @@ gimp_help_get_locales (Gimp *gimp)
c = strchr (locale, '-');
if (c)
*c = '_';
+
if (locale && *locale &&
! g_list_find_custom (locales_list, locale,
(GCompareFunc) g_strcmp0))
@@ -645,6 +648,7 @@ gimp_help_get_locales (Gimp *gimp)
c = strchr (base, '_');
if (c)
*c = '\0';
+
if (base && *base &&
! g_list_find_custom (locales_list, base,
(GCompareFunc) g_strcmp0))
@@ -658,10 +662,10 @@ gimp_help_get_locales (Gimp *gimp)
}
else
{
- /* Avoid duplicates. */
g_free (locale);
}
}
+
locales_list = g_list_reverse (locales_list);
/* Finally generate the colon-separated value. */
@@ -675,6 +679,7 @@ gimp_help_get_locales (Gimp *gimp)
g_free (temp);
}
}
+
g_list_free_full (locales_list, g_free);
return locales;
@@ -686,7 +691,6 @@ gimp_help_get_user_manual_basedir (void)
return gimp_data_directory_file ("help", NULL);
}
-
static void
gimp_help_query_online_response (GtkWidget *dialog,
gint response,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]