summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-06-06 07:49:20 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-06-06 07:49:20 (GMT)
commit6a6475c0c4396507dba98f1a8c7605743f265e2f (patch)
tree7756535cfad4f65d5baf1177b8662faef5aa6145 /src
parent185be69dcd842651a4f6e3d06905f888e30985e8 (diff)
downloadmxe-6a6475c0c4396507dba98f1a8c7605743f265e2f.zip
mxe-6a6475c0c4396507dba98f1a8c7605743f265e2f.tar.gz
mxe-6a6475c0c4396507dba98f1a8c7605743f265e2f.tar.bz2
remove the part of the glib patch which has been accepted by upstream
Diffstat (limited to 'src')
-rw-r--r--src/glib-2-optional-gettext.patch22
1 files changed, 0 insertions, 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