Commits December 2012

commits@gajim.org

3 participants
51 discussions

gajim: fix demandimport with ipython
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 17cbc1fb12da in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=17cbc1fb12da description: fix demandimport with ipython diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bd08d235e815 -r 17cbc1fb12da src/gajim.py --- a/src/gajim.py Thu Dec 13 10:07:51 2012 +0100 +++ b/src/gajim.py Sun Dec 16 18:29:49 2012 +0100 @@ -73,7 +73,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', - 'Crypto.PublicKey'] + 'Crypto.PublicKey', 'IPython'] if os.name == 'nt': import locale

1 0

gajim: keep in config file room.JID.muc_restore_*. Fixes #7276
by Yann Leboulanger 13 Dec '12

13 Dec '12

changeset bd08d235e815 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd08d235e815 description: keep in config file room.JID.muc_restore_*. Fixes #7276 diffstat: src/common/config.py | 2 ++ src/common/connection.py | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diffs (38 lines): diff -r 9dd95b98e3fe -r bd08d235e815 src/common/config.py --- a/src/common/config.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/config.py Thu Dec 13 10:07:51 2012 +0100 @@ -477,6 +477,8 @@ }, {}), 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], + 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r 9dd95b98e3fe -r bd08d235e815 src/common/connection.py --- a/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 +++ b/src/common/connection.py Thu Dec 13 10:07:51 2012 +0100 @@ -2380,10 +2380,9 @@ tags = {} timeout = gajim.config.get_per('room', room_jid, 'muc_restore_timeout') - if timeout is None: - timeout = gajim.config.get('muc_restore_timeout') * 60 - else: - timeout *= 60 + if timeout is None or timeout == -2: + timeout = gajim.config.get('muc_restore_timeout') + timeout *= 60 if timeout >= 0: last_date = self.last_history_time[room_jid] if last_date == 0: @@ -2394,7 +2393,7 @@ last_date)) tags['since'] = last_date nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') - if nb is None: + if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: don't reconnect a disabled account. Fixes #7265
by Yann Leboulanger 12 Dec '12

12 Dec '12

changeset 9dd95b98e3fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9dd95b98e3fe description: don't reconnect a disabled account. Fixes #7265 diffstat: src/common/connection.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 446cfdc62462 -r 9dd95b98e3fe src/common/connection.py --- a/src/common/connection.py Wed Dec 12 20:34:02 2012 +0100 +++ b/src/common/connection.py Wed Dec 12 22:03:13 2012 +0100 @@ -2668,6 +2668,9 @@ self.connection.send(message) def check_pingalive(self): + if not gajim.config.get_per('accounts', self.name, 'active'): + # Account may have been disabled + return if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect log.warn("No reply received for keepalive ping. Reconnecting.")

1 0

gajim: fix module name
by Yann Leboulanger 12 Dec '12

12 Dec '12

changeset 446cfdc62462 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=446cfdc62462 description: fix module name diffstat: src/common/atom.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 80eff1ccbe42 -r 446cfdc62462 src/common/atom.py --- a/src/common/atom.py Tue Dec 11 07:55:35 2012 +0100 +++ b/src/common/atom.py Wed Dec 12 20:34:02 2012 +0100 @@ -32,7 +32,7 @@ import nbxmpp import time -class PersonConstruct(nb.Node, object): +class PersonConstruct(nbxmpp.Node, object): """ Not used for now, as we don't need authors/contributors in pubsub.com feeds. They rarely exist there

1 0

gajim: don't build non-existing folder.
by Yann Leboulanger 11 Dec '12

11 Dec '12

changeset 80eff1ccbe42 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=80eff1ccbe42 description: don't build non-existing folder. diffstat: src/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r a6934b5d7c0b -r 80eff1ccbe42 src/Makefile.am --- a/src/Makefile.am Sun Dec 09 21:37:51 2012 +0100 +++ b/src/Makefile.am Tue Dec 11 07:55:35 2012 +0100 @@ -7,7 +7,6 @@ $(srcdir)/*.py \ $(srcdir)/common/*.py \ $(srcdir)/common/protocol/*.py \ - $(srcdir)/common/xmpp/*.py \ $(srcdir)/common/zeroconf/*.py \ $(srcdir)/command_system/*.py \ $(srcdir)/command_system/implementation/*.py \

1 0

gajim: Gajim now uses python-nbxmpp library instead of embedding...
by Yann Leboulanger 09 Dec '12

09 Dec '12

changeset a6934b5d7c0b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a6934b5d7c0b description: Gajim now uses python-nbxmpp library instead of embedding it. diffstat: README.html | 1 + src/adhoc_commands.py | 32 +- src/chat_control.py | 9 +- src/common/atom.py | 14 +- src/common/caps_cache.py | 10 +- src/common/commands.py | 24 +- src/common/connection.py | 316 +-- src/common/connection_handlers.py | 227 +- src/common/connection_handlers_events.py | 130 +- src/common/dataforms.py | 26 +- src/common/gajim.py | 21 +- src/common/ged.py | 2 +- src/common/helpers.py | 57 +- src/common/jingle.py | 22 +- src/common/jingle_content.py | 28 +- src/common/jingle_ft.py | 24 +- src/common/jingle_ftstates.py | 10 +- src/common/jingle_rtp.py | 16 +- src/common/jingle_session.py | 79 +- src/common/jingle_transport.py | 36 +- src/common/jingle_xtls.py | 11 +- src/common/message_archiving.py | 44 +- src/common/pep.py | 43 +- src/common/protocol/bytestream.py | 159 +- src/common/proxy65_manager.py | 14 +- src/common/pubsub.py | 46 +- src/common/resolver.py | 4 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 265 +- src/common/xmpp/__init__.py | 18 - src/common/xmpp/auth_nb.py | 724 --------- src/common/xmpp/bosh.py | 581 ------- src/common/xmpp/c14n.py | 59 - src/common/xmpp/client_nb.py | 629 -------- src/common/xmpp/dispatcher_nb.py | 639 -------- src/common/xmpp/features_nb.py | 218 -- src/common/xmpp/idlequeue.py | 550 ------- src/common/xmpp/plugin.py | 96 - src/common/xmpp/protocol.py | 1489 ------------------- src/common/xmpp/proxy_connectors.py | 238 --- src/common/xmpp/roster_nb.py | 368 ---- src/common/xmpp/simplexml.py | 692 -------- src/common/xmpp/smacks.py | 132 - src/common/xmpp/stringprepare.py | 238 --- src/common/xmpp/tls_nb.py | 461 ----- src/common/xmpp/transports_nb.py | 786 ---------- src/common/zeroconf/client_zeroconf.py | 31 +- src/common/zeroconf/connection_handlers_zeroconf.py | 10 +- src/common/zeroconf/connection_zeroconf.py | 6 +- src/dataforms_widget.py | 2 +- src/disco.py | 20 +- src/filetransfers_window.py | 6 +- src/gajim.py | 6 + src/groups.py | 5 +- src/gui_interface.py | 4 +- src/gui_menu_builder.py | 3 +- src/negotiation.py | 16 +- src/roster_window.py | 2 +- src/session.py | 2 - 59 files changed, 898 insertions(+), 8805 deletions(-) diffs (truncated from 13239 to 300 lines): diff -r a026afdb8095 -r a6934b5d7c0b README.html --- a/README.html Sun Dec 09 17:07:50 2012 +0100 +++ b/README.html Sun Dec 09 21:37:51 2012 +0100 @@ -16,6 +16,7 @@ <ul> <li>python2.5 or higher</li> <li>pygtk2.22 or higher</li> +<li>python-nbxmpp</li> </ul> <h2>Optional Runtime Requirements</h2> diff -r a026afdb8095 -r a6934b5d7c0b src/adhoc_commands.py --- a/src/adhoc_commands.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/adhoc_commands.py Sun Dec 09 21:37:51 2012 +0100 @@ -28,7 +28,9 @@ import gobject import gtk -from common import xmpp, gajim, dataforms +import nbxmpp +from common import gajim +from common import dataforms import gtkgui_helpers import dialogs @@ -386,7 +388,7 @@ self.send_command(action) def stage3_next_form(self, command): - if not isinstance(command, xmpp.Node): + if not isinstance(command, nbxmpp.Node): self.stage5(error=_('Service sent malformed data'), senderror=True) return @@ -506,8 +508,8 @@ if errorid: # we've got error code, display appropriate message try: - errorname = xmpp.NS_STANZAS + ' ' + str(errorid) - errordesc = xmpp.ERRORS[errorname][2] + errorname = nbxmpp.NS_STANZAS + ' ' + str(errorid) + errordesc = nbxmpp.ERRORS[errorname][2] error = errordesc.decode('utf-8') del errorname, errordesc except KeyError: # when stanza doesn't have error description @@ -570,9 +572,9 @@ """ Request the command list. Change stage on delivery """ - query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), - queryNS=xmpp.NS_DISCO_ITEMS) - query.setQuerynode(xmpp.NS_COMMANDS) + query = nbxmpp.Iq(typ='get', to=xmpp.JID(self.jid), + queryNS=nbxmpp.NS_DISCO_ITEMS) + query.setQuerynode(nbxmpp.NS_COMMANDS) def callback(response): '''Called on response to query.''' @@ -580,14 +582,14 @@ # is error => error stage error = response.getError() if error: - # extracting error description from xmpp/protocol.py - self.stage5(errorid = error) + # extracting error description + self.stage5(errorid=error) return # no commands => no commands stage # commands => command selection stage query = response.getTag('query') - if query and query.getAttr('node') == xmpp.NS_COMMANDS: + if query and query.getAttr('node') == nbxmpp.NS_COMMANDS: items = query.getTags('item') else: items = [] @@ -609,9 +611,9 @@ assert isinstance(self.commandnode, unicode) assert action in ('execute', 'prev', 'next', 'complete') - stanza = xmpp.Iq(typ='set', to=self.jid) - cmdnode = stanza.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ - 'node':self.commandnode, 'action':action}) + stanza = nbxmpp.Iq(typ='set', to=self.jid) + cmdnode = stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, + attrs={'node':self.commandnode, 'action':action}) if self.sessionid: cmdnode.setAttr('sessionid', self.sessionid) @@ -636,8 +638,8 @@ assert self.commandnode if self.sessionid and self.account.connection: # we already have sessionid, so the service sent at least one reply. - stanza = xmpp.Iq(typ='set', to=self.jid) - stanza.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ + stanza = nbxmpp.Iq(typ='set', to=self.jid) + stanza.addChild('command', namespace=nbxmpp.NS_COMMANDS, attrs={ 'node':self.commandnode, 'sessionid':self.sessionid, 'action':'cancel' diff -r a026afdb8095 -r a6934b5d7c0b src/chat_control.py --- a/src/chat_control.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/chat_control.py Sun Dec 09 21:37:51 2012 +0100 @@ -51,10 +51,11 @@ from common.contacts import GC_Contact from common.logger import constants from common.pep import MOODS, ACTIVITIES -from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC -from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION -from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER -from common.xmpp.protocol import NS_CHATSTATES +from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC +from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION +from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO +from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER +from nbxmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent from common.exceptions import GajimGeneralException diff -r a026afdb8095 -r a6934b5d7c0b src/common/atom.py --- a/src/common/atom.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/atom.py Sun Dec 09 21:37:51 2012 +0100 @@ -29,10 +29,10 @@ # suggestion: rewrite functions that return dates to return standard python time tuples, # exteneded to contain timezone -import xmpp +import nbxmpp import time -class PersonConstruct(xmpp.Node, object): +class PersonConstruct(nb.Node, object): """ Not used for now, as we don't need authors/contributors in pubsub.com feeds. They rarely exist there @@ -40,7 +40,7 @@ def __init__(self, node): ''' Create person construct from node. ''' - xmpp.Node.__init__(self, node=node) + nbxmpp.Node.__init__(self, node=node) def get_name(self): return self.getTagData('name') @@ -63,14 +63,14 @@ '''Conveys an e-mail address associated with the person. Might be None when not set.''') -class Entry(xmpp.Node, object): +class Entry(nbxmpp.Node, object): def __init__(self, node=None): - xmpp.Node.__init__(self, 'entry', node=node) + nbxmpp.Node.__init__(self, 'entry', node=node) def __repr__(self): return '<Atom:Entry object of id="%r">' % self.getAttr('id') -class OldEntry(xmpp.Node, object): +class OldEntry(nbxmpp.Node, object): """ Parser for feeds from pubsub.com. They use old Atom 0.3 format with their extensions @@ -78,7 +78,7 @@ def __init__(self, node=None): ''' Create new Atom 0.3 entry object. ''' - xmpp.Node.__init__(self, 'entry', node=node) + nbxmpp.Node.__init__(self, 'entry', node=node) def __repr__(self): return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id') diff -r a026afdb8095 -r a6934b5d7c0b src/common/caps_cache.py --- a/src/common/caps_cache.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/caps_cache.py Sun Dec 09 21:37:51 2012 +0100 @@ -37,11 +37,13 @@ import logging log = logging.getLogger('gajim.c.caps_cache') -from common.xmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, NS_JINGLE_FILE_TRANSFER) +from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, + NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER] + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, + NS_JINGLE_FILE_TRANSFER] # Query entry status codes NEW = 0 @@ -96,7 +98,7 @@ """ Compute caps hash according to XEP-0115, V1.5 - dataforms are xmpp.DataForms objects as common.dataforms don't allow several + dataforms are nbxmpp.DataForms objects as common.dataforms don't allow several values without a field type list-multi """ def sort_identities_func(i1, i2): diff -r a026afdb8095 -r a6934b5d7c0b src/common/commands.py --- a/src/common/commands.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/commands.py Sun Dec 09 21:37:51 2012 +0100 @@ -22,7 +22,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import xmpp +import nbxmpp import helpers import dataforms import gajim @@ -33,7 +33,7 @@ class AdHocCommand: commandnode = 'command' commandname = 'The Command' - commandfeatures = (xmpp.NS_DATA,) + commandfeatures = (nbxmpp.NS_DATA,) @staticmethod def isVisibleFor(samejid): @@ -56,7 +56,7 @@ assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') - cmd = response.getTag('command', namespace=xmpp.NS_COMMANDS) + cmd = response.getTag('command', namespace=nbxmpp.NS_COMMANDS) cmd.setAttr('sessionid', self.sessionid) cmd.setAttr('node', self.commandnode) cmd.setAttr('status', status) @@ -72,8 +72,8 @@ return response, cmd def badRequest(self, stanza): - self.connection.connection.send(xmpp.Error(stanza, xmpp.NS_STANZAS + \ - ' bad-request')) + self.connection.connection.send(nbxmpp.Error(stanza, + nbxmpp.NS_STANZAS + ' bad-request')) def cancel(self, request): response = self.buildResponse(request, status = 'canceled')[0] @@ -354,14 +354,14 @@ """ Test if the bare jid given is the same as our bare jid """ - return xmpp.JID(jid).getStripped() == self.getOurBareJID() + return nbxmpp.JID(jid).getStripped() == self.getOurBareJID() def commandListQuery(self, con, iq_obj): iq = iq_obj.buildReply('result') jid = helpers.get_full_jid_from_iq(iq_obj) q = iq.getTag('query') # buildReply don't copy the node attribute. Re-add it - q.setAttr('node', xmpp.NS_COMMANDS) + q.setAttr('node', nbxmpp.NS_COMMANDS) for node, cmd in self.__commands.iteritems(): if cmd.isVisibleFor(self.isSameJID(jid)): @@ -394,7 +394,7 @@ q.addChild('identity', attrs = {'type': 'command-node', 'category': 'automation', 'name': cmd.commandname}) - q.addChild('feature', attrs = {'var': xmpp.NS_COMMANDS}) + q.addChild('feature', attrs = {'var': nbxmpp.NS_COMMANDS}) for feature in cmd.commandfeatures: q.addChild('feature', attrs = {'var': feature}) @@ -436,8 +436,8 @@ # and command exist if node not in self.__commands.keys(): self.connection.send( - xmpp.Error(iq_obj, xmpp.NS_STANZAS + ' item-not-found')) - raise xmpp.NodeProcessed + nbxmpp.Error(iq_obj, nbxmpp.NS_STANZAS + ' item-not-found')) + raise nbxmpp.NodeProcessed newcmd = self.__commands[node] if not newcmd.isVisibleFor(self.isSameJID(jid)): @@ -451,7 +451,7 @@ rc = obj.execute(iq_obj) if rc: self.__sessions[(jid, sessionid, node)] = obj - raise xmpp.NodeProcessed + raise nbxmpp.NodeProcessed else: # the command is already running, check for it magictuple = (jid, sessionid, node) @@ -486,4 +486,4 @@ if not rc: del self.__sessions[magictuple] - raise xmpp.NodeProcessed + raise nbxmpp.NodeProcessed diff -r a026afdb8095 -r a6934b5d7c0b src/common/connection.py --- a/src/common/connection.py Sun Dec 09 17:07:50 2012 +0100 +++ b/src/common/connection.py Sun Dec 09 21:37:51 2012 +0100 @@ -52,7 +52,7 @@ if os.name != 'nt': signal.signal(signal.SIGPIPE, signal.SIG_DFL)

1 0

python-nbxmpp: prevent traceback
by Yann Leboulanger 09 Dec '12

09 Dec '12

changeset dacd58839ca8 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=dacd58839ca8 description: prevent traceback diffstat: nbxmpp/client_nb.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r b599a742986d -r dacd58839ca8 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Thu Nov 29 14:58:25 2012 +0100 +++ b/nbxmpp/client_nb.py Sun Dec 09 21:08:11 2012 +0100 @@ -93,7 +93,8 @@ if 'NonBlockingNonSASL' in self.__dict__: self.NonBlockingNonSASL.PlugOut() if 'SASL' in self.__dict__: - if self.SASL.startsasl == 'failure-in-process': + if 'startsasl' in self.SASL.__dict__ and \ + self.SASL.startsasl == 'failure-in-process': sasl_failed = True self.SASL.startsasl = 'failure' self._on_start_sasl()

1 0

gajim: ability to store muc_restore_* per room JID. Fixes #7276
by Yann Leboulanger 09 Dec '12

09 Dec '12

changeset a026afdb8095 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a026afdb8095 description: ability to store muc_restore_* per room JID. Fixes #7276 diffstat: src/common/connection.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (28 lines): diff -r f08e1904c7f9 -r a026afdb8095 src/common/connection.py --- a/src/common/connection.py Sun Dec 09 11:51:36 2012 +0100 +++ b/src/common/connection.py Sun Dec 09 17:07:50 2012 +0100 @@ -2381,7 +2381,12 @@ if not change_nick: t = p.setTag(common.xmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get('muc_restore_timeout') * 60 + timeout = gajim.config.get_per('room', room_jid, + 'muc_restore_timeout') + if timeout is None: + timeout = gajim.config.get('muc_restore_timeout') * 60 + else: + timeout *= 60 if timeout >= 0: last_date = self.last_history_time[room_jid] if last_date == 0: @@ -2391,7 +2396,9 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get('muc_restore_lines') + nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + if nb is None: + nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb if tags:

1 0

gajim: [Knuckles] shown Gajim when we try to run it while it is ...
by Yann Leboulanger 09 Dec '12

09 Dec '12

changeset f08e1904c7f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f08e1904c7f9 description: [Knuckles] shown Gajim when we try to run it while it is already running. Fixes #7274 diffstat: src/gajim.py | 18 ++++++++++++++++++ src/remote_control.py | 13 +++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diffs (52 lines): diff -r 37434ce8d497 -r f08e1904c7f9 src/gajim.py --- a/src/gajim.py Sun Dec 09 12:56:13 2012 +0400 +++ b/src/gajim.py Sun Dec 09 11:51:36 2012 +0100 @@ -359,7 +359,25 @@ # Assume Gajim is running. return True +def show_remote_gajim_roster(): + try: + import dbus + + OBJ_PATH = '/org/gajim/dbus/RemoteObject' + INTERFACE = 'org.gajim.dbus.RemoteInterface' + SERVICE = 'org.gajim.dbus' + + # Attempt to call show_roster + dbus.Interface(dbus.SessionBus().get_object(SERVICE, OBJ_PATH), INTERFACE).__getattr__("show_roster")() + + return True + except Exception: + return False + if pid_alive(): + if (show_remote_gajim_roster()): + print("Gajim is already running, bringing the roster to front...") + sys.exit(0) pix = gtkgui_helpers.get_icon_pixmap('gajim', 48) gtk.window_set_default_icon(pix) # set the icon to all newly opened wind pritext = _('Gajim is already running') diff -r 37434ce8d497 -r f08e1904c7f9 src/remote_control.py --- a/src/remote_control.py Sun Dec 09 12:56:13 2012 +0400 +++ b/src/remote_control.py Sun Dec 09 11:51:36 2012 +0100 @@ -697,6 +697,19 @@ win.window.focus(long(time())) @dbus.service.method(INTERFACE, in_signature='', out_signature='') + def show_roster(self): + """ + Show the roster window + """ + win = gajim.interface.roster.window + win.present() + # preserve the 'steal focus preservation' + if self._is_first(): + win.window.focus(gtk.get_current_event_time()) + else: + win.window.focus(long(time())) + + @dbus.service.method(INTERFACE, in_signature='', out_signature='') def toggle_ipython(self): """ Show/hide the ipython window

1 0

gajim: [Darlan].Update Hebrew translation.
by Denis Fomin 09 Dec '12

09 Dec '12

changeset 37434ce8d497 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37434ce8d497 description: [Darlan].Update Hebrew translation. diffstat: po/he.po | 549 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 266 insertions(+), 283 deletions(-) diffs (truncated from 2014 to 300 lines): diff -r 74a54370f4f1 -r 37434ce8d497 po/he.po --- a/po/he.po Fri Dec 07 17:05:20 2012 +0100 +++ b/po/he.po Sun Dec 09 12:56:13 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-11-15 14:27+0400\n" -"PO-Revision-Date: 2012-11-17 21:33+0200\n" +"PO-Revision-Date: 2012-12-09 10:07+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -30,7 +30,7 @@ #: ../data/gui/account_context_menu.ui.h:3 #: ../data/gui/roster_window.ui.h:3 msgid "_Start Chat..." -msgstr "התחלת _שיחה..." +msgstr "התחל _שיחה..." # הצטרפות אך/ל # שיחה מרובת משתתפים @@ -39,29 +39,29 @@ #: ../data/gui/account_context_menu.ui.h:4 #: ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." -msgstr "שיחת _קבוצה..." +msgstr "הצטרף אל שיחת _קבוצה..." #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." -msgstr "הוספת _איש קשר..." +msgstr "הוסף _איש קשר..." # איתור #: ../data/gui/account_context_menu.ui.h:6 #: ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" -msgstr "מציאת _שירותים" +msgstr "מצא _שירותים" #: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." -msgstr "הרצת _פקודה..." +msgstr "הרץ _פקודה..." #: ../data/gui/account_context_menu.ui.h:8 msgid "_Open Gmail Inbox" -msgstr "_פתיחת תיבת דואר נכנס של GMail" +msgstr "_פתח תיבת דואר נכנס של GMail" #: ../data/gui/account_context_menu.ui.h:9 msgid "_Modify Account" -msgstr "ה_תאמת חשבון" +msgstr "ה_תאם חשבון" #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -106,7 +106,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:9 #: ../data/gui/accounts_window.ui.h:20 msgid "Save pass_word" -msgstr "שמי_רת סיסמה" +msgstr "שמו_ר סיסמה" # BUG: a dot at the end # From: Clipman @@ -144,21 +144,20 @@ # BUG: _underline #: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." -msgstr "ניהול..." +msgstr " נהל... " # BUG: _underline #: ../data/gui/account_creation_wizard_window.ui.h:17 msgid "Use custom hostname/port" -msgstr "התאמת שם מארח\\פתחה" +msgstr "התאם שם מארח\\פורט" #: ../data/gui/account_creation_wizard_window.ui.h:18 msgid "_Hostname:" msgstr "שם מ_ארח:" -# _פתחה: #: ../data/gui/account_creation_wizard_window.ui.h:19 msgid "_Port:" -msgstr "_פתחה:" +msgstr "_פורט:" #: ../data/gui/account_creation_wizard_window.ui.h:20 #: ../data/gui/roster_window.ui.h:8 @@ -188,11 +187,11 @@ # מיידית לאחר ש #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר מיד כאשר אני אלחץ על סיום" +msgstr "התחבר מיידית כאשר אני אלחץ על סיום" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" -msgstr "הגדר את הדיוקן שלי כאשר אני מתחבר/ת" +msgstr "הגדר את הדיוקן שלי בעת התחברותי" #: ../data/gui/account_creation_wizard_window.ui.h:29 msgid "_Finish" @@ -245,13 +244,13 @@ #: ../data/gui/accounts_window.ui.h:5 #: ../src/roster_window.py:5844 msgid "Re_name" -msgstr "_שינוי שם" +msgstr "_שנה שם" #. XML Console enable checkbutton #: ../data/gui/accounts_window.ui.h:6 #: ../data/gui/xml_console_window.ui.h:3 msgid "_Enable" -msgstr "א_פשור" +msgstr "א_פשר" # אימות אלמוני #: ../data/gui/accounts_window.ui.h:7 @@ -260,7 +259,7 @@ #: ../data/gui/accounts_window.ui.h:8 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהיה מחובר אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" # In Hebrew: גאג'ים #. No configured account @@ -280,20 +279,20 @@ # אישי קשר #: ../data/gui/accounts_window.ui.h:10 msgid "Synchronize contacts" -msgstr "סנכרון אנשי קשר" +msgstr "סנכרן אנשי קשר" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחצו בכדי לבקש הרשאות עבור כל אנשי קשר של בחשבון אחר" +msgstr "לחץ בכדי לבקש הרשאות עבור כל אנשי קשר של בחשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" -msgstr "שי_נוי סיסמה" +msgstr "ש_נה סיסמה" # Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" -msgstr "שינוי סיסמת חשבון" +msgstr "שנה סיסמת חשבון" # מנהל, ניהול #: ../data/gui/accounts_window.ui.h:14 @@ -308,7 +307,7 @@ #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" -msgstr "_התאמה למצב־חיבור" +msgstr "_התאם למצב־חיבור" # תשונה #: ../data/gui/accounts_window.ui.h:17 @@ -329,11 +328,11 @@ #: ../data/gui/accounts_window.ui.h:25 msgid "Browse..." -msgstr "עיון..." +msgstr " עיון... " #: ../data/gui/accounts_window.ui.h:26 msgid "Certificate is e_ncrypted" -msgstr "התעודה הינה מו_צפנת" +msgstr "תעודה הינה מו_צפנת" #: ../data/gui/accounts_window.ui.h:27 msgid "Client certificate" @@ -347,7 +346,7 @@ # אתחול #: ../data/gui/accounts_window.ui.h:29 msgid "C_onnect on Gajim startup" -msgstr "התחברות בעת ה_פעלת Gajim" +msgstr "התחבר בעת ה_פעלת Gajim" # BUG: a dot at the end # כאשר ישוגר @@ -359,17 +358,17 @@ # במידה והחיבור #: ../data/gui/accounts_window.ui.h:31 msgid "Auto-reconnect when connection is lost" -msgstr "התחברות אוטומטית כאשר החיבור אובד" +msgstr "התחבר אוטומטית כאשר החיבור אובד" # יו_מני שיחות #: ../data/gui/accounts_window.ui.h:32 msgid "Save conversation _logs for all contacts" -msgstr "שמירת רשו_מות שיחה עבור כל אנשי קשר" +msgstr "שמור רשו_מות שיחה עבור כל אנשי קשר" # כוללני #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" -msgstr "סנכרון מצב חשבון עם מצב־חיבור _גלובלי" +msgstr "סנכרן מצב חשבון עם מצב־חיבור _גלובלי" # BUG: a dot at the end # תיבת אפשרויות @@ -384,7 +383,7 @@ # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 msgid "Use file transfer proxies" -msgstr "שימוש במתווכי העברת קובץ" +msgstr "השתמש במתווכי העברת קובץ" # שיהיו סיכויים גדולים יותר להעברת קובץ לעבוד #: ../data/gui/accounts_window.ui.h:36 @@ -409,12 +408,12 @@ #: ../data/gui/accounts_window.ui.h:38 msgid "_use HTTP__PROXY environment variable" -msgstr "שימוש במשת_ני סביבת HTTP__PROXY" +msgstr "השתמש במשת_ני סביבת HTTP__PROXY" #: ../data/gui/accounts_window.ui.h:39 #: ../data/gui/preferences_window.ui.h:137 msgid "_Manage..." -msgstr "ניהו_ל..." +msgstr " ניהו_ל... " #: ../data/gui/accounts_window.ui.h:40 msgid "<b>Proxy</b>" @@ -431,29 +430,26 @@ # חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 msgid "Send _keep-alive packets" -msgstr "ש_ליחת חבילות keep-alive" +msgstr "ש_לח חבילות keep-alive" # BUG: a dot at the end -# פסק־זמן -# (תם) הזמן המוקצב -# פקיעת זמן #: ../data/gui/accounts_window.ui.h:44 msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" -msgstr "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע תפוגת זמן של חיבור (connection timeout) המביאה לידי ניתוק" +msgstr "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של חיבור (connection timeout) המביאה לידי ניתוק" # התאמה של שם #: ../data/gui/accounts_window.ui.h:45 msgid "Use cust_om hostname/port" -msgstr "ה_תאמת שם מארח\\פתחה" +msgstr "ה_תאמת שם מארח\\פורט" #: ../data/gui/accounts_window.ui.h:46 msgid "_Hostname: " msgstr "שם מ_ארח: " -# יציאה +# יציאה מסוף #: ../data/gui/accounts_window.ui.h:47 msgid "_Port: " -msgstr "_פתחה: " +msgstr "_פורט: " #: ../data/gui/accounts_window.ui.h:48 #: ../data/gui/preferences_window.ui.h:141 @@ -476,7 +472,7 @@ #: ../data/gui/accounts_window.ui.h:52 msgid "Use G_PG Agent" -msgstr "שימוש בסוכן G_PG" +msgstr "השתמש בסוכן G_PG" # BUG: a dot at the end #: ../data/gui/accounts_window.ui.h:53 @@ -507,15 +503,15 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "Co_nnect on Gajim startup" -msgstr "התחברות בעת ה_פעלת Gajim" +msgstr "התחבר בעת ה_פעלת Gajim" #: ../data/gui/accounts_window.ui.h:60 msgid "Synchroni_ze account status with global status" -msgstr "סנכרון מצב חשבון עם מצב־חיבור _גלובלי" +msgstr "סנכרן מצב חשבון עם מצב־חיבור _גלובלי" #: ../data/gui/accounts_window.ui.h:61 msgid "Use cust_om port:" -msgstr "שימוש בפתחה מו_תאמת:" +msgstr "השתמש בפורט מו_תאם:" # BUG: setup, you #: ../data/gui/accounts_window.ui.h:62 @@ -523,7 +519,7 @@ "If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"במידה והפתחה המשתמטת שמצויה בשימוש עבור הודעות נכנסות איננה מתאימה עבור התקנתך ביכולתך לבחור פתחה אחרת כאן.\n"

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 2012