Commits December 2016

commits@gajim.org

1 participants
37 discussions

[Git][gajim/gajim][gajim_0.16] don't install README.html anymore
by Yann Leboulanger 31 Dec '16

31 Dec '16

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 2d0a0edd by Yann Leboulanger at 2016-12-31T13:24:45+01:00 don't install README.html anymore - - - - - 1 changed file: - Makefile.am Changes: ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -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 \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2d0a0edd195cdc6a6d0b1fee9ecf1e92aa…

1 0

[Git][gajim/gajim][master] don't install README.html anymore
by Yann Leboulanger 31 Dec '16

31 Dec '16

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7db62112 by Yann Leboulanger at 2016-12-31T13:23:10+01:00 don't install README.html anymore - - - - - 1 changed file: - Makefile.am Changes: ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -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 \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7db6211230b84a1a17221150a2f45c9899…

1 0

[Git][gajim/gajim][master] 2 commits: get git version when running configure
by Yann Leboulanger 29 Dec '16

29 Dec '16

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 3409a40c by Yann Leboulanger at 2016-12-30T00:54:33+01:00 get git version when running configure - - - - - 6da03e09 by Yann Leboulanger at 2016-12-30T00:54:48+01:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - 3 changed files: - autogen.sh - configure.ac - m4/acinclude.m4 Changes: ===================================== autogen.sh ===================================== --- a/autogen.sh +++ b/autogen.sh @@ -1,13 +1,4 @@ #!/usr/bin/env bash - gajimversion="0.16.10.2" - if [ -d ".hg" ]; then - node=$(hg tip --template "{node}") - hgversion="-${node:0:12}" - else - hgversion="" - fi - echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4 - AM_ARGS="--add-missing --gnu --copy -Wno-portability" CONF_ARGS="" ===================================== configure.ac ===================================== --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - ["version-set-in-hgversion"],[http://trac.gajim.org/],[gajim]) + m4_esyscmd_s([python -c "import os;os.chdir('src');from common import defs; print defs.version"]),[https://dev.gajim.org/gajim/gajim],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) ===================================== m4/acinclude.m4 ===================================== --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -47,8 +47,3 @@ AC_DEFUN([AS_AC_EXPAND], prefix=$prefix_save exec_prefix=$exec_prefix_save ]) - -# Fix autoconf: They don't allow shell variables in AC_INIT -# So we have to define them via m4 to be accepted.... - -m4_include(m4/hgversion.m4) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b76b08979056b5597dc3ca3aa1b05c821…

1 0

[Git][gajim/gajim][gajim_0.16] Update requirements.txt
by Philipp Hörist 29 Dec '16

29 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: cb9ec89e by Philipp Hörist at 2016-12-29T14:40:43+01:00 Update requirements.txt Added pygments for the new Source Code Highlight Plugin - - - - - 1 changed file: - requirements.txt Changes: ===================================== requirements.txt ===================================== --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,5 @@ future gnupg pillow pycurl +docutils +pygments View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb9ec89e5a9c8986143e3c3c94a00776b2…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Delete Transifex REAMDE
by Philipp Hörist 29 Dec '16

29 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 6a458c81 by Philipp Hörist at 2016-12-29T14:03:52+01:00 Delete Transifex REAMDE We dont use transifex anymore - - - - - 9a8d5cde by Philipp Hörist at 2016-12-29T14:06:20+01:00 Move README.html -> README - - - - - 3 changed files: - README - − README.html - − README.transifex Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -1 +1,128 @@ -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 >= 1.8 </li> +<li>autoconf >= 2.59 </li> +<li>libtool</li> +<li>intltool-0.40.1 </li> +<li>pkgconfig >= 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 & 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> ===================================== README.html deleted ===================================== --- a/README.html +++ /dev/null @@ -1,128 +0,0 @@ -<!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 >= 1.8 </li> -<li>autoconf >= 2.59 </li> -<li>libtool</li> -<li>intltool-0.40.1 </li> -<li>pkgconfig >= 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 & 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> ===================================== README.transifex deleted ===================================== --- a/README.transifex +++ /dev/null @@ -1,11 +0,0 @@ -Transifex.net Token Verification -================================= - -The list of tokens bellow guarantee the respective users to be able to enable -submission on components using the following repository url: - -ssh://hg.gajim.org/gajim - -Tokens: - -JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/16fbcf70230afc1663046b96c7dd477c6…

1 0

[Git][gajim/gajim][master] 2 commits: Update and rename README files
by Philipp Hörist 29 Dec '16

29 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a0c58c9 by Philipp Hörist at 2016-12-29T13:56:05+01:00 Update and rename README files - - - - - b76b0897 by Philipp Hörist at 2016-12-29T13:56:50+01:00 Update .gitignore - - - - - 5 changed files: - .gitignore - README - − README.html - + README.md - − README.transifex Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ po/stamp-it stamp-h1 Makefile __pycache__/ +src/gtk/ syntax: regexp ^config\.* ===================================== README ===================================== --- a/README +++ b/README @@ -1,23 +1,129 @@ -# Welcome to the Gajim project Wiki -The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here. - -## Links - -- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home) - * FAQ, Did you know that... - * Quickstart guides - * Advanced configuration -- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home) - * Advanced use of gajim - * User groups - * Reviews -- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home) - * Guidelines and documentation - * How to contribute - * The Gajim team -- Latest release: - * [Gajim 0.16.6 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.gz) - * [Gajim 0.16.6-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.6-1.exe) - * [Daily snapshot (.tar.gz)](https://www.gajim.org/downloads/snap/?M=D) - -- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues) \ No newline at end of file +<!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>python3.4 or higher</li> +<li>python3-gi</li> +<li>gir1.2-gtk-3.0</li> +<li>python-nbxmpp</li> +</ul> + +<h2>Optional Runtime Requirements</h2> +<ul> +<li>python3-openssl (>=0.14) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li>python3-pyasn1 to check SSL/TLS certificate</li> +<li>python3-crypto to enable End to end encryption</li> +<li>python3-gnupg to enable GPG encryption</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>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li> +<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li> +<li>gir1.2-notify-0.7 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>python3-dbus bindings (>=1.2.0)</li> +<li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li> +<li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> +<li>gir1.2-networkmanager-1.0 for network lose detection</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 >= 1.8 </li> +<li>autoconf >= 2.59 </li> +<li>libtool</li> +<li>intltool-0.40.1 </li> +<li>pkgconfig >= 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 & 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-2015<br/> +The Gajim Team<br/> +https://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> ===================================== README.html deleted ===================================== --- a/README.html +++ /dev/null @@ -1,129 +0,0 @@ -<!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>python3.4 or higher</li> -<li>python3-gi</li> -<li>gir1.2-gtk-3.0</li> -<li>python-nbxmpp</li> -</ul> - -<h2>Optional Runtime Requirements</h2> -<ul> -<li>python3-openssl (>=0.14) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> -<li>python3-pyasn1 to check SSL/TLS certificate</li> -<li>python3-crypto to enable End to end encryption</li> -<li>python3-gnupg to enable GPG encryption</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>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li> -<li>gir1.2-notify-0.7 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>python3-dbus bindings (>=1.2.0)</li> -<li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li> -<li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> -<li>gir1.2-networkmanager-1.0 for network lose detection</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 >= 1.8 </li> -<li>autoconf >= 2.59 </li> -<li>libtool</li> -<li>intltool-0.40.1 </li> -<li>pkgconfig >= 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 & 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-2015<br/> -The Gajim Team<br/> -https://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> ===================================== README.md ===================================== --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +# Welcome to the Gajim project Wiki +The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here. + +## Links + +- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home) + * FAQ, Did you know that... + * Quickstart guides + * Advanced configuration +- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home) + * Advanced use of gajim + * User groups + * Reviews +- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home) + * Guidelines and documentation + * How to contribute + * The Gajim team +- Latest release: + * [Gajim 0.16.6 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.gz) + * [Gajim 0.16.6-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.6-1.exe) + * [Daily snapshot (.tar.gz)](https://www.gajim.org/downloads/snap/?M=D) + +- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues) \ No newline at end of file ===================================== README.transifex deleted ===================================== --- a/README.transifex +++ /dev/null @@ -1,11 +0,0 @@ -Transifex.net Token Verification -================================= - -The list of tokens bellow guarantee the respective users to be able to enable -submission on components using the following repository url: - -ssh://hg.gajim.org/gajim - -Tokens: - -JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f2743228203409e6ac363fb8de0dc0d2d…

1 0

[Git][gajim/gajim][gajim_0.16] Catch exceptions on invalid URLs
by Philipp Hörist 28 Dec '16

28 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 16fbcf70 by Philipp Hörist at 2016-12-29T00:34:13+01:00 Catch exceptions on invalid URLs Closes #8494 - - - - - 2 changed files: - src/common/helpers.py - src/conversation_textview.py Changes: ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -145,8 +145,12 @@ def puny_encode_url(url): _url = url if '//' not in _url: _url = '//' + _url - o = urlparse(_url) - p_loc = idn_to_ascii(o.netloc) + try: + o = urlparse(_url) + p_loc = idn_to_ascii(o.netloc) + except: + log.debug('urlparse failed: %s', url) + return False return url.replace(o.netloc, p_loc) def parse_resource(resource): ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -1220,6 +1220,8 @@ class ConversationTextview(gobject.GObject): puny_tags = [] if use_other_tags: puny_tags += other_tags + if not puny_text: + puny_text = _('Invalid URL') puny_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in puny_tags] buffer_.insert_with_tags(end_iter, " (%s)" % puny_text, *puny_tags) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16fbcf70230afc1663046b96c7dd477c63…

1 0

[Git][gajim/gajim][master] Update appveyor build files
by Philipp Hörist 28 Dec '16

28 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: f2743228 by Philipp Hörist at 2016-12-28T18:06:39+01:00 Update appveyor build files - - - - - 4 changed files: - appveyor.yml - download.ps1 → dependencys.ps1 - gajim.nsi - + requirements.txt Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -11,39 +11,43 @@ branches: clone_depth: 1 install: - - git clone --depth=1 --branch=gtk3 https://dev.gajim.org/gajim/gajim-plugins.git c:\projects\gajim-plugins - - git clone https://dev.gajim.org/gajim/python-nbxmpp.git c:\projects\python-nbxmpp - - cd c:\\projects\\python-nbxmpp\\ - - "%PYTHON%\\python.exe setup.py install" - - ps: c:\\projects\\gajim\\download.ps1 - - set PATH=C:\\MinGW\\bin;C:\\Program Files (x86)\\gettext-iconv\\bin;%PATH% + + # Download & Install Dependencys + - ps: c:\\projects\\gajim\\dependencys.ps1 + + - set PATH=C:\\MinGW\\bin;%PATH% - "%PYTHON%\\python.exe -m pip install --upgrade pip" - - "%PYTHON%\\python.exe -m pip install protobuf" + - "%PYTHON%\\python.exe -m pip install -r c:\\projects\\gajim\\requirements.txt" + - ps: Add-Content C:\Python34\Lib\site-packages\google\__init__.py " " - - "%PYTHON%\\python.exe -m pip install pycryptodome" - - "%PYTHON%\\python.exe -m pip install cx_freeze" - - "%PYTHON%\\python.exe -m pip install keyring" - - "%PYTHON%\\python.exe -m pip install pypiwin32" - - "%PYTHON%\\python.exe -m pip install pyopenssl" - "%PYTHON%\\python.exe -m pip install --no-dependencies python-axolotl" - "%PYTHON%\\python.exe -m pip install --global-option=build_ext --global-option --compiler=mingw32 python-axolotl-curve25519" + + # Prepare Build Dir - cd c:\\projects\\gajim\\ - xcopy . ..\gajim_built /e /i - - cd .. - - cd gajim_built + - cd ..\gajim_built + + # Copy Shipped Plugins - xcopy ..\gajim-plugins\plugin_installer plugins\plugin_installer /e /i + # Compile Translation Strings - cmd: for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l + # Make Gajim.exe - "%PYTHON%\\python.exe setup_win32.py build_exe" + - move build\exe.win32-3.4 . - rmdir build - rename exe.win32-3.4 build + # Make Installer - ps: '& "C:\Program Files (x86)\NSIS\makensis.exe" gajim.nsi' + + # Push Installer Exe - ps: $env:TIME_STRING=(get-date).ToString(‘d-M-yyyy’) - - ps: Push-AppveyorArtifact Gajim.exe -FileName "Gajim-16.10.2-$($env:TIME_STRING).exe" + - ps: Push-AppveyorArtifact Gajim.exe -FileName "Gajim-default-$($env:TIME_STRING).exe" build: off ===================================== download.ps1 → dependencys.ps1 ===================================== --- a/download.ps1 +++ b/dependencys.ps1 @@ -1,23 +1,11 @@ -# Download the file to a specific location -$clnt = new-object System.Net.WebClient -$url = "https://gajim.org/downloads/snap/win/build/site-packages.zip" -$file = "c:\site-packages.zip" -$clnt.DownloadFile($url,$file) - -# Unzip the file to specified location -$shell_app=new-object -com shell.application -$zip_file = $shell_app.namespace($file) -$destination = $shell_app.namespace("C:\Python34\Lib\site-packages") -$destination.Copyhere($zip_file.items()) - -# Download gettext -$url = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.19.8.…" -$file = "c:\gettext0.19.8.1-iconv1.14-static-32.zip" -$clnt.DownloadFile($url,$file) - -# Unzip the file to specified location -$shell_app=new-object -com shell.application -$zip_file = $shell_app.namespace($file) -New-Item -ItemType directory -Path C:\gettext -$destination = $shell_app.namespace("C:\gettext") -$destination.Copyhere($zip_file.items()) +# Download the file to a specific location +$clnt = new-object System.Net.WebClient +$url = "https://gajim.org/downloads/snap/win/build/site-packages.zip" +$file = "c:\site-packages.zip" +$clnt.DownloadFile($url,$file) + +# Unzip the file to specified location +$shell_app=new-object -com shell.application +$zip_file = $shell_app.namespace($file) +$destination = $shell_app.namespace("C:\Python34\Lib\site-packages") +$destination.Copyhere($zip_file.items()) ===================================== gajim.nsi ===================================== --- a/gajim.nsi +++ b/gajim.nsi @@ -149,7 +149,6 @@ Section "Gajim" SecGajim File "THANKS.artists" File /r "build" SetOutPath "$INSTDIR\build" -; File "msvcr100.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" ===================================== requirements.txt ===================================== --- /dev/null +++ b/requirements.txt @@ -0,0 +1,12 @@ +setuptools +git+https://dev.gajim.org/gajim/python-nbxmpp.git +protobuf +pycryptodome +cryptography +cx_freeze +keyring +pypiwin32 +pyopenssl +gnupg +pillow +pycurl View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f2743228203409e6ac363fb8de0dc0d2dc…

1 0

[Git][gajim/gajim][gajim_0.16] Set correct working dir before creating link
by Philipp Hörist 28 Dec '16

28 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 9e53ed97 by Philipp Hörist at 2016-12-28T17:43:54+01:00 Set correct working dir before creating link - - - - - 1 changed file: - gajim.nsi Changes: ===================================== gajim.nsi ===================================== --- a/gajim.nsi +++ b/gajim.nsi @@ -163,6 +163,7 @@ Section "Gajim" SecGajim WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" + SetOutPath "$INSTDIR\bin" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application SetShellVarContext current CreateDirectory "$SMPROGRAMS\$StartMenuFolder" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e53ed9702ee930d2f79caf6b05b7a7315…

1 0

[Git][gajim/gajim][gajim_0.16] 4 commits: Resolve IP with bonjour in zeroconf
by Philipp Hörist 28 Dec '16

28 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: b645ce85 by Philipp Hörist at 2016-12-18T10:09:10+01:00 Resolve IP with bonjour in zeroconf - - - - - 04f5d65c by Philipp Hörist at 2016-12-18T10:09:13+01:00 Add own logging domain for zeroconf_bonjour - - - - - 85317bd8 by Philipp Hörist at 2016-12-18T18:59:36+01:00 Make bonjour zeroconf more resilient against errors Catch bonjour 'ServiceNotRunning' Error Query TXT Records with DNSServiceQueryRecord - - - - - e7fe1a69 by Philipp Hörist at 2016-12-28T15:59:09+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' Fix broken zeroconf on Windows Fixes #8448, #8473 See merge request !6 - - - - - 4 changed files: - src/common/zeroconf/client_zeroconf.py - src/common/zeroconf/connection_zeroconf.py - src/common/zeroconf/zeroconf_avahi.py - src/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== src/common/zeroconf/client_zeroconf.py ===================================== --- a/src/common/zeroconf/client_zeroconf.py +++ b/src/common/zeroconf/client_zeroconf.py @@ -669,7 +669,7 @@ class ClientZeroconf: def resolve_all(self): if self.zeroconf: - self.zeroconf.resolve_all() + return self.zeroconf.resolve_all() def reannounce(self, txt): self.remove_announce() ===================================== src/common/zeroconf/connection_zeroconf.py ===================================== --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -138,7 +138,9 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _on_resolve_timeout(self): if self.connected: - self.connection.resolve_all() + if not self.connection.resolve_all(): + self._on_disconnected() + return False diffs = self.roster.getDiffs() for key in diffs: self.roster.setItem(key) @@ -221,7 +223,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): else: # result is None gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not start local service'), - msg=_('Please check if avahi-daemon is running.'))) + msg=_('Please check if avahi/bonjour-daemon is running.'))) self.disconnect() return else: ===================================== src/common/zeroconf/zeroconf_avahi.py ===================================== --- a/src/common/zeroconf/zeroconf_avahi.py +++ b/src/common/zeroconf/zeroconf_avahi.py @@ -453,7 +453,7 @@ class Zeroconf: # refresh txt data of all contacts manually (no callback available) def resolve_all(self): if not self.connected: - return + return False for val in self.contacts.values(): # get txt data from last recorded resolved info # TODO: Better try to get it from last IPv6 mDNS, then last IPv4? @@ -463,6 +463,7 @@ class Zeroconf: self.avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved_all_callback, error_handler=self.error_callback) + return True def get_contacts(self): return self.contacts ===================================== src/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/src/common/zeroconf/zeroconf_bonjour.py +++ b/src/common/zeroconf/zeroconf_bonjour.py @@ -18,22 +18,27 @@ ## from common import gajim +import logging import select +import socket import re -from common.zeroconf.zeroconf import C_BARE_NAME, C_DOMAIN, C_TXT +from common.zeroconf.zeroconf import C_BARE_NAME, C_DOMAIN, C_TXT, C_RESOLVED_INFO + +log = logging.getLogger('gajim.c.z.zeroconf_bonjour') try: import pybonjour except ImportError, e: pass +kDNSServiceErr_ServiceNotRunning = -65563 +C_RI_FULLNAME = 3 resolve_timeout = 1 class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, disconnected_CB, error_CB, name, host, port): - self.domain = None # specific domain to browse self.stype = '_presence._tcp' self.port = port # listening port that gets announced self.username = name @@ -52,14 +57,16 @@ class Zeroconf: self.connected = False self.announced = False self.invalid_self_contact = {} + self.resolved_contacts = {} self.resolved = [] - + self.queried = [] def browse_callback(self, sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain): - gajim.log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype)) + log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype)) if not self.connected: return if errorCode != pybonjour.kDNSServiceErr_NoError: + log.debug('Error in browse_callback: %s', str(errorCode)) return if not (flags & pybonjour.kDNSServiceFlagsAdd): self.remove_service_callback(serviceName) @@ -72,7 +79,7 @@ class Zeroconf: while not self.resolved: ready = select.select([resolve_sdRef], [], [], resolve_timeout) if resolve_sdRef not in ready[0]: - gajim.log.debug('Resolve timed out') + log.info('Resolve timed out') break pybonjour.DNSServiceProcessResult(resolve_sdRef) else: @@ -81,7 +88,7 @@ class Zeroconf: resolve_sdRef.close() def remove_service_callback(self, name): - gajim.log.debug('Service %s disappeared.' % name) + log.info('Service %s disappeared.' % name) if not self.connected: return if name != self.name: @@ -91,20 +98,40 @@ class Zeroconf: self.remove_serviceCB(key) return - def new_domain_callback(self, interface, protocol, domain, flags): - if domain != "local": - self.browse_domain(interface, protocol, domain) - # takes a TXTRecord instance def txt_array_to_dict(self, txt): items = pybonjour.TXTRecord.parse(txt)._items return dict((v[0], v[1]) for v in items.values()) - def service_resolved_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname, - hosttarget, port, txtRecord): + def query_txt_callback(self, sdRef, flags, interfaceIndex, errorCode, hosttarget, + rrtype, rrclass, rdata, ttl): + + if errorCode != pybonjour.kDNSServiceErr_NoError: + log.error('Error in query_record_callback: %s', str(errorCode)) + return + + result = re.split('(?<!\\\\)\.', hosttarget) + name = result[0] + + if name != self.name: + # update TXT data only, as intended according to resolve_all comment + old_contact = self.contacts[name] + self.contacts[name] = old_contact[0:C_TXT] + (rdata,) + old_contact[C_TXT+1:] + log.debug(self.contacts[name]) + + self.queried.append(True) + + def query_record_callback(self, sdRef, flags, interfaceIndex, errorCode, hosttarget, + rrtype, rrclass, rdata, ttl): + + if errorCode != pybonjour.kDNSServiceErr_NoError: + log.error('Error in query_record_callback: %s', str(errorCode)) + return + + fullname, port, txtRecord = self.resolved_contacts[hosttarget] # TODO: do proper decoding... - escaping= { + escaping = { r'\.': '.', r'\032': ' ', r'\064': '@', @@ -120,9 +147,12 @@ class Zeroconf: name = name.replace(src, trg) txt = pybonjour.TXTRecord.parse(txtRecord) + ip = socket.inet_ntoa(rdata) - gajim.log.debug('Service data for service %s on %i:' % (fullname, interfaceIndex)) - gajim.log.debug('Host %s, port %i, TXT data: %s' % (hosttarget, port, txt._items)) + log.info('Service data for service %s on %i:' + % (fullname, interfaceIndex)) + log.info('Host %s, ip %s, port %i, TXT data: %s' + % (hosttarget, ip, port, txt._items)) if not self.connected: return @@ -133,7 +163,7 @@ class Zeroconf: # we don't want to see ourselves in the list if name != self.name: - resolved_info = [(interfaceIndex, protocol, hosttarget, -1, port)] + resolved_info = [(interfaceIndex, protocol, hosttarget, fullname, ip, port)] self.contacts[name] = (name, domain, resolved_info, bare_name, txtRecord) self.new_serviceCB(name) @@ -142,45 +172,55 @@ class Zeroconf: # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, (interfaceIndex, protocol, hosttarget, -1, port), bare_name, txtRecord) - # count services - self.resolved.append(True) + self.invalid_self_contact[name] = \ + (name, domain, + (interfaceIndex, protocol, hosttarget, fullname, ip, port), + bare_name, txtRecord) - # different handler when resolving all contacts - def service_resolved_all_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname, hosttarget, port, txtRecord): - if not self.connected: - return + self.queried.append(True) - escaping= { - r'\.': '.', - r'\032': ' ', - r'\064': '@', - } + def service_resolved_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname, + hosttarget, port, txtRecord): - name, stype, protocol, domain, dummy = fullname.split('.') + if errorCode != pybonjour.kDNSServiceErr_NoError: + log.error('Error in service_resolved_callback: %s', str(errorCode)) + return - # Replace the escaped values - for src, trg in escaping.items(): - name = name.replace(src, trg) + self.resolved_contacts[hosttarget] = (fullname, port, txtRecord) - bare_name = name - if name.find('@') == -1: - name = name + '@' + name + try: + query_sdRef = \ + pybonjour.DNSServiceQueryRecord(interfaceIndex = interfaceIndex, + fullname = hosttarget, + rrtype = pybonjour.kDNSServiceType_A, + callBack = self.query_record_callback) + + while not self.queried: + ready = select.select([query_sdRef], [], [], resolve_timeout) + if query_sdRef not in ready[0]: + print 'Query record timed out' + break + pybonjour.DNSServiceProcessResult(query_sdRef) + else: + self.queried.pop() - # we don't want to see ourselves in the list - if name != self.name: - # update TXT data only, as intended according to resolve_all comment - old_contact = self.contacts[name] - self.contacts[name] = old_contact[0:C_TXT] + (self.txt,) + old_contact[C_TXT+1:] + except pybonjour.BonjourError, e: + if e[0][0] == kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + else: + self.error_CB(_('Error while adding service. %s') % str(e[0][0])) + finally: + query_sdRef.close() + + self.resolved.append(True) def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain): if errorCode == pybonjour.kDNSServiceErr_NoError: - gajim.log.debug('Service successfully added') + log.info('Service successfully added') - def service_add_fail_callback(self, err): - if err[0][0] == pybonjour.kDNSServiceErr_NameConflict: - gajim.log.debug('Error while adding service. %s' % str(err)) + elif errorCode == pybonjour.kDNSServiceErr_NameConflict: + log.error('Error while adding service. %s' % str(err)) parts = self.username.split(' ') #check if last part is a number and if, increment it @@ -190,9 +230,8 @@ class Zeroconf: stripped = 1 alternative_name = self.username + str(stripped+1) self.name_conflictCB(alternative_name) - return - self.error_CB(_('Error while adding service. %s') % str(err)) - self.disconnect() + else: + self.error_CB(_('Error while adding service. %s') % str(err)) # make zeroconf-valid names def replace_show(self, show): @@ -221,20 +260,26 @@ class Zeroconf: txt['status'] = 'avail' self.txt = pybonjour.TXTRecord(txt, strict=True) - try: - sdRef = pybonjour.DNSServiceRegister(name = self.name, - regtype = self.stype, port = self.port, txtRecord = self.txt, - callBack = self.service_added_callback) - self.service_sdRef = sdRef - except pybonjour.BonjourError, e: - self.service_add_fail_callback(e) - else: - gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) + self.service_sdRef = pybonjour.DNSServiceRegister( + name=self.name, + regtype=self.stype, + port=self.port, + txtRecord=self.txt, + callBack=self.service_added_callback) + + log.info('Publishing service %s of type %s' % (self.name, self.stype)) + + ready = select.select([self.service_sdRef], [], []) + if self.service_sdRef in ready[0]: + pybonjour.DNSServiceProcessResult(self.service_sdRef) - ready = select.select([sdRef], [], [], resolve_timeout) - if sdRef in ready[0]: - pybonjour.DNSServiceProcessResult(sdRef) + except pybonjour.BonjourError, e: + if e[0][0] == kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + else: + self.error_CB(_('Error while adding service. %s') % str(e[0][0])) + self.disconnect() def announce(self): if not self.connected: @@ -252,27 +297,20 @@ class Zeroconf: self.announced = False return True except pybonjour.BonjourError, e: - gajim.log.debug(e) + log.debug(e) return False - def connect(self): self.name = self.username + '@' + self.host # service name self.connected = True # start browsing - if self.domain is None: - # Explicitly browse .local - self.browse_domain() - - # Browse for other browsable domains - #self.domain_sdRef = pybonjour.DNSServiceEnumerateDomains(flags, interfaceIndex=0, callBack=self.new_domain_callback) - + if self.browse_domain(): + return True else: - self.browse_domain(self.domain) - - return True + self.disconnect() + return False def disconnect(self): if self.connected: @@ -282,39 +320,72 @@ class Zeroconf: self.remove_announce() def browse_domain(self, domain=None): - gajim.log.debug('starting to browse') try: - self.browse_sdRef = pybonjour.DNSServiceBrowse(regtype=self.stype, domain=domain, callBack=self.browse_callback) + self.browse_sdRef = pybonjour.DNSServiceBrowse( + regtype=self.stype, domain=domain, callBack=self.browse_callback) + log.info('Starting to browse .local') + return True except pybonjour.BonjourError, e: - self.error_CB("Error while browsing: %s" % e) + if e[0][0] == kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + else: + log.error('Error while browsing for services. %s', str(e[0][0])) + return False def browse_loop(self): - ready = select.select([self.browse_sdRef], [], [], 0) - if self.browse_sdRef in ready[0]: - pybonjour.DNSServiceProcessResult(self.browse_sdRef) + try: + ready = select.select([self.browse_sdRef], [], [], 0) + if self.browse_sdRef in ready[0]: + pybonjour.DNSServiceProcessResult(self.browse_sdRef) + except pybonjour.BonjourError, e: + if e[0][0] == kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + return False + else: + log.error('Error while browsing for services. %s', + str(e[0][0])) + return True - # refresh txt data of all contacts manually (no callback available) + # resolve_all() is called every X seconds and querys for new clients + # and monitors TXT records for changed status def resolve_all(self): if not self.connected: - return - + return False # for now put here as this is synchronous - self.browse_loop() + if not self.browse_loop(): + return False + # Monitor TXT Records with DNSServiceQueryRecord because + # its more efficient (see pybonjour documentation) for val in self.contacts.values(): - resolve_sdRef = pybonjour.DNSServiceResolve(0, - pybonjour.kDNSServiceInterfaceIndexAny, val[C_BARE_NAME], - self.stype + '.', val[C_DOMAIN] + '.', - self.service_resolved_all_callback) - try: - ready = select.select([resolve_sdRef], [], [], resolve_timeout) - if resolve_sdRef not in ready[0]: - gajim.log.debug('Resolve timed out (in resolve_all)') - break - pybonjour.DNSServiceProcessResult(resolve_sdRef) + query_sdRef = \ + pybonjour.DNSServiceQueryRecord( + interfaceIndex=pybonjour.kDNSServiceInterfaceIndexAny, + fullname=val[C_RESOLVED_INFO][0][C_RI_FULLNAME], + rrtype=pybonjour.kDNSServiceType_TXT, + callBack=self.query_txt_callback) + + while not self.queried: + ready = select.select([query_sdRef], [], [], resolve_timeout) + if query_sdRef not in ready[0]: + log.info('Query record timed out') + break + pybonjour.DNSServiceProcessResult(query_sdRef) + else: + self.queried.pop() + + except pybonjour.BonjourError, e: + if e[0][0] == kDNSServiceErr_ServiceNotRunning: + log.info('Service not running') + return False + else: + log.error('Error in query for TXT records. %s', + str(e[0][0])) finally: - resolve_sdRef.close() + query_sdRef.close() + + return True def get_contacts(self): return self.contacts @@ -324,7 +395,7 @@ class Zeroconf: return None return self.contacts[jid] - def update_txt(self, show = None): + def update_txt(self, show=None): if show: self.txt['status'] = self.replace_show(show) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8a3ddae3eb836ad59ed4cbdc4e6355dd7…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2016