Commit f0b59bd7 authored by Martin's avatar Martin

Imported Upstream version 0.16.7

parent 5f0ceecc
Gajim 0.16.7 (30 January 2017)
* Better compatibility with XEP-0191: Blocking Command
* Windows Credential Vault is used for password storage on Windows
* Gajim now depends on python-gnupg for PGP encryption
* Add portable installer for Windows
* Remove usage of demandimport
* Many minor bugfixes
Gajim 0.16.6 (02 October 2016)
* Fix using gpg2
* Improve message receips usage
* Improve message receipts usage
* Improve roster filtering
* several minor bugs
......
......@@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
EXTRA_DIST = \
README.html \
THANKS.artists \
autogen.sh \
intltool-extract.in \
......
......@@ -398,7 +398,6 @@ top_srcdir = @top_srcdir@
SUBDIRS = src data po icons plugins
bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
EXTRA_DIST = \
README.html \
THANKS.artists \
autogen.sh \
intltool-extract.in \
......
see README.html
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>Gajim - Read Me</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
<h1>Gajim Read Me</h1>
<p>Welcome to Gajim and thank you for trying out our client.</p>
<h2>Runtime Requirements</h2>
<ul>
<li>python2.5 or higher</li>
<li>pygtk2.22 or higher</li>
<li>python-nbxmpp</li>
</ul>
<h2>Optional Runtime Requirements</h2>
<ul>
<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.12) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
<li>python-pyasn1 to check SSL/TLS certificate</li>
<li>python-crypto to enable End to end encryption</li>
<li>python-gnupg to enable GPG encryption</li>
<li>For idle module, libxss library</li>
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li>
<li>kwalletcli (for support of KDE Wallet as password storage)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
<li>python-dbus bindings (>=0.81)</li>
<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
</ul>
<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
<h2>Compile-time Requirements</h2>
<ul>
<li>intltool (>= 0.40.1)</li>
</ul>
<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>
<h2>Installation Procedure</h2>
<ol>
<li>tar jxvf gajim-version.tar.bz2</li>
<li>cd gajim</li>
<li>./configure</li>
<li>make (builds translations)</li>
<li>su -c make install</li>
</ol>
<p>To specify where to install do:</p>
<pre>
./configure --prefix=custom_path
</pre>
<h2>Running Gajim</h2>
<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
<hr />
<h3>Note for hg users</h3>
<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
<ul>
<li>automake &gt;= 1.8 </li>
<li>autoconf &gt;= 2.59 </li>
<li>libtool</li>
<li>intltool-0.40.1 </li>
<li>pkgconfig &gt;= 0.19</li>
</ul>
<p>steps to compile gajim:</p>
<pre>
$ ./autogen.sh
$ ./configure
$ make
</pre>
<p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p>
<pre>
$ ./configure
$ make
</pre>
<h2>Uninstallation Procedure</h2>
<pre>
su -c make uninstall
</pre>
<p>this will try to remove Gajim from the default directories.
If you want to remove it from custom directory provide it as:
</p>
<pre>
./configure --prefix=custom_path
make uninstall
</pre>
<h2>Miscellaneous</h2>
<h3>XML &amp; Debugging</h3>
<p>If you want to see the xml stanzas and/or help us debugging
you're advised to enable verbose via advanced configuration window.
If you don't want to make this permanent, execute gajim with --verbose
everytime you want to have verbose output.</p>
<h3>FAQ/Wiki</h3>
<p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/>
Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p>
<p>That is all, <strong>enjoy!</strong></p>
<p>
<br/>
<br/>
<br/>
(C) 2003-2012<br/>
The Gajim Team<br/>
http://gajim.org<br/>
<br/>
<br/>
PS.
We use original art and parts of sounds and other art from Psi, Gossip,
Gnomebaker, Gaim and some icons from various gnome-icons
(mostly Dropline Etiquette) we found at art.gnome.org
If you think we're violating a license please inform us. Thank you.</p>
</body></html>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>Gajim - Read Me</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head>
<body>
<h1>Gajim Read Me</h1>
<p>Welcome to Gajim and thank you for trying out our client.</p>
<h2>Runtime Requirements</h2>
<ul>
<li>python2.5 or higher</li>
<li>pygtk2.22 or higher</li>
<li>python-nbxmpp</li>
</ul>
<h2>Optional Runtime Requirements</h2>
<ul>
<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.12) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
<li>python-pyasn1 to check SSL/TLS certificate</li>
<li>python-crypto to enable End to end encryption</li>
<li>For idle module, libxss library</li>
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li>
<li>kwalletcli (for support of KDE Wallet as password storage)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
<li>python-dbus bindings (>=0.81)</li>
<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
</ul>
<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
<h2>Compile-time Requirements</h2>
<ul>
<li>intltool (>= 0.40.1)</li>
</ul>
<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>
<h2>Installation Procedure</h2>
<ol>
<li>tar jxvf gajim-version.tar.bz2</li>
<li>cd gajim</li>
<li>./configure</li>
<li>make (builds translations)</li>
<li>su -c make install</li>
</ol>
<p>To specify where to install do:</p>
<pre>
./configure --prefix=custom_path
</pre>
<h2>Running Gajim</h2>
<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
<hr />
<h3>Note for hg users</h3>
<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
<ul>
<li>automake &gt;= 1.8 </li>
<li>autoconf &gt;= 2.59 </li>
<li>libtool</li>
<li>intltool-0.40.1 </li>
<li>pkgconfig &gt;= 0.19</li>
</ul>
<p>steps to compile gajim:</p>
<pre>
$ ./autogen.sh
$ ./configure
$ make
</pre>
<p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p>
<pre>
$ ./configure
$ make
</pre>
<h2>Uninstallation Procedure</h2>
<pre>
su -c make uninstall
</pre>
<p>this will try to remove Gajim from the default directories.
If you want to remove it from custom directory provide it as:
</p>
<pre>
./configure --prefix=custom_path
make uninstall
</pre>
<h2>Miscellaneous</h2>
<h3>XML &amp; Debugging</h3>
<p>If you want to see the xml stanzas and/or help us debugging
you're advised to enable verbose via advanced configuration window.
If you don't want to make this permanent, execute gajim with --verbose
everytime you want to have verbose output.</p>
<h3>FAQ/Wiki</h3>
<p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/>
Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p>
<p>That is all, <strong>enjoy!</strong></p>
<p>
<br/>
<br/>
<br/>
(C) 2003-2012<br/>
The Gajim Team<br/>
http://gajim.org<br/>
<br/>
<br/>
PS.
We use original art and parts of sounds and other art from Psi, Gossip,
Gnomebaker, Gaim and some icons from various gnome-icons
(mostly Dropline Etiquette) we found at art.gnome.org
If you think we're violating a license please inform us. Thank you.</p>
</body></html>
......@@ -335,7 +335,7 @@ msgstr ""
# on various variables needed by the Makefile.in.in installed by
# glib-gettextize.
dnl
glib_DEFUN([GLIB_GNU_GETTEXT],
AU_DEFUN([GLIB_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_CC])dnl
GLIB_LC_MESSAGES
......@@ -405,7 +405,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
rm -f po/POTFILES
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
])
],
[[$0: This macro is deprecated. You should use upstream gettext instead.]])
# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
# -------------------------------
......
#!/usr/bin/env bash
gajimversion="0.16.6"
gajimversion="0.16.7"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
......
......@@ -590,7 +590,7 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Gajim - A Jabber Instant Messager'
PACKAGE_TARNAME='gajim'
PACKAGE_VERSION='0.16.6'
PACKAGE_VERSION='0.16.7'
PACKAGE_STRING='Gajim - A Jabber Instant Messager "version-set-in-hgversion"'
PACKAGE_BUGREPORT='http://trac.gajim.org/'
PACKAGE_URL=''
......@@ -1585,7 +1585,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Gajim - A Jabber Instant Messager configure 0.16.6
Gajim - A Jabber Instant Messager configure 0.16.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1954,7 +1954,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Gajim - A Jabber Instant Messager $as_me 0.16.6, which was
It was created by Gajim - A Jabber Instant Messager $as_me 0.16.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2823,7 +2823,7 @@ fi
# Define the identity of the package.
PACKAGE='gajim'
VERSION='0.16.6'
VERSION='0.16.7'
cat >>confdefs.h <<_ACEOF
......@@ -15104,7 +15104,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Gajim - A Jabber Instant Messager $as_me 0.16.6, which was
This file was extended by Gajim - A Jabber Instant Messager $as_me 0.16.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -15170,7 +15170,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Gajim - A Jabber Instant Messager config.status 0.16.6
Gajim - A Jabber Instant Messager config.status 0.16.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
This diff is collapsed.
define([AC_PACKAGE_VERSION], [0.16.6])
define([AC_PACKAGE_VERSION], [0.16.7])
from plugin_installer import PluginInstaller
from .plugin_installer import PluginInstaller
This diff is collapsed.
[info]
name: Plugin Installer
short_name: plugin_installer
version: 0.11.30
version: 0.17
description: Install and upgrade plugins from ftp
authors: Denis Fomin <fominde@gmail.com>
Yann Leboulanger <asterix@lagaule.org>
Thilo Molitor <thilo@eightysoft.de>
homepage: http://trac-plugins.gajim.org/wiki/PluginInstallerPlugin
min_gajim_version: 0.16
max_gajim_version: 0.16.9
min_gajim_version: 0.16.10
--- manifest.ini
+++ manifest.ini
@@ -1,7 +1,7 @@
[info]
name: Plugin Installer
short_name: plugin_installer
-version: 0.11.7
+version: 0.11.9
description: Install and upgrade plugins from ftp
authors: Denis Fomin <fominde@gmail.com>
Yann Leboulanger <asterix@lagaule.org>
This diff is collapsed.
--- plugin_installer.py
+++ plugin_installer.py
@@ -74,6 +74,12 @@
icon = gtk.Image()
self.def_icon = icon.render_icon(gtk.STOCK_PREFERENCES,
gtk.ICON_SIZE_MENU)
+ if gajim.version.startswith('0.15'):
+ self.server_folder = 'plugins_0.15'
+ elif gajim.version.startswith('0.16.10'):
+ self.server_folder = 'plugins_gtk3'
+ else:
+ self.server_folder = 'plugins_0.16'
@log_calls('PluginInstallerPlugin')
def activate(self):
@@ -114,7 +120,7 @@
try:
to_update = []
con = self.ftp_connect()
- con.cwd('plugins_0.16')
+ con.cwd(self.server_folder)
con.retrbinary('RETR manifests.zip', ftp.handleDownload)
zip_file = zipfile.ZipFile(ftp.buffer_)
manifest_list = zip_file.namelist()
@@ -501,7 +507,7 @@
gobject.idle_add(self.progressbar.set_text,
_('Connecting to server'))
self.ftp = self.plugin.ftp_connect()
- self.ftp.cwd('plugins_0.16')
+ self.ftp.cwd(self.plugin.server_folder)
if not self.remote_dirs:
gobject.idle_add(self.progressbar.set_text,
_('Scan files on the server'))
......@@ -7,7 +7,7 @@ es
ru
bg
de
nb
nb_NO
cs
nl
pt_BR
......@@ -15,7 +15,6 @@ sv
it
eu
sk
no
zh_CN
br
eo
......
......@@ -108,7 +108,6 @@ src/common/file_props.py
src/common/fuzzyclock.py
src/common/gajim.py
src/common/ged.py
src/common/gnupg.py
src/common/gpg.py
src/common/helpers.py
src/common/i18n.py
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
## scripts/gajim.in
##
## Copyright (C) 2005 Yann Le Boulanger <asterix AT lagaule.org>
## Copyright (C) 2005-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
## Stefan Bethge <stefan AT lanpartei.de>
## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
......
## setup_win32.py (run me as python setup_win32.py py2exe -O2)
## setup_win32.py (run me as python setup_win32.py build_exe)
##
## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com>
## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
##
......@@ -20,50 +20,42 @@
##
from cx_Freeze import setup, Executable
import glob
import sys
import os
sys.path.append('src')
# Use local gtk folder instead of the one in PATH that is not latest gtk
if 'gtk' in os.listdir('.'):
sys.path.append('gtk/bin')
# if 'gtk' in os.listdir('.'):
# sys.path.append('gtk/bin')
# probably not necessary anymore
# includes 'dumbdbm', 'dbhash', 'bsddb',
# 'gtk.keysyms', 'goocanvas' 'numbers', 'HTMLParser'
options = {
'build_exe': {
'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new',
'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC',
'numbers', 'win32com.client', 'win32com.server', 'HTMLParser', 'pkg_resources'],
'base': 'Win32GUI',
'packages': ['cffi', 'cryptography', 'PIL', 'axolotl', 'google'],
'bin_excludes': [
'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',
'libgio-2.0-0.dll',
'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll',
'libgobject-2.0-0.dll', 'libgthread-2.0-0.dll',
'libgtk-win32-2.0-0.dll', 'libpango-1.0-0.dll',
'libpangowin32-1.0-0.dll', 'libcairo-2.dll',
'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll',
'libfarstream-0.1-0.dll', 'libgcc_s_dw2-1.dll',
'libgstbase-0.10-0.dll', 'libgstcontroller-0.10-0.dll',
'libgstdataprotocol-0.10-0.dll', 'libgstinterfaces-0.10-0.dll',
'libgstnet-0.10-0.dll', 'libgstreamer-0.10-0.dll',
'libiconv-2.dll', 'libxml2.dll', 'libxml2-2.dll',
],
'includes': ['new', 'win32com.server', 'win32com.client', 'HTMLParser'],
'packages': ['pkg_resources', 'cffi', 'gtk',
'cryptography', 'Crypto', 'PIL', 'qrcode',
'axolotl', 'google', 'common', 'keyring'],
'excludes': ['Tkinter', 'unittest', 'psutil'],
}
}
setup(
name='Gajim',
version='0.16.6',
version='0.16.7',
description='A full featured Jabber client',
author='Gajim Development Team',
url='http://gajim.org/',
download_url='http://gajim.org/downloads.php',
license='GPL',
options=options,
executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),
Executable('src/history_manager.py', icon='data/pixmaps/gajim.ico')],
executables=[
Executable(
'src/gajim.py', base='Win32GUI',
icon='data/pixmaps/gajim.ico'),
Executable(
'src/history_manager.py', base='Win32GUI',
icon='data/pixmaps/gajim.ico')],
)
......@@ -3,7 +3,7 @@
##
## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com>
## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org>
## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2006-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
## Stephan Erb <steve-e AT h3c.de>
##
......
......@@ -3,7 +3,7 @@
##
## Copyright (C) 2005 Travis Shirk <travis AT pobox.com>
## Vincent Hanquez <tab AT snarc.org>
## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2005-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com>
## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org>
......
......@@ -2,7 +2,7 @@
## src/atom_window.py
##
## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org>
## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2006-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2007 Nikos Kouremenos <kourem AT gmail.com>
## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
##
......
# -*- coding:utf-8 -*-
## src/cell_renderer_image.py
##
## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org>
## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com>
## Copyright (C) 2006 Travis Shirk <travis AT pobox.com>
......
......@@ -2,7 +2,7 @@
## src/chat_control.py
##
## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2006-2017 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org>
## Nikos Kouremenos <kourem AT gmail.com>
## Travis Shirk <travis AT pobox.com>
......@@ -902,7 +902,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
def print_conversation_line(self, text, kind, name, tim,
other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[],
count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False,
count_as_new=True, subject=None, xhtml=None, simple=False,
xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None,
correct_id=None):
"""
......@@ -933,7 +933,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
else:
textview.print_conversation_line(text, jid, kind, name, tim,
other_tags_for_name, other_tags_for_time, other_tags_for_text,
subject, old_kind, xhtml, simple=simple, graphics=graphics,
subject, xhtml, simple=simple, graphics=graphics,
displaymarking=displaymarking)
if xep0184_id is not None:
......@@ -1454,7 +1454,6 @@ class ChatControl(ChatControlBase):
) = range(5)
TYPE_ID = message_control.TYPE_CHAT
old_msg_kind = None # last kind of the printed message
# Set a command host to bound to. Every command given through a chat will be
# processed with this command host.
......@@ -2577,13 +2576,9 @@ class ChatControl(ChatControlBase):
if xhtml:
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)
ChatControlBase.print_conversation_line(self, text, kind, name, tim,
subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml,
subject=subject, xhtml=xhtml,
simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking,
msg_log_id=msg_log_id, correct_id=correct_id)
if text.startswith('/me ') or text.startswith('/me\n'):
self.old_msg_kind = None
else:
self.old_msg_kind = kind
def get_tab_label(self, chatstate):
unread = ''
......@@ -2991,12 +2986,6 @@ class ChatControl(ChatControlBase):
if gajim.jid_is_transport(jid):
return
# How many lines to restore and when to time them out
restore_how_many = gajim.config.get('restore_lines')
if restore_how_many <= 0:
return