Commits January 2010

commits@gajim.org

7 participants
107 discussions

gajim: fix some typo
by Yann Leboulanger 12 Jan '10

12 Jan '10

changeset e59a89573e32 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e59a89573e32 description: fix some typo diffstat: debian/control | 2 +- debian/copyright | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r f9c12d1db3fc -r e59a89573e32 debian/control --- a/debian/control Tue Jan 12 06:58:43 2010 +0100 +++ b/debian/control Tue Jan 12 07:01:16 2010 +0100 @@ -15,7 +15,7 @@ XB-Python-Version: ${python:Versions} Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomeikeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng Description: Jabber client written in PyGTK 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, diff -r f9c12d1db3fc -r e59a89573e32 debian/copyright --- a/debian/copyright Tue Jan 12 06:58:43 2010 +0100 +++ b/debian/copyright Tue Jan 12 07:01:16 2010 +0100 @@ -2,7 +2,7 @@ Wed, 16 Jun 2005 20:00:00 +0100. It was downloaded from: - http://www.gajim.org/downloads/gajim-0.13.tar.gz + http://www.gajim.org/downloads/ Upstream Authors: - Yann Le Boulanger <asterix(a)lagaule.org>

1 0

gajim: update debian files from 0.13.1 package
by Yann Leboulanger 12 Jan '10

12 Jan '10

changeset f9c12d1db3fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f9c12d1db3fc description: update debian files from 0.13.1 package diffstat: debian/changelog | 34 ++++++++++++++++++++++++++++++++++ debian/compat | 2 +- debian/control | 16 ++++++++-------- debian/copyright | 8 ++++---- debian/gajim.lintian | 1 - debian/gajim.manpages | 2 ++ debian/rules | 1 - 7 files changed, 49 insertions(+), 15 deletions(-) diffs (128 lines): diff -r b3a57d51994c -r f9c12d1db3fc debian/changelog --- a/debian/changelog Mon Jan 11 14:02:20 2010 +0100 +++ b/debian/changelog Tue Jan 12 06:58:43 2010 +0100 @@ -1,3 +1,37 @@ +gajim (0.13.1-1) unstable; urgency=low + + * New upstream release. Closes: #559905 + * Update PyGTK requirement to 2.12.0 minimum + * Fix filetransfer proxies testing, keepalive handling, memory leak. + Closes: #524514 + * Better connection. Closes: #547267 + * Fix proxy test on startup. Closes: #453910 + * Fix sound playing. Closes: #527275 + * Update debhelper compatibility level to 7 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 29 Nov 2009 01:21:04 +0100 + +gajim (0.12.5-1) unstable; urgency=low + + * New upstream release which fixes file transfer. Closes: #544466 + * Fix history manager. Closes: #539109 + * Fix custom host / port usage. Closes: #539267 + * update python-gnome* dependancies. Closes: #541553 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 08 Aug 2009 00:06:15 +0100 + +gajim (0.12.3-1) unstable; urgency=low + + * New upstream release. + * OS info are now caches. Closes: #509675 + * keepalive system has been improved. Closes: #521144 + * Recommends python-crypto for encryption. Closes: #513892 + * update to 3.8.2 Debian Policy + * update to debhelper V6 + * added watch file + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 24 Jun 2009 20:46:15 +0100 + gajim (0.12.1-1) unstable; urgency=low * New upstream release. diff -r b3a57d51994c -r f9c12d1db3fc debian/compat --- a/debian/compat Mon Jan 11 14:02:20 2010 +0100 +++ b/debian/compat Tue Jan 12 06:58:43 2010 +0100 @@ -1,1 +1,1 @@ -4 +7 diff -r b3a57d51994c -r f9c12d1db3fc debian/control --- a/debian/control Mon Jan 11 14:02:20 2010 +0100 +++ b/debian/control Tue Jan 12 06:58:43 2010 +0100 @@ -1,21 +1,21 @@ Source: gajim Section: net Priority: optional -Maintainer: Yann Le Boulanger <asterix(a)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 (>= 0.17-4), libxss-dev, intltool (>= 0.40.1), imagemagick, python-central (>= 0.5), libdbus-1-dev +Maintainer: Yann Leboulanger <asterix(a)lagaule.org> +Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, python-central (>= 0.5) Build-Conflicts: python2.3 XS-Python-Version: >= 2.4 -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Homepage: http://www.gajim.org -Vcs-Svn: svn://svn.gajim.org/gajim/ -Vcs-Browser: http://trac.gajim.org/browser +Vcs-Hg: http://hg.gajim.org/gajim/ +Vcs-Browser: http://hg.gajim.org/gajim/file Package: gajim Architecture: any XB-Python-Version: ${python:Versions} -Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.12.0), python-pysqlite2 | python (>= 2.5), dnsutils, libc6 -Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl -Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring, python-sexy, python-kerberos (>= 1.1) +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils +Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomeikeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng Description: Jabber client written in PyGTK 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, diff -r b3a57d51994c -r f9c12d1db3fc debian/copyright --- a/debian/copyright Mon Jan 11 14:02:20 2010 +0100 +++ b/debian/copyright Tue Jan 12 06:58:43 2010 +0100 @@ -2,12 +2,12 @@ Wed, 16 Jun 2005 20:00:00 +0100. It was downloaded from: - http://www.gajim.org/downloads/gajim-0.11.0.tar.gz + http://www.gajim.org/downloads/gajim-0.13.tar.gz Upstream Authors: - Yann Le Boulanger <asterix(a)lagaule.org> - - Dimitur Kirov <dkirov(a)gmail.com> - - Travis Shirk <travis(a)pobox.com> + - Jean-Marie Traissard <jim(a)lapin.org> + - Stephan Erb <steve-e(a)h3c.de> Copyright: (c) 2003-2009 Gajim Team @@ -22,7 +22,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Debian system; see the file /usr/share/common-licenses/GPL. If not, +along with Debian system; see the file /usr/share/common-licenses/GPL-3. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff -r b3a57d51994c -r f9c12d1db3fc debian/gajim.lintian --- a/debian/gajim.lintian Mon Jan 11 14:02:20 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -gajim binary: script-not-executable diff -r b3a57d51994c -r f9c12d1db3fc debian/gajim.manpages --- a/debian/gajim.manpages Mon Jan 11 14:02:20 2010 +0100 +++ b/debian/gajim.manpages Tue Jan 12 06:58:43 2010 +0100 @@ -1,1 +1,3 @@ data/gajim.1 +data/gajim-remote.1 +debian/gajim-history-manager.1 diff -r b3a57d51994c -r f9c12d1db3fc debian/rules --- a/debian/rules Mon Jan 11 14:02:20 2010 +0100 +++ b/debian/rules Tue Jan 12 06:58:43 2010 +0100 @@ -16,4 +16,3 @@ rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py* dh_pysupport -pgajim convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm - install -m 0644 debian/gajim.lintian $(DEB_DESTDIR)/usr/share/lintian/overrides/gajim

1 0

gajim: fix some typo
by Yann Leboulanger 12 Jan '10

12 Jan '10

changeset a7734a229bc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7734a229bc3 description: fix some typo diffstat: debian/control | 2 +- debian/copyright | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 21f4c9664ceb -r a7734a229bc3 debian/control --- a/debian/control Tue Jan 12 06:58:43 2010 +0100 +++ b/debian/control Tue Jan 12 07:01:16 2010 +0100 @@ -15,7 +15,7 @@ XB-Python-Version: ${python:Versions} Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomeikeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng Description: Jabber client written in PyGTK 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, diff -r 21f4c9664ceb -r a7734a229bc3 debian/copyright --- a/debian/copyright Tue Jan 12 06:58:43 2010 +0100 +++ b/debian/copyright Tue Jan 12 07:01:16 2010 +0100 @@ -2,7 +2,7 @@ Wed, 16 Jun 2005 20:00:00 +0100. It was downloaded from: - http://www.gajim.org/downloads/gajim-0.13.tar.gz + http://www.gajim.org/downloads/ Upstream Authors: - Yann Le Boulanger <asterix(a)lagaule.org>

1 0

gajim: update debian files from 0.13.1 package
by Yann Leboulanger 12 Jan '10

12 Jan '10

changeset 21f4c9664ceb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21f4c9664ceb description: update debian files from 0.13.1 package diffstat: debian/changelog | 34 ++++++++++++++++++++++++++++++++++ debian/compat | 2 +- debian/control | 16 ++++++++-------- debian/copyright | 8 ++++---- debian/gajim.lintian | 1 - debian/gajim.manpages | 2 ++ debian/rules | 1 - 7 files changed, 49 insertions(+), 15 deletions(-) diffs (128 lines): diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/changelog --- a/debian/changelog Wed Jan 06 18:20:51 2010 +0100 +++ b/debian/changelog Tue Jan 12 06:58:43 2010 +0100 @@ -1,3 +1,37 @@ +gajim (0.13.1-1) unstable; urgency=low + + * New upstream release. Closes: #559905 + * Update PyGTK requirement to 2.12.0 minimum + * Fix filetransfer proxies testing, keepalive handling, memory leak. + Closes: #524514 + * Better connection. Closes: #547267 + * Fix proxy test on startup. Closes: #453910 + * Fix sound playing. Closes: #527275 + * Update debhelper compatibility level to 7 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 29 Nov 2009 01:21:04 +0100 + +gajim (0.12.5-1) unstable; urgency=low + + * New upstream release which fixes file transfer. Closes: #544466 + * Fix history manager. Closes: #539109 + * Fix custom host / port usage. Closes: #539267 + * update python-gnome* dependancies. Closes: #541553 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 08 Aug 2009 00:06:15 +0100 + +gajim (0.12.3-1) unstable; urgency=low + + * New upstream release. + * OS info are now caches. Closes: #509675 + * keepalive system has been improved. Closes: #521144 + * Recommends python-crypto for encryption. Closes: #513892 + * update to 3.8.2 Debian Policy + * update to debhelper V6 + * added watch file + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 24 Jun 2009 20:46:15 +0100 + gajim (0.12.1-1) unstable; urgency=low * New upstream release. diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/compat --- a/debian/compat Wed Jan 06 18:20:51 2010 +0100 +++ b/debian/compat Tue Jan 12 06:58:43 2010 +0100 @@ -1,1 +1,1 @@ -4 +7 diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/control --- a/debian/control Wed Jan 06 18:20:51 2010 +0100 +++ b/debian/control Tue Jan 12 06:58:43 2010 +0100 @@ -1,21 +1,21 @@ Source: gajim Section: net Priority: optional -Maintainer: Yann Le Boulanger <asterix(a)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 (>= 0.17-4), libxss-dev, intltool (>= 0.40.1), imagemagick, python-central (>= 0.5), libdbus-1-dev +Maintainer: Yann Leboulanger <asterix(a)lagaule.org> +Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, python-central (>= 0.5) Build-Conflicts: python2.3 XS-Python-Version: >= 2.4 -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Homepage: http://www.gajim.org -Vcs-Svn: svn://svn.gajim.org/gajim/ -Vcs-Browser: http://trac.gajim.org/browser +Vcs-Hg: http://hg.gajim.org/gajim/ +Vcs-Browser: http://hg.gajim.org/gajim/file Package: gajim Architecture: any XB-Python-Version: ${python:Versions} -Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.12.0), python-pysqlite2 | python (>= 2.5), dnsutils, libc6 -Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl -Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring, python-sexy, python-kerberos (>= 1.1) +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils +Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomeikeyring, gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng Description: Jabber client written in PyGTK 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, diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/copyright --- a/debian/copyright Wed Jan 06 18:20:51 2010 +0100 +++ b/debian/copyright Tue Jan 12 06:58:43 2010 +0100 @@ -2,12 +2,12 @@ Wed, 16 Jun 2005 20:00:00 +0100. It was downloaded from: - http://www.gajim.org/downloads/gajim-0.11.0.tar.gz + http://www.gajim.org/downloads/gajim-0.13.tar.gz Upstream Authors: - Yann Le Boulanger <asterix(a)lagaule.org> - - Dimitur Kirov <dkirov(a)gmail.com> - - Travis Shirk <travis(a)pobox.com> + - Jean-Marie Traissard <jim(a)lapin.org> + - Stephan Erb <steve-e(a)h3c.de> Copyright: (c) 2003-2009 Gajim Team @@ -22,7 +22,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Debian system; see the file /usr/share/common-licenses/GPL. If not, +along with Debian system; see the file /usr/share/common-licenses/GPL-3. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/gajim.lintian --- a/debian/gajim.lintian Wed Jan 06 18:20:51 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -gajim binary: script-not-executable diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/gajim.manpages --- a/debian/gajim.manpages Wed Jan 06 18:20:51 2010 +0100 +++ b/debian/gajim.manpages Tue Jan 12 06:58:43 2010 +0100 @@ -1,1 +1,3 @@ data/gajim.1 +data/gajim-remote.1 +debian/gajim-history-manager.1 diff -r ab92bf6a9c38 -r 21f4c9664ceb debian/rules --- a/debian/rules Wed Jan 06 18:20:51 2010 +0100 +++ b/debian/rules Tue Jan 12 06:58:43 2010 +0100 @@ -16,4 +16,3 @@ rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py* dh_pysupport -pgajim convert $(DEB_DESTDIR)/usr/share/pixmaps/gajim.png -resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm - install -m 0644 debian/gajim.lintian $(DEB_DESTDIR)/usr/share/lintian/overrides/gajim

1 0

gajim: fix missing import. Fixes #2467
by Yann Leboulanger 11 Jan '10

11 Jan '10

changeset b3a57d51994c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b3a57d51994c description: fix missing import. Fixes #2467 diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r edbeb4d0c5c6 -r b3a57d51994c src/roster_window.py --- a/src/roster_window.py Mon Jan 11 11:15:02 2010 +0100 +++ b/src/roster_window.py Mon Jan 11 14:02:20 2010 +0100 @@ -2322,6 +2322,7 @@ def on_continue2(message, pep_dict): # check if there is an active file transfer + from common.protocol.bytestream import (is_transfer_active) files_props = gajim.interface.instances['file_transfers'].files_props transfer_active = False for x in files_props:

1 0

gajim: [zimio and I] warn user when quitting while file transfer...
by Yann Leboulanger 11 Jan '10

11 Jan '10

changeset edbeb4d0c5c6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=edbeb4d0c5c6 description: [zimio and I] warn user when quitting while file transfers are running. Fixes #2467 diffstat: src/roster_window.py | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diffs (37 lines): diff -r 1bef542cc862 -r edbeb4d0c5c6 src/roster_window.py --- a/src/roster_window.py Sun Jan 10 22:12:12 2010 +0100 +++ b/src/roster_window.py Mon Jan 11 11:15:02 2010 +0100 @@ -2305,7 +2305,7 @@ get_msg = True break - def on_continue2(message, pep_dict): + def on_continue3(message, pep_dict): self.quit_on_next_offline = 0 accounts_to_disconnect = [] for acct in accounts: @@ -2320,6 +2320,24 @@ if not self.quit_on_next_offline: self.quit_gtkgui_interface() + def on_continue2(message, pep_dict): + # check if there is an active file transfer + files_props = gajim.interface.instances['file_transfers'].files_props + transfer_active = False + for x in files_props: + for y in files_props[x]: + if is_transfer_active(files_props[x][y]): + transfer_active = True + break + + if transfer_active: + dialogs.ConfirmationDialog(_('You have running file transfers'), + _('If you quit now, the file(s) being transfered will be ' + 'stopped. Do you still want to quit?'), + on_response_ok=(on_continue3, message, pep_dict)) + return + on_continue3(message, pep_dict) + def on_continue(message, pep_dict): if message is None: # user pressed Cancel to change status message dialog

1 0

gajim: [misc] Fix crash when accepting a video call. Fixes #5545
by Yann Leboulanger 10 Jan '10

10 Jan '10

changeset 1bef542cc862 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1bef542cc862 description: [misc] Fix crash when accepting a video call. Fixes #5545 diffstat: src/common/jingle_rtp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9d53d6a009fa -r 1bef542cc862 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jan 10 16:31:00 2010 +0100 +++ b/src/common/jingle_rtp.py Sun Jan 10 22:12:12 2010 +0100 @@ -74,7 +74,7 @@ params = {'controlling-mode': self.session.weinitiate, 'debug': False} if gajim.config.get('use_stun_server'): stun_server = gajim.config.get('stun_server') - if not stun_server and self._stun_servers: + if not stun_server and self.session.connection._stun_servers: stun_server = self._stun_servers[0]['host'] if stun_server: try:

1 0

gajim: [Jingle] Volume levels are saved, audio UI shows up even ...
by Thibaut GIRKA 10 Jan '10

10 Jan '10

changeset 9d53d6a009fa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d53d6a009fa description: [Jingle] Volume levels are saved, audio UI shows up even if there are errors, until the session ends diffstat: src/chat_control.py | 20 ++++++++++++++++++-- src/common/config.py | 2 ++ src/common/jingle_rtp.py | 10 ++++++++-- src/common/jingle_session.py | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diffs (94 lines): diff -r f2017c741a03 -r 9d53d6a009fa src/chat_control.py --- a/src/chat_control.py Sun Jan 10 10:15:17 2010 +0100 +++ b/src/chat_control.py Sun Jan 10 16:31:00 2010 +0100 @@ -1550,9 +1550,17 @@ self._update_jingle('audio') vbox = self.xml.get_widget('audio_vbox') if self.audio_state == self.JINGLE_STATE_CONNECTED: + # Set volume from config + input_vol = gajim.config.get('audio_input_volume') + output_vol = gajim.config.get('audio_output_volume') + input_vol = max(min(input_vol, 100), 0) + output_vol = max(min(output_vol, 100), 0) + self.xml.get_widget('mic_hscale').set_value(input_vol) + self.xml.get_widget('sound_hscale').set_value(output_vol) + # Show vbox vbox.set_no_show_all(False) vbox.show_all() - else: + elif not self.audio_sid: vbox.set_no_show_all(True) vbox.hide() @@ -1632,9 +1640,17 @@ def on_mic_hscale_value_changed(self, widget): value = widget.get_value() self._get_audio_content().set_mic_volume(value / 100) + # Save volume to config + # FIXME: Putting it here is maybe not the right thing to do? + gajim.config.set('audio_input_volume', value) + def on_sound_hscale_value_changed(self, widget): - pass + value = widget.get_value() + self._get_audio_content().set_out_volume(value / 100) + # Save volume to config + # FIXME: Putting it here is maybe not the right thing to do? + gajim.config.set('audio_output_volume', value) def on_avatar_eventbox_enter_notify_event(self, widget, event): """ diff -r f2017c741a03 -r 9d53d6a009fa src/common/config.py --- a/src/common/config.py Sun Jan 10 10:15:17 2010 +0100 +++ b/src/common/config.py Sun Jan 10 16:31:00 2010 +0100 @@ -277,6 +277,8 @@ 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'], 'video_output_device': [opt_str, 'autovideosink'], + 'audio_input_volume': [opt_int, 50], + 'audio_output_volume': [opt_int, 50], 'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], diff -r f2017c741a03 -r 9d53d6a009fa src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jan 10 10:15:17 2010 +0100 +++ b/src/common/jingle_rtp.py Sun Jan 10 16:31:00 2010 +0100 @@ -268,6 +268,12 @@ """ self.mic_volume.set_property('volume', vol) + def set_out_volume(self, vol): + """ + vol must be between 0 ans 1 + """ + self.out_volume.set_property('volume', vol) + def setup_stream(self): JingleRTPContent.setup_stream(self) @@ -289,10 +295,10 @@ '%s ! audioconvert', _("audio input")) self.sink = self.make_bin_from_config('audio_output_device', - 'audioconvert ! %s', _("audio output")) + 'audioconvert ! volume name=gajim_out_vol ! %s', _("audio output")) self.mic_volume = src_bin.get_by_name('gajim_vol') - self.set_mic_volume(0) + self.out_volume = self.sink.get_by_name('gajim_out_vol') # link gst elements self.pipeline.add(self.sink, src_bin) diff -r f2017c741a03 -r 9d53d6a009fa src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Jan 10 10:15:17 2010 +0100 +++ b/src/common/jingle_session.py Sun Jan 10 16:31:00 2010 +0100 @@ -100,7 +100,7 @@ 'security-info': [self.__ack], #TODO 'session-accept': [self.__on_session_accept, self.__on_content_accept, self.__broadcast, self.__ack], - 'session-info': [self.__on_session_info, self.__broadcast, self.__ack], + 'session-info': [self.__broadcast, self.__on_session_info, self.__ack], 'session-initiate': [self.__on_session_initiate, self.__broadcast, self.__ack], 'session-terminate': [self.__on_session_terminate, self.__broadcast_all,

1 0

gajim: [Djavan] updated brazilian translation
by Yann Leboulanger 10 Jan '10

10 Jan '10

changeset f2017c741a03 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2017c741a03 description: [Djavan] updated brazilian translation diffstat: po/pt_BR.po | 2768 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 1519 insertions(+), 1249 deletions(-) diffs (truncated from 7071 to 300 lines): diff -r c7c26b0e3a1c -r f2017c741a03 po/pt_BR.po --- a/po/pt_BR.po Sun Jan 10 08:42:08 2010 +0200 +++ b/po/pt_BR.po Sun Jan 10 10:15:17 2010 +0100 @@ -2,26 +2,26 @@ # Portuguese translations for Gajim package. # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim package. -# # junix <junix(a)targetlinux.org>, 2005. # Gajim <gajim-devel(a)gajim.org>, 2007. -# Djavan Fagundes <dnoway(a)gmail.com>, 2009. +# Djavan Fagundes <djavan(a)comum.org>, 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-25 22:20+0100\n" -"PO-Revision-Date: 2009-10-30 08:09-0300\n" +"POT-Creation-Date: 2010-01-10 10:13+0100\n" +"PO-Revision-Date: 2009-12-31 23:22-0300\n" "Last-Translator: Djavan Fagundes <dnoway(a)gmail.com>\n" -"Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" +"Language-Team: Brazilian Portuguese <gnome-pt_br-list(a)gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Virtaal 0.5.0\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -"X-Generator: KBabel 1.11.4\n" #: ../data/gajim.desktop.in.in.h:1 msgid "A GTK+ Jabber client" @@ -202,7 +202,7 @@ #: ../data/glade/account_modification_window.glade.h:1 #: ../data/glade/accounts_window.glade.h:1 -#: ../data/glade/preferences_window.glade.h:11 +#: ../data/glade/preferences_window.glade.h:13 msgid "Miscellaneous" msgstr "Diversos" @@ -286,9 +286,9 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100 -#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581 -#: ../src/notify.py:620 ../src/notify.py:632 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156 +#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574 +#: ../src/notify.py:612 ../src/notify.py:624 msgid "Gajim" msgstr "Gajim" @@ -297,9 +297,9 @@ #. General group cannot be changed #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 -#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135 -#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746 -#: ../src/roster_window.py:5268 +#: ../data/glade/preferences_window.glade.h:61 ../src/common/contacts.py:141 +#: ../src/dialogs.py:110 ../src/dialogs.py:120 ../src/roster_window.py:2763 +#: ../src/roster_window.py:5252 msgid "General" msgstr "Geral" @@ -359,21 +359,21 @@ msgstr "Informações sobre você são gravadas no servidor" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646 -#: ../src/config.py:2196 +#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1740 +#: ../src/config.py:2290 msgid "No key selected" msgstr "Nenhuma chave selecionada" #. None means no proxy profile selected #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:37 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158 -#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555 -#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195 -#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308 -#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526 -#: ../src/roster_window.py:2800 ../src/roster_window.py:2806 -#: ../src/roster_window.py:2811 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1253 +#: ../src/config.py:1356 ../src/config.py:1644 ../src/config.py:1649 +#: ../src/config.py:2197 ../src/config.py:2276 ../src/config.py:2289 +#: ../src/config.py:3492 ../src/config.py:3565 ../src/dialogs.py:307 +#: ../src/dialogs.py:309 ../src/dialogs.py:512 ../src/dialogs.py:525 +#: ../src/roster_window.py:2817 ../src/roster_window.py:2823 +#: ../src/roster_window.py:2828 msgid "None" msgstr "Nenhum" @@ -527,8 +527,8 @@ "Considere a possível modificação das regras do seu firewall." #: ../data/glade/accounts_window.glade.h:32 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673 -#: ../src/dialogs.py:830 +#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1767 +#: ../src/dialogs.py:829 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -542,7 +542,7 @@ msgstr "Mes_clar contas" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219 +#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5207 msgid "Re_name" msgstr "Re_nomear" @@ -777,7 +777,7 @@ msgstr "Condições" #: ../data/glade/advanced_notifications_window.glade.h:4 -#: ../data/glade/preferences_window.glade.h:15 +#: ../data/glade/preferences_window.glade.h:17 msgid "Sounds" msgstr "Sons" @@ -794,7 +794,7 @@ msgstr "Totos os status" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:219 +#: ../src/common/commands.py:106 ../src/common/helpers.py:231 msgid "Away" msgstr "Afastado" @@ -811,7 +811,7 @@ msgstr "Possui " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:229 +#: ../src/common/helpers.py:241 msgid "Invisible" msgstr "Invisível" @@ -820,7 +820,7 @@ msgstr "Executar um comando" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:202 +#: ../src/common/helpers.py:214 msgid "Not Available" msgstr "Não disponível" @@ -985,11 +985,11 @@ msgid "Type your new status message" msgstr "Digite sua nova mensagem de status:" -#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613 +#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:657 msgid "Activity:" msgstr "Atividade:" -#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608 +#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:652 msgid "Mood:" msgstr "Humor:" @@ -1078,8 +1078,8 @@ #. Invite to #. Invite to Groupchat -#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174 -#: ../src/roster_window.py:5333 +#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5162 +#: ../src/roster_window.py:5317 msgid "In_vite to" msgstr "Con_vidar para" @@ -1092,8 +1092,8 @@ msgstr "Remo_ver" #. Send Custom Status -#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184 -#: ../src/roster_window.py:5420 +#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5172 +#: ../src/roster_window.py:5404 msgid "Send Cus_tom Status" msgstr "Enviar status perso_nalizado" @@ -1126,8 +1126,8 @@ msgstr "_Permitir que ele/ela veja meu status" #: ../data/glade/contact_context_menu.glade.h:18 -#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247 -#: ../src/roster_window.py:5370 ../src/roster_window.py:5501 +#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5231 +#: ../src/roster_window.py:5354 ../src/roster_window.py:5481 msgid "_Block" msgstr "_Bloquear" @@ -1138,7 +1138,7 @@ #: ../data/glade/contact_context_menu.glade.h:20 #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:8 -#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570 +#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5550 msgid "_History" msgstr "_Histórico" @@ -1159,8 +1159,8 @@ msgstr "_Inscrição" #: ../data/glade/contact_context_menu.glade.h:25 -#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241 -#: ../src/roster_window.py:5364 ../src/roster_window.py:5498 +#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5225 +#: ../src/roster_window.py:5348 ../src/roster_window.py:5478 msgid "_Unblock" msgstr "_Desbloquear" @@ -1251,7 +1251,7 @@ msgid "When a file transfer is complete show a popup notification" msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar" -#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820 +#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:788 msgid "_Continue" msgstr "_Continuar" @@ -1259,7 +1259,7 @@ msgid "_Notify me when a file transfer is complete" msgstr "_Notificar-me quando a transmissão do arquivo terminar" -#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204 +#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:205 msgid "_Open Containing Folder" msgstr "_Abrir pasta do arquivo" @@ -1359,7 +1359,7 @@ msgid "Configure _Room..." msgstr "Configurar _sala..." -#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746 +#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745 msgid "_Bookmark" msgstr "Ma_rcadores" @@ -1423,13 +1423,13 @@ msgid "Create new post" msgstr "Criar nova postagem" -#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244 +#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256 msgid "From" msgstr "De" #. holds subject -#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195 -#: ../src/history_manager.py:226 +#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188 +#: ../src/history_manager.py:219 msgid "Subject" msgstr "Assunto" @@ -1449,8 +1449,8 @@ msgstr "<big>Gerenciador de histórico de conversas do Gajim</big>" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007 -#: ../src/dialogs.py:3104 +#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3056 +#: ../src/dialogs.py:3153 msgid "Delete" msgstr "Deletar" @@ -1504,11 +1504,10 @@ msgstr "_Histórico de conversação" #: ../data/glade/join_groupchat_window.glade.h:2 -#, fuzzy msgid "Bookmark this room" -msgstr "Adicionar esta sala aos marcadores (Ctrl+B)" - -#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076 +msgstr "Adicionar esta sala aos marcadores" + +#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2074 msgid "Join Group Chat" msgstr "Ingressar numa conferência" @@ -1535,8 +1534,8 @@ msgid "Room:" msgstr "Sala:" -#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306

1 0

gajim: Removed alias duplication of some commands
by Alexander Cherniuk 10 Jan '10

10 Jan '10

changeset c7c26b0e3a1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7c26b0e3a1c description: Removed alias duplication of some commands diffstat: src/command_system/implementation/standard.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 00eb52edc960 -r c7c26b0e3a1c src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Jan 08 20:16:15 2010 +0100 +++ b/src/command_system/implementation/standard.py Sun Jan 10 08:42:08 2010 +0200 @@ -171,7 +171,7 @@ raise CommandError(_('Command is not supported for zeroconf accounts')) gajim.connections[self.account].sendPing(self.contact) - @command('dtmf') + @command @documentation(_("Sends DTMF events through an open audio session")) def dtmf(self, events): if not self.audio_sid: @@ -187,7 +187,7 @@ else: raise CommandError(_("No valid DTMF event specified")) - @command('audio') + @command @documentation(_("Toggle audio session")) def audio(self): if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE: @@ -198,7 +198,7 @@ state = self._audio_button.get_active() self._audio_button.set_active(not state) - @command('video') + @command @documentation(_("Toggle video session")) def video(self): if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE:

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2010