From 6a6475c0c4396507dba98f1a8c7605743f265e2f Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Sun, 6 Jun 2010 09:49:20 +0200 Subject: remove the part of the glib patch which has been accepted by upstream --- src/glib-2-optional-gettext.patch | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/glib-2-optional-gettext.patch b/src/glib-2-optional-gettext.patch index 69f6c7d..0f2239b 100644 --- a/src/glib-2-optional-gettext.patch +++ b/src/glib-2-optional-gettext.patch @@ -18,28 +18,6 @@ diff -r 3241a43cfc79 configure.in *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html ]) fi -diff -r 3241a43cfc79 gio/gsettings.c ---- a/gio/gsettings.c Sun May 16 16:38:34 2010 +0200 -+++ b/gio/gsettings.c Sun May 16 17:02:59 2010 +0200 -@@ -782,16 +782,13 @@ - const gchar *translated; - GError *error = NULL; - const gchar *domain; -- gint lc_category; - - domain = g_settings_schema_get_gettext_domain (settings->priv->schema); - - if (lc_char == 't') -- lc_category = LC_TIME; -+ translated = dcgettext (domain, unparsed, LC_TIME); - else -- lc_category = LC_MESSAGES; -- -- translated = dcgettext (domain, unparsed, lc_category); -+ translated = dgettext (domain, unparsed); - - if (translated != unparsed) - /* it was translated, so we need to re-parse it */ diff -r 3241a43cfc79 glib/gi18n.h --- a/glib/gi18n.h Sun May 16 16:38:34 2010 +0200 +++ b/glib/gi18n.h Sun May 16 17:02:59 2010 +0200 -- cgit v0.12