Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: Jabber -> Jabber/XMPP in dialog window
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset d9765722b3ac in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d9765722b3ac description: Jabber -> Jabber/XMPP in dialog window diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5bf6b059b973 -r d9765722b3ac src/dialogs.py --- a/src/dialogs.py Wed Aug 31 14:38:26 2011 +0200 +++ b/src/dialogs.py Wed Aug 31 14:39:49 2011 +0200 @@ -1270,7 +1270,7 @@ text = open(copying_file_path).read() dlg.set_license(text) - dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ jabber client'), + dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), _('GTK+ Version:'), self.tuple2str(gtk.gtk_version), \ _('PyGTK Version:'), self.tuple2str(gtk.pygtk_version))) dlg.set_website('http://www.gajim.org/')

1 0

gajim: fix uninstalling plugins
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset a99f4a4c2a9f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a99f4a4c2a9f description: fix uninstalling plugins diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2d3bc4c35fd9 -r a99f4a4c2a9f src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Wed Aug 31 11:25:47 2011 +0200 +++ b/src/plugins/pluginmanager.py Wed Aug 31 14:29:13 2011 +0200 @@ -540,7 +540,7 @@ self.plugins.remove(plugin) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) - del sys.modules[plugin.__module__.split('.')[-1]] + del sys.modules[plugin.__module__.split('.')[0]] del plugin.__module__.split('.')[-1] del plugin

1 0

gajim: do not create null file when testing gpg. see #6953
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 5bf6b059b973 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5bf6b059b973 description: do not create null file when testing gpg. see #6953 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a99f4a4c2a9f -r 5bf6b059b973 src/common/gajim.py --- a/src/common/gajim.py Wed Aug 31 14:29:13 2011 +0200 +++ b/src/common/gajim.py Wed Aug 31 14:38:26 2011 +0200 @@ -158,7 +158,7 @@ else: import os if os.name == 'nt': - gpg_cmd = 'gpg -h >null 2>&1' + gpg_cmd = 'gpg -h >nul 2>&1' else: gpg_cmd = 'gpg -h >/dev/null 2>&1' if os.system(gpg_cmd):

1 0

gajim-website: Jabber -> Jabber/XMPP
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset b823b842faeb in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=b823b842faeb description: Jabber -> Jabber/XMPP diffstat: docs.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5a4fe67793a8 -r b823b842faeb docs.php --- a/docs.php Wed Aug 31 14:36:17 2011 +0200 +++ b/docs.php Wed Aug 31 14:47:30 2011 +0200 @@ -34,7 +34,7 @@ print ("<a name=\"jabber\"></a>"); print (" <h1>\n"); -print (" Jabber\n"); +print (" Jabber/XMPP\n"); print (" </h1>\n"); print _(" Please read")." <a href=\"http://trac.gajim.org/wiki/GajimHelp#help_quickstart_guides\">"._("here")."</a>.\n";

1 0

gajim: Jabber -> Jabber/XMPP in dialog window
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 7af9e30219df in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7af9e30219df description: Jabber -> Jabber/XMPP in dialog window diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ff0d1952bafb -r 7af9e30219df src/dialogs.py --- a/src/dialogs.py Wed Aug 31 14:38:26 2011 +0200 +++ b/src/dialogs.py Wed Aug 31 14:39:49 2011 +0200 @@ -1270,7 +1270,7 @@ text = open(copying_file_path).read() dlg.set_license(text) - dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ jabber client'), + dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), _('GTK+ Version:'), self.tuple2str(gtk.gtk_version), \ _('PyGTK Version:'), self.tuple2str(gtk.pygtk_version))) dlg.set_website('http://www.gajim.org/')

1 0

gajim: do not create null file when testing gpg. see #6953
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset ff0d1952bafb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff0d1952bafb description: do not create null file when testing gpg. see #6953 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b8f30d4ddce5 -r ff0d1952bafb src/common/gajim.py --- a/src/common/gajim.py Wed Aug 31 14:29:13 2011 +0200 +++ b/src/common/gajim.py Wed Aug 31 14:38:26 2011 +0200 @@ -158,7 +158,7 @@ else: import os if os.name == 'nt': - gpg_cmd = 'gpg -h >null 2>&1' + gpg_cmd = 'gpg -h >nul 2>&1' else: gpg_cmd = 'gpg -h >/dev/null 2>&1' if os.system(gpg_cmd):

1 0

gajim: fix uninstalling plugins
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset b8f30d4ddce5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8f30d4ddce5 description: fix uninstalling plugins diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ba91042aed08 -r b8f30d4ddce5 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Wed Aug 31 11:25:47 2011 +0200 +++ b/src/plugins/pluginmanager.py Wed Aug 31 14:29:13 2011 +0200 @@ -544,7 +544,7 @@ self.plugins.remove(plugin) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) - del sys.modules[plugin.__module__.split('.')[-1]] + del sys.modules[plugin.__module__.split('.')[0]] del plugin.__module__.split('.')[-1] del plugin

1 0

gajim-website: Jabber -> Jabber/XMPP
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 5a4fe67793a8 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=5a4fe67793a8 description: Jabber -> Jabber/XMPP diffstat: index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 28421f2242ce -r 5a4fe67793a8 index.php --- a/index.php Sat Aug 27 18:58:04 2011 +0200 +++ b/index.php Wed Aug 31 14:36:17 2011 +0200 @@ -11,7 +11,7 @@ $tpl->set_var("HELLO", _("Hello and welcome to the Gajim project website")); $array_line_begin = array( - 0 => _("The goal of Gajim is to provide a full featured and easy to use Jabber 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, ")."<a href=\"http://trac.gajim.org/newticket\">"._("please send tickets")."</a>."); + 0 => _("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, ")."<a href=\"http://trac.gajim.org/newticket\">"._("please send tickets")."</a>."); $tpl->set_block("page","LINES_BEGIN","line"); for ($i=0; $i<sizeof($array_line_begin); $i++) {

1 0

gajim: remove no more used patches
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 869c8ae3e83f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=869c8ae3e83f description: remove no more used patches diffstat: debian/patches/00_debian-copying.diff | 23 ----------------------- debian/patches/01_configure-ac.diff | 33 --------------------------------- debian/patches/series | 2 -- 3 files changed, 0 insertions(+), 58 deletions(-) diffs (73 lines): diff -r 340e1392f599 -r 869c8ae3e83f debian/patches/00_debian-copying.diff --- a/debian/patches/00_debian-copying.diff Tue Aug 30 20:39:58 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -Description: don't install useless COPYING file -Forwarded: not-neded - ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,8 +7,6 @@ - docfilesdir = $(docdir) - docfiles_DATA = README \ - README.html \ -- ChangeLog \ -- COPYING \ - THANKS \ - THANKS.artists \ - AUTHORS ---- a/Makefile.in -+++ b/Makefile.in -@@ -298,8 +298,6 @@ - docfilesdir = $(docdir) - docfiles_DATA = README \ - README.html \ -- ChangeLog \ -- COPYING \ - THANKS \ - THANKS.artists \ - AUTHORS diff -r 340e1392f599 -r 869c8ae3e83f debian/patches/01_configure-ac.diff --- a/debian/patches/01_configure-ac.diff Tue Aug 30 20:39:58 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -Description: don't require python headers to remove build-dep on python-dev and python-gtk2-dev -Author: Yann Leboulanger <asterix(a)lagaule.org> -Origin: upstream,http://hg.gajim.org/gajim/diff/252bb3cf2c59/configure.ac -Last-Update: 2011-05-07 - ---- a/configure.ac -+++ b/configure.ac -@@ -36,25 +36,10 @@ - AM_NLS - - --dnl **** --dnl pygtk and gtk+ --dnl **** --PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) --AC_SUBST(PYGTK_CFLAGS) --AC_SUBST(PYGTK_LIBS) --PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFS) -- --AM_PATH_PYTHON([2.5]) --if test "x$PYTHON" = "x:"; then -- AC_MSG_ERROR([Python not found]) --fi -- - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - AC_SUBST(ACLOCAL_AMFLAGS) - --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) --AC_SUBST([PYTHON_INCLUDES]) -+AM_PATH_PYTHON([2.5]) - - dnl **** - dnl enable installation in python-2.x/site-packages/gajim diff -r 340e1392f599 -r 869c8ae3e83f debian/patches/series --- a/debian/patches/series Tue Aug 30 20:39:58 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -00_debian-copying.diff -01_configure-ac.diff

1 0

gajim: make gpg work under windows. Fixes #6953
by Yann Leboulanger 31 Aug '11

31 Aug '11

changeset 2d3bc4c35fd9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d3bc4c35fd9 description: make gpg work under windows. Fixes #6953 diffstat: src/common/gajim.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 869c8ae3e83f -r 2d3bc4c35fd9 src/common/gajim.py --- a/src/common/gajim.py Tue Aug 30 21:40:54 2011 +0200 +++ b/src/common/gajim.py Wed Aug 31 11:25:47 2011 +0200 @@ -156,8 +156,12 @@ except ImportError: HAVE_GPG = False else: - from os import system - if system('gpg -h >/dev/null 2>&1'): + import os + if os.name == 'nt': + gpg_cmd = 'gpg -h >null 2>&1' + else: + gpg_cmd = 'gpg -h >/dev/null 2>&1' + if os.system(gpg_cmd): HAVE_GPG = False # Depends on use_latex option. Will be correctly set after we config options are

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011