patch has been announce and is in gettext upstream. Debian includes it, let's remove the FIXME. Fixes #4166

This commit is contained in:
Yann Leboulanger 2008-08-29 07:25:34 +00:00
parent 4d8a301da2
commit 358ac948b7
2 changed files with 3 additions and 5 deletions

4
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gajim
Section: net Section: net
Priority: optional Priority: optional
Maintainer: Yann Le Boulanger <asterix@lagaule.org> Maintainer: Yann Le Boulanger <asterix@lagaule.org>
Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev
Build-Conflicts: python2.3 Build-Conflicts: python2.3
XS-Python-Version: >= 2.4 XS-Python-Version: >= 2.4
Standards-Version: 3.7.3 Standards-Version: 3.7.3
@ -15,7 +15,7 @@ Architecture: any
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), python-pysqlite2 | python (>= 2.5), dnsutils Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), python-pysqlite2 | python (>= 2.5), dnsutils
Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-pyopenssl Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-pyopenssl
Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0) Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring
Description: Jabber client written in PyGTK Description: Jabber client written in PyGTK
Gajim is a Jabber client. It has a tabbed user interface with normal chats, Gajim is a Jabber client. It has a tabbed user interface with normal chats,
group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts,

View File

@ -2456,9 +2456,7 @@ class Interface:
self.sth_at_sth_dot_sth_re = re.compile(r'\S+@\S+\.\S*[^\s)?]') self.sth_at_sth_dot_sth_re = re.compile(r'\S+@\S+\.\S*[^\s)?]')
# Invalid XML chars # Invalid XML chars
# invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]' invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]'
#FIXME: xgettext fails with \udfff char ... see #http://trac.gajim.org/ticket/4166
invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ufffe-\uffff]'
self.invalid_XML_chars_re = re.compile(invalid_XML_chars) self.invalid_XML_chars_re = re.compile(invalid_XML_chars)
re.purge() # clear the regular expression cache re.purge() # clear the regular expression cache