Commits September 2011

commits@gajim.org

2 participants
107 discussions

gajim: handle only systray events when using gajim-remote show_n...
by Yann Leboulanger 21 Sep '11

21 Sep '11

changeset 904c620b38d7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=904c620b38d7 description: handle only systray events when using gajim-remote show_next_pending_event. Fixes #6962 diffstat: src/remote_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5c2698ab540f -r 904c620b38d7 src/remote_control.py --- a/src/remote_control.py Tue Sep 20 16:53:29 2011 +0200 +++ b/src/remote_control.py Wed Sep 21 21:53:29 2011 +0200 @@ -604,7 +604,7 @@ Show the window(s) with next pending event in tabbed/group chats """ if gajim.events.get_nb_events(): - account, jid, event = gajim.events.get_first_event() + account, jid, event = gajim.events.get_first_systray_event() if not event: return gajim.interface.handle_event(account, jid, event.type_)

1 0

gajim: don't keep in mem notifications when we handle them Fixes...
by Yann Leboulanger 20 Sep '11

20 Sep '11

changeset 5c2698ab540f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5c2698ab540f description: don't keep in mem notifications when we handle them Fixes #6891 diffstat: src/notify.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (30 lines): diff -r c7c1f5a36d16 -r 5c2698ab540f src/notify.py --- a/src/notify.py Sun Sep 18 16:11:27 2011 +0200 +++ b/src/notify.py Tue Sep 20 16:53:29 2011 +0200 @@ -192,11 +192,14 @@ self.interface.connect_to_signal('NotificationClosed', self.on_closed) def on_action_invoked(self, id_, reason): - self.received.append((id_, time.time(), reason)) if id_ in self.pending: notification = self.pending[id_] notification.on_action_invoked(id_, reason) del self.pending[id_] + return + # got an action on popup that isn't handled yet? Maybe user clicked too + # fast. Remember it. + self.received.append((id_, time.time(), reason)) if len(self.received) > 20: curt = time.time() for rec in self.received: @@ -410,9 +413,8 @@ self.notify_another_way(e) def attach_by_id(self, id_): - self.id = id_ notification_response_manager.attach_to_interface() - notification_response_manager.add_pending(self.id, self) + notification_response_manager.add_pending(id_, self) def notify_another_way(self, e): gajim.log.debug('Error when trying to use notification daemon: %s' % \

1 0

gajim: don't call a function as default function argument! Fixes...
by Yann Leboulanger 18 Sep '11

18 Sep '11

changeset c7c1f5a36d16 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7c1f5a36d16 description: don't call a function as default function argument! Fixes time when sending forwarded message diffstat: src/common/events.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r f2d408703da3 -r c7c1f5a36d16 src/common/events.py --- a/src/common/events.py Sat Sep 17 10:04:15 2011 +0200 +++ b/src/common/events.py Sun Sep 18 16:11:27 2011 +0200 @@ -122,8 +122,10 @@ def remove_account(self, account): del self._events[account] - def create_event(self, type_, parameters, time_ = time.time(), - show_in_roster = False, show_in_systray = True): + def create_event(self, type_, parameters, time_=None, + show_in_roster=False, show_in_systray=True): + if not time_: + time_ = time.time() return Event(type_, time_, parameters, show_in_roster, show_in_systray)

1 0

gajim: Added tag gajim-0.15-beta1 for changeset 50d609e2b30b
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset f18b321a9709 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f18b321a9709 description: Added tag gajim-0.15-beta1 for changeset 50d609e2b30b diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 50d609e2b30b -r f18b321a9709 .hgtags --- a/.hgtags Sat Sep 17 22:22:56 2011 +0200 +++ b/.hgtags Sat Sep 17 22:23:12 2011 +0200 @@ -5,3 +5,4 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 +50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1

1 0

gajim: update windows build script
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset 50d609e2b30b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50d609e2b30b description: update windows build script diffstat: setup_win32.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (18 lines): diff -r 41dd6ee4817d -r 50d609e2b30b setup_win32.py --- a/setup_win32.py Sat Sep 17 19:47:10 2011 +0200 +++ b/setup_win32.py Sat Sep 17 22:22:56 2011 +0200 @@ -49,11 +49,11 @@ setup( name='Gajim', - version='0.14.1', + version='0.15', description='A full featured Jabber client', author='Gajim Development Team', - url='http://www.gajim.org/', - download_url='http://www.gajim.org/downloads.php', + url='http://gajim.org/', + download_url='http://gajim.org/downloads.php', license='GPL', options=options, executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),

1 0

gajim-website: announce 0.15-beta1
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset 849679809f96 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=849679809f96 description: announce 0.15-beta1 diffstat: downloads.php | 6 ++-- index.php | 69 ++++++++++++++++++++++++++++++++++------------------------ 2 files changed, 43 insertions(+), 32 deletions(-) diffs (145 lines): diff -r b823b842faeb -r 849679809f96 downloads.php --- a/downloads.php Wed Aug 31 14:47:30 2011 +0200 +++ b/downloads.php Sat Sep 17 22:08:01 2011 +0200 @@ -8,7 +8,7 @@ $last_version = "0.14.4"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; -printf(_(" A %s version is in test"), "0.15-alpha1"); +printf(_(" A %s version is in test"), "0.15-beta1"); print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -148,8 +148,8 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); -print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-alpha1-1.exe\">"._("Gajim installer")."</a> "; -printf(_("for %s version "), "0.15-alpha1"); +print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta1-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.15-beta1"); print (".\n"); print (" \n"); diff -r b823b842faeb -r 849679809f96 index.php --- a/index.php Wed Aug 31 14:47:30 2011 +0200 +++ b/index.php Sat Sep 17 22:08:01 2011 +0200 @@ -49,45 +49,56 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Alpha-release of Gajim %s"), "0.15"), - 1 => sprintf(_("Gajim %s is here!"), "0.14.4"), - 2 => sprintf(_("Gajim %s is here!"), "0.14.3"), - 3 => sprintf(_("Gajim %s is here!"), "0.14.2"), - 4 => sprintf(_("Gajim %s is here!"), "0.14.1"), - 5 => sprintf(_("Gajim %s is here!"), "0.14")); + 0 => sprintf(_("Beta-release of Gajim %s"), "0.15"), + 1 => sprintf(_("Alpha-release of Gajim %s"), "0.15"), + 2 => sprintf(_("Gajim %s is here!"), "0.14.4"), + 3 => sprintf(_("Gajim %s is here!"), "0.14.3"), + 4 => sprintf(_("Gajim %s is here!"), "0.14.2"), + 5 => sprintf(_("Gajim %s is here!"), "0.14.1"), + 6 => sprintf(_("Gajim %s is here!"), "0.14")); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("27 August 2011"), - 1 => _("22 July 2011"), - 2 => _("19 June 2011"), - 3 => _("07 June 2011"), - 4 => _("26 October 2010"), - 5 => _("02 September 2010")); + 0 => _("17 September 2011"), + 1 => _("27 August 2011"), + 2 => _("22 July 2011"), + 3 => _("19 June 2011"), + 4 => _("07 June 2011"), + 5 => _("26 October 2010"), + 6 => _("02 September 2010")); $array_news_desc = array( - 0 => sprintf(_("Version %s will arrive soon."), "0.15"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), - 5 => sprintf(_("Version %s of Gajim has been released."), "0.14")); + 0 => sprintf(_("Version %s will arrive very soon."), "0.15"), + 1 => sprintf(_("Version %s will arrive soon."), "0.15"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), + 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), + 6 => sprintf(_("Version %s of Gajim has been released."), "0.14")); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.14.4"), - 1 => sprintf(_("What's new since %s:"), "0.14.3"), - 2 => sprintf(_("What's new since %s:"), "0.14.2"), - 3 => sprintf(_("What's new since %s:"), "0.14.1"), - 4 => sprintf(_("What's new since %s:"), "0.14"), - 5 => sprintf(_("What's new since %s:"), "0.13.4")); + 0 => sprintf(_("What's new since %s:"), "0.15-alpha1"), + 1 => sprintf(_("What's new since %s:"), "0.14.4"), + 2 => sprintf(_("What's new since %s:"), "0.14.3"), + 3 => sprintf(_("What's new since %s:"), "0.14.2"), + 4 => sprintf(_("What's new since %s:"), "0.14.1"), + 5 => sprintf(_("What's new since %s:"), "0.14"), + 6 => sprintf(_("What's new since %s:"), "0.13.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Plugins are now translatable"), + 1 => _("Workarround a D-Bus issue with non-character unicode"), + 2 => _("Fix windows usage when GTK library is already in PATH"), + 3 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/41dd6ee4817d/ChangeLog\">"._("Full ChangeLog")."</a> ", + ); + +$array_news_items[1] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), @@ -98,32 +109,32 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Fix translation issue"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9476e66272c3/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.4\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix history viewer"), 1 => _("Fix closing roster window"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/7798a90157c7/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.3\">"._("List of fixed bugs")."</a>", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Fix CPU usage when testing file transfer proxies"), 1 => _("Fix invalid XML char regex"), 2 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/baf4786b33fe/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/d56f061aca8d/ChangeLog\">"._("Full ChangeLog")."</a> ", 1 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[5] = array( +$array_news_items[6] = array( 0 => _("Jingle audio / video chat"), 1 => _("Improve startup time"), 2 => _("Groupchat auto-rejoin"),

1 0

gajim: prepare 0.15-beta1
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset 41dd6ee4817d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=41dd6ee4817d description: prepare 0.15-beta1 diffstat: ChangeLog | 2 ++ autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diffs (34 lines): diff -r bd15254da622 -r 41dd6ee4817d ChangeLog --- a/ChangeLog Sat Sep 17 10:04:15 2011 +0200 +++ b/ChangeLog Sat Sep 17 19:47:10 2011 +0200 @@ -7,6 +7,8 @@ * IBB * Nested roster group * Roster filtrering + * UPower support + * GPG support for windows Gajim 0.14.4 (22 July 2011) diff -r bd15254da622 -r 41dd6ee4817d autogen.sh --- a/autogen.sh Sat Sep 17 10:04:15 2011 +0200 +++ b/autogen.sh Sat Sep 17 19:47:10 2011 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-alpha1" + gajimversion="0.15-beta1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r bd15254da622 -r 41dd6ee4817d src/common/defs.py --- a/src/common/defs.py Sat Sep 17 10:04:15 2011 +0200 +++ b/src/common/defs.py Sat Sep 17 19:47:10 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15-alpha1' +version = '0.15-beta1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: don't force to have a bigger roster window width. see #6967
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset bd15254da622 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd15254da622 description: don't force to have a bigger roster window width. see #6967 diffstat: data/gui/roster_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r edee77edeb8f -r bd15254da622 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Fri Sep 16 23:42:28 2011 +0200 +++ b/data/gui/roster_window.ui Sat Sep 17 10:04:15 2011 +0200 @@ -3,7 +3,7 @@ <requires lib="gtk+" version="2.16"/>  <object class="GtkWindow" id="roster_window"> - <property name="width_request">250</property> + <property name="width_request">85</property> <property name="height_request">200</property> <property name="title" translatable="yes">Gajim</property> <property name="role">roster</property>

1 0

gajim: also replace non-character unicode AFTER decryption. Fixe...
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset edee77edeb8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=edee77edeb8f description: also replace non-character unicode AFTER decryption. Fixes #6974 diffstat: src/common/connection_handlers.py | 2 ++ src/common/stanza_session.py | 3 +++ src/common/xmpp/dispatcher_nb.py | 5 ++++- 3 files changed, 9 insertions(+), 1 deletions(-) diffs (47 lines): diff -r d66a2440ffcb -r edee77edeb8f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Sep 15 22:00:41 2011 +0200 +++ b/src/common/connection_handlers.py Fri Sep 16 23:42:28 2011 +0200 @@ -978,6 +978,8 @@ if keyID: def decrypt_thread(encmsg, keyID, obj): decmsg = self.gpg.decrypt(encmsg, keyID) + decmsg = self.connection.Dispatcher.replace_non_character( + decmsg) # \x00 chars are not allowed in C (so in GTK) obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', '')) diff -r d66a2440ffcb -r edee77edeb8f src/common/stanza_session.py --- a/src/common/stanza_session.py Thu Sep 15 22:00:41 2011 +0200 +++ b/src/common/stanza_session.py Fri Sep 16 23:42:28 2011 +0200 @@ -492,6 +492,9 @@ for child in parsed.getChildren(): stanza.addChild(node=child) + # replace non-character unicode + stranza = self.conn.connection.Dispatcher.replace_non_character(stanza) + return stanza def decrypt(self, ciphertext): diff -r d66a2440ffcb -r edee77edeb8f src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Thu Sep 15 22:00:41 2011 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Fri Sep 16 23:42:28 2011 +0200 @@ -197,6 +197,9 @@ raise ValueError('Incorrect stream start: (%s,%s). Terminating.' % (tag, ns)) + def replace_non_character(self, data): + return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) + def ProcessNonBlocking(self, data): """ Check incoming stream for data waiting @@ -212,7 +215,7 @@ # disconnect method will never be called. # Is this intended? # also look at transports start_disconnect() - data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) + data = self.replace_non_character(data) for handler in self._cycleHandlers: handler(self) if len(self._pendingExceptions) > 0:

1 0

gajim: transform non-character unicode to ? char (\ufffd) as soo...
by Yann Leboulanger 17 Sep '11

17 Sep '11

changeset d66a2440ffcb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d66a2440ffcb description: transform non-character unicode to ? char (\ufffd) as soon as we receive them. Fixes #6974 diffstat: src/common/xmpp/dispatcher_nb.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diffs (44 lines): diff -r c02744737254 -r d66a2440ffcb src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Thu Sep 15 21:51:51 2011 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Thu Sep 15 22:00:41 2011 +0200 @@ -21,6 +21,7 @@ """ import simplexml, sys, locale +import re from xml.parsers.expat import ExpatError from plugin import PlugIn from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, @@ -93,6 +94,24 @@ # Let the dispatcher know if there is support for stream management self.sm = None + # \ufddo -> \ufdef range + c = u'\ufdd0' + r = c.encode('utf8') + while (c < u'\ufdef'): + c = unichr(ord(c) + 1) + r += '|' + c.encode('utf8') + + # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff + c = u'\ufffe' + r += '|' + c.encode('utf8') + r += '|' + unichr(ord(c) + 1).encode('utf8') + while (c < u'\U0010fffe'): + c = unichr(ord(c) + 0x10000) + r += '|' + c.encode('utf8') + r += '|' + unichr(ord(c) + 1).encode('utf8') + + self.invalid_chars_re = re.compile(r) + def getAnID(self): global outgoingID outgoingID += 1 @@ -193,6 +212,7 @@ # disconnect method will never be called. # Is this intended? # also look at transports start_disconnect() + data = re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) for handler in self._cycleHandlers: handler(self) if len(self._pendingExceptions) > 0:

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2011