Mercurial > mxe-octave

changeset 1049:889adcb8ba98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove the part of the glib patch which has been accepted by upstream
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 06 Jun 2010 09:49:20 +0200
parents 48643c8bf553
children 3d74c8e772ad
files src/glib-2-optional-gettext.patch
diffstat 1 files changed, 0 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/glib-2-optional-gettext.patch	Sun Jun 06 09:35:01 2010 +0200
+++ b/src/glib-2-optional-gettext.patch	Sun Jun 06 09:49:20 2010 +0200
@@ -18,28 +18,6 @@
  *** 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