Bjørn Lie
cd0b563a73
- Update to version 2.56.2:
+ Support version 2 of the NetworkMonitor portal interface.
+ Bugs fixed: bgo#740791, bgo#755721, bgo#773435, bgo#793727,
bgo#794380, bgo#794801, bgo#795138, bgo#795234, bgo#795406,
bgo#795429, bgo#795711, bgo#795735, bgo#795802,
glgo#GNOME/glib2#1240, glgo#GNOME/glib2#1401,
glgo#GNOME/glib2#1452, glgo#GNOME/glib2#1458.
+ Updated translations.
- Drop glib2-codegen-headers.patch: Fixed upstream.
- Refresh patches with quilt.
OBS-URL: https://build.opensuse.org/request/show/629996
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=365
143 lines
5.0 KiB
Diff
143 lines
5.0 KiB
Diff
Index: glib-2.56.2/glib/gkeyfile.c
|
|
===================================================================
|
|
--- glib-2.56.2.orig/glib/gkeyfile.c 2018-03-12 17:23:37.000000000 +0100
|
|
+++ glib-2.56.2/glib/gkeyfile.c 2018-08-17 10:53:47.314889363 +0200
|
|
@@ -511,6 +511,7 @@ struct _GKeyFile
|
|
GKeyFileFlags flags;
|
|
|
|
gchar **locales;
|
|
+ gchar *gettext_domain;
|
|
|
|
volatile gint ref_count;
|
|
};
|
|
@@ -635,6 +636,7 @@ g_key_file_init (GKeyFile *key_file)
|
|
key_file->list_separator = ';';
|
|
key_file->flags = 0;
|
|
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
|
|
+ key_file->gettext_domain = NULL;
|
|
}
|
|
|
|
static void
|
|
@@ -654,6 +656,12 @@ g_key_file_clear (GKeyFile *key_file)
|
|
key_file->parse_buffer = NULL;
|
|
}
|
|
|
|
+ if (key_file->gettext_domain)
|
|
+ {
|
|
+ g_free (key_file->gettext_domain);
|
|
+ key_file->gettext_domain = NULL;
|
|
+ }
|
|
+
|
|
tmp = key_file->groups;
|
|
while (tmp != NULL)
|
|
{
|
|
@@ -873,6 +881,11 @@ g_key_file_load_from_fd (GKeyFile
|
|
return FALSE;
|
|
}
|
|
|
|
+ key_file->gettext_domain = g_key_file_get_string (key_file,
|
|
+ G_KEY_FILE_DESKTOP_GROUP,
|
|
+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
|
|
+ NULL);
|
|
+
|
|
return TRUE;
|
|
}
|
|
|
|
@@ -985,6 +998,11 @@ g_key_file_load_from_data (GKeyFile
|
|
return FALSE;
|
|
}
|
|
|
|
+ key_file->gettext_domain = g_key_file_get_string (key_file,
|
|
+ G_KEY_FILE_DESKTOP_GROUP,
|
|
+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
|
|
+ NULL);
|
|
+
|
|
return TRUE;
|
|
}
|
|
|
|
@@ -2208,6 +2226,8 @@ g_key_file_get_locale_string (GKeyFile
|
|
GError *key_file_error;
|
|
gchar **languages;
|
|
gboolean free_languages = FALSE;
|
|
+ gboolean try_gettext = FALSE;
|
|
+ const gchar *msg_locale;
|
|
gint i;
|
|
|
|
g_return_val_if_fail (key_file != NULL, NULL);
|
|
@@ -2229,6 +2249,23 @@ g_key_file_get_locale_string (GKeyFile
|
|
free_languages = FALSE;
|
|
}
|
|
|
|
+ /* we're only interested in gettext translation if we don't have a
|
|
+ * translation in the .desktop file itself and if the key is one of the keys
|
|
+ * we know we want to translate: Name, GenericName, Comment. Blindly doing
|
|
+ * this for all keys can give strange result for the icons, since the Icon is
|
|
+ * a locale string in the spec, eg. We also only get translation in the mo
|
|
+ * file if the requested locale is the LC_MESSAGES one. Ideally, we should do
|
|
+ * more and change LC_MESSAGES to use the requested locale, but there's no
|
|
+ * guarantee it's installed on the system and it might have some
|
|
+ * side-effects. Since this is a corner case, let's ignore it. */
|
|
+
|
|
+ msg_locale = setlocale (LC_MESSAGES, NULL);
|
|
+ try_gettext = msg_locale && key_file->gettext_domain &&
|
|
+ strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 &&
|
|
+ (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 ||
|
|
+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 ||
|
|
+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0);
|
|
+
|
|
for (i = 0; languages[i]; i++)
|
|
{
|
|
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
|
|
@@ -2245,6 +2282,39 @@ g_key_file_get_locale_string (GKeyFile
|
|
translated_value = NULL;
|
|
}
|
|
|
|
+ /* Fallback to gettext */
|
|
+ if (try_gettext && !translated_value)
|
|
+ {
|
|
+ gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL);
|
|
+
|
|
+ if (orig_value)
|
|
+ {
|
|
+ gboolean codeset_set;
|
|
+ const gchar *translated;
|
|
+ gboolean has_gettext;
|
|
+
|
|
+ codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL;
|
|
+ translated = NULL;
|
|
+
|
|
+ translated = g_dgettext (key_file->gettext_domain,
|
|
+ orig_value);
|
|
+ has_gettext = translated != orig_value;
|
|
+
|
|
+ g_free (orig_value);
|
|
+
|
|
+ if (has_gettext)
|
|
+ {
|
|
+ if (codeset_set)
|
|
+ translated_value = g_strdup (translated);
|
|
+ else
|
|
+ translated_value = g_locale_to_utf8 (translated,
|
|
+ -1, NULL, NULL, NULL);
|
|
+ }
|
|
+ else
|
|
+ translated_value = NULL;
|
|
+ }
|
|
+ }
|
|
+
|
|
/* Fallback to untranslated key
|
|
*/
|
|
if (!translated_value)
|
|
Index: glib-2.56.2/glib/gkeyfile.h
|
|
===================================================================
|
|
--- glib-2.56.2.orig/glib/gkeyfile.h 2018-02-06 17:05:56.000000000 +0100
|
|
+++ glib-2.56.2/glib/gkeyfile.h 2018-08-17 10:53:47.314889363 +0200
|
|
@@ -320,6 +320,7 @@ gboolean g_key_file_remove_group
|
|
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
|
|
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
|
|
#define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions"
|
|
+#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain"
|
|
|
|
#define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application"
|
|
#define G_KEY_FILE_DESKTOP_TYPE_LINK "Link"
|