Commits November 2014

commits@gajim.org

1 participants
63 discussions

gajim: fix printing error
by Gajim 14 Nov '14

14 Nov '14

changeset 5efde4467299 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5efde4467299 description: fix printing error diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 859c076f5fe3 -r 5efde4467299 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Oct 04 23:37:23 2014 +0200 +++ b/src/common/connection_handlers_events.py Thu Oct 09 22:10:16 2014 +0200 @@ -227,7 +227,7 @@ # Remove the trailing "+00:00" utc_time = utc_time[:-6] else: - log.info("Wrong timezone defintion: %s" % str(e)) + log.info("Wrong timezone defintion: %s" % utc_time) return try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S')

1 0

gajim: fix sending zeroconf messages
by Gajim 14 Nov '14

14 Nov '14

changeset 346cb322c9b6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=346cb322c9b6 description: fix sending zeroconf messages diffstat: src/common/zeroconf/connection_zeroconf.py | 36 +++++++++++++++--------------- 1 files changed, 18 insertions(+), 18 deletions(-) diffs (48 lines): diff -r 5efde4467299 -r 346cb322c9b6 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Thu Oct 09 22:10:16 2014 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Sun Oct 12 15:16:17 2014 +0200 @@ -337,26 +337,26 @@ if obj.account != self.name: return - def on_send_ok(msg_id): - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=obj.keyID, - chatstate=None)) - if obj.callback: - obj.callback(obj.msg_id, *obj.callback_args) - - if not obj.is_loggable: - return - self.log_message(obj.jid, obj.message, obj.forward_from, - obj.session, obj.original_message, obj.subject, obj.type_) - - def on_send_not_ok(reason): - reason += ' ' + _('Your message could not be sent.') - gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, - time_=None, session=obj.session)) - def cb(jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml): + def on_send_ok(msg_id): + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=obj.keyID, + chatstate=None)) + if obj.callback: + obj.callback(msg_iq, *obj.callback_args) + + if not obj.is_loggable: + return + self.log_message(obj.jid, obj.message, obj.forward_from, + obj.session, obj.original_message, obj.subject, obj.type_) + + def on_send_not_ok(reason): + reason += ' ' + _('Your message could not be sent.') + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, + fjid=obj.jid, error_code=-1, error_msg=reason, msg=None, + time_=None, session=obj.session)) + ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok, on_not_ok=on_send_not_ok)

1 0

gajim: Description: Fix markup erros in manpages Manpages have l...
by Gajim 14 Nov '14

14 Nov '14

changeset e3fa9afaf2bf in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e3fa9afaf2bf description: Description: Fix markup erros in manpages Manpages have lists that start with .Bl (begin list) but that have no matching .El (end list). This patch adds them. Author: Tanguy Ortolo <tanguy+debian(a)ortolo.eu> Forwarded: https://trac.gajim.org/ticket/7851 Last-Update: 2014-10-14 diffstat: data/gajim-history-manager.1 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 346cb322c9b6 -r e3fa9afaf2bf data/gajim-history-manager.1 --- a/data/gajim-history-manager.1 Sun Oct 12 15:16:17 2014 +0200 +++ b/data/gajim-history-manager.1 Sat Oct 18 21:58:04 2014 +0200 @@ -24,12 +24,14 @@ Show help options .It Fl c Fl Fl config-path Em directory Where to look for logs file +.El .Sh FILES .Bl -tag -width Ds .It ~/.local/share/gajim/logs.db The history database log file used when .Op Fl c is not specified. +.El .Sh AUTHORS .An -nosplit .Nm

1 0

gajim: Index: gajim/data/gajim-remote.1
by Gajim 14 Nov '14

14 Nov '14

changeset 6dff5df34550 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6dff5df34550 description: Index: gajim/data/gajim-remote.1 =================================================================== diffstat: data/gajim-remote.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r e3fa9afaf2bf -r 6dff5df34550 data/gajim-remote.1 --- a/data/gajim-remote.1 Sat Oct 18 21:58:04 2014 +0200 +++ b/data/gajim-remote.1 Sat Oct 18 21:58:04 2014 +0200 @@ -16,6 +16,7 @@ .Sh OPTIONS .Bl -tag -width Ds .It Available commands +.El .Ss account_info Aq account Gets detailed info on a account .Ss add_contact Ao jid Ac Bq account

1 0

gajim: Index: gajim/data/gajim.1
by Gajim 14 Nov '14

14 Nov '14

changeset ba8b1172707f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ba8b1172707f description: Index: gajim/data/gajim.1 =================================================================== diffstat: data/gajim.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 6dff5df34550 -r ba8b1172707f data/gajim.1 --- a/data/gajim.1 Sat Oct 18 21:58:04 2014 +0200 +++ b/data/gajim.1 Sat Oct 18 21:58:04 2014 +0200 @@ -57,6 +57,7 @@ in configuration directory .It Fl c Fl Fl config-path Em directory Where to look for configuration files +.El .Sh FILES .Bl -tag -width Ds .It ~/.cache/gajim/cache.db

1 0

gajim: [bluec0re] Make ipython_view compatible to version >= 1.0...
by Gajim 14 Nov '14

14 Nov '14

changeset 840876e759b4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=840876e759b4 description: [bluec0re] Make ipython_view compatible to version >= 1.0. Fixes #7868 diffstat: src/ipython_view.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (27 lines): diff -r ba8b1172707f -r 840876e759b4 src/ipython_view.py --- a/src/ipython_view.py Sat Oct 18 21:58:04 2014 +0200 +++ b/src/ipython_view.py Sun Oct 26 16:37:11 2014 +0100 @@ -92,7 +92,10 @@ @type input_func: function """ if input_func: - IPython.frontend.terminal.interactiveshell.raw_input_original = input_func + if IPython.version_info[0] >= 1: + IPython.terminal.interactiveshell.raw_input_original = input_func + else: + IPython.frontend.terminal.interactiveshell.raw_input_original = input_func if cin: IPython.utils.io.stdin = IPython.utils.io.IOStream(cin) if cout: @@ -112,7 +115,10 @@ cfg = Config() cfg.InteractiveShell.colors = "Linux" - self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + if IPython.version_info[0] >= 1: + self.IP = IPython.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + else: + self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', local_ns=user_ns)

1 0

gajim: [bluec0re] Fix bug when server assign a contact to a grou...
by Gajim 14 Nov '14

14 Nov '14

changeset eea8dc540ea5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eea8dc540ea5 description: [bluec0re] Fix bug when server assign a contact to a group with empty name. Fixes #7865 diffstat: src/common/contacts.py | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 840876e759b4 -r eea8dc540ea5 src/common/contacts.py --- a/src/common/contacts.py Sun Oct 26 16:37:11 2014 +0100 +++ b/src/common/contacts.py Sun Oct 26 16:43:44 2014 +0100 @@ -103,7 +103,7 @@ our_chatstate, chatstate, client_caps=client_caps) self.contact_name = '' # nick choosen by contact - self.groups = [i for i in set(groups)] # filter duplicate values + self.groups = [i if i else _('General') for i in set(groups)] # filter duplicate values self.sub = sub self.ask = ask diff -r 840876e759b4 -r eea8dc540ea5 src/roster_window.py --- a/src/roster_window.py Sun Oct 26 16:37:11 2014 +0100 +++ b/src/roster_window.py Sun Oct 26 16:43:44 2014 +0100 @@ -313,7 +313,7 @@ delimiter = gajim.connections[account].nested_group_delimiter group_splited = group.split(delimiter) parent_group = delimiter.join(group_splited[:-1]) - if parent_group in self._iters[account_group]['groups']: + if len(group_splited) > 1 and parent_group in self._iters[account_group]['groups']: iter_parent = self._iters[account_group]['groups'][parent_group] elif parent_group: iter_parent = self._add_group_iter(account, parent_group)

1 0

gajim: handle XEP-191 (blocking command) in a better way: habili...
by Gajim 14 Nov '14

14 Nov '14

changeset c588b95587c5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c588b95587c5 description: handle XEP-191 (blocking command) in a better way: hability to block a contact when server doesn't support privacy lists, add / remove jid to blocked list only when we get the result from server, handle blocked / unblocked contacts by other resources diffstat: src/common/connection.py | 2 -- src/common/connection_handlers.py | 30 +++++++++++++++++++++++++++--- src/common/connection_handlers_events.py | 23 +++++++++++++++++++++++ src/roster_window.py | 21 ++++++++++++++++----- 4 files changed, 66 insertions(+), 10 deletions(-) diffs (163 lines): diff -r 4754b56ec030 -r c588b95587c5 src/common/connection.py --- a/src/common/connection.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/common/connection.py Wed Aug 13 22:46:18 2014 +0200 @@ -1706,7 +1706,6 @@ query = iq.setQuery(name='block') query.setNamespace(nbxmpp.NS_BLOCKING) for contact in contact_list: - self.blocked_contacts.append(contact.jid) query.addChild(name='item', attrs={'jid': contact.jid}) self.connection.send(iq) return @@ -1731,7 +1730,6 @@ query = iq.setQuery(name='unblock') query.setNamespace(nbxmpp.NS_BLOCKING) for contact in contact_list: - self.blocked_contacts.append(contact.jid) query.addChild(name='item', attrs={'jid': contact.jid}) self.connection.send(iq) return diff -r 4754b56ec030 -r c588b95587c5 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/common/connection_handlers.py Wed Aug 13 22:46:18 2014 +0200 @@ -574,9 +574,9 @@ iq = nbxmpp.Iq('get', xmlns='') query = iq.setQuery(name='blocklist') query.setNamespace(nbxmpp.NS_BLOCKING) - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (BLOCKING_ARRIVED, ) + id2_ = self.connection.getAnID() + iq.setID(id2_) + self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) self.connection.send(iq) if self.continue_connect_info and self.continue_connect_info[0]\ @@ -1521,6 +1521,8 @@ self._nec_agent_removed) gajim.ged.register_event_handler('stream-other-host-received', ged.CORE, self._nec_stream_other_host_received) + gajim.ged.register_event_handler('blocking', ged.CORE, + self._nec_blocking) def cleanup(self): ConnectionHandlersBase.cleanup(self) @@ -1565,6 +1567,7 @@ self._nec_agent_removed) gajim.ged.remove_event_handler('stream-other-host-received', ged.CORE, self._nec_stream_other_host_received) + gajim.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -2254,6 +2257,25 @@ jid_from = helpers.get_full_jid_from_iq(iq_obj) jingle_xtls.handle_new_cert(con, iq_obj, jid_from) + def _BlockingSetCB(self, con, iq_obj): + log.debug('_BlockingSetCB') + gajim.nec.push_incoming_event(BlockingEvent(None, conn=self, + stanza=iq_obj)) + raise nbxmpp.NodeProcessed + + def _nec_blocking(self, obj): + if obj.conn.name != self.name: + return + if obj.unblock_all: + self.blocked_contacts = [] + else: + for jid in obj.blocked_jids: + if jid not in self.blocked_contacts: + self.blocked_contacts.append(jid) + for jid in obj.unblocked_jids: + if jid in self.blocked_contacts: + self.blocked_contacts.remove(jid) + def _nec_stream_other_host_received(self, obj): if obj.conn.name != self.name: return @@ -2348,3 +2370,5 @@ nbxmpp.NS_PUBKEY_PUBKEY) con.RegisterHandler('iq', self._PubkeyResultCB, 'result', nbxmpp.NS_PUBKEY_PUBKEY) + con.RegisterHandler('iq', self._BlockingSetCB, 'set', + nbxmpp.NS_BLOCKING) diff -r 4754b56ec030 -r c588b95587c5 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/common/connection_handlers_events.py Wed Aug 13 22:46:18 2014 +0200 @@ -2552,3 +2552,26 @@ def init(self): self.popup = True + +class BlockingEvent(nec.NetworkIncomingEvent): + name = 'blocking' + base_network_events = [] + + def init(self): + self.blocked_jids = [] + self.unblocked_jids = [] + self.unblock_all = False + + def generate(self): + block_tag = self.stanza.getTag('block', namespace=nbxmpp.NS_BLOCKING) + if block_tag: + for item in block_tag.getTags('item'): + self.blocked_jids.append(item.getAttr('jid')) + unblock_tag = self.stanza.getTag('unblock', + namespace=nbxmpp.NS_BLOCKING) + if unblock_tag: + if not unblock_tag.getTags('item'): # unblock all + self.unblock_all = True + for item in unblock_tag.getTags('item'): + self.unblocked_jids.append(item.getAttr('jid')) + return True diff -r 4754b56ec030 -r c588b95587c5 src/roster_window.py --- a/src/roster_window.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/roster_window.py Wed Aug 13 22:46:18 2014 +0200 @@ -3035,6 +3035,14 @@ dialogs.ConfirmationDialog(pritext, sectext, on_response_ok = (remove, list_)) + def _nec_blocking(self, obj): + if obj.unblock_all: + jids = gajim.contacts.get_jid_list(obj.conn.name) + self._idle_draw_jids_of_account(jids, obj.conn.name) + else: + for jid in obj.blocked_jids + obj.unblocked_jids: + self.draw_contact(jid, obj.conn.name) + def on_block(self, widget, list_, group=None): """ When clicked on the 'block' button in context menu. list_ is a list of @@ -3044,9 +3052,9 @@ if msg is None: # user pressed Cancel to change status message dialog return - accounts = [] - accounts = set(i[1] for i in list_ if gajim.connections[i[1]].\ - privacy_rules_supported) + accounts = set(i[1] for i in list_ if (gajim.connections[i[1]].\ + privacy_rules_supported or (group is None and gajim.\ + connections[i[1]].blocking_supported))) if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] @@ -3084,8 +3092,9 @@ """ When clicked on the 'unblock' button in context menu. """ - accounts = set(i[1] for i in list_ if gajim.connections[i[1]].\ - privacy_rules_supported) + accounts = set(i[1] for i in list_ if (gajim.connections[i[1]].\ + privacy_rules_supported or (group is None and gajim.\ + connections[i[1]].blocking_supported))) if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] @@ -6547,3 +6556,5 @@ self._nec_signed_in) gajim.ged.register_event_handler('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received) + gajim.ged.register_event_handler('blocking', ged.GUI1, + self._nec_blocking)

1 0

gajim: fix sending file without jingle when localcert is not yet...
by Gajim 14 Nov '14

14 Nov '14

changeset 7c677497ea8c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7c677497ea8c description: fix sending file without jingle when localcert is not yet generated. diffstat: src/common/socks5.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r c588b95587c5 -r 7c677497ea8c src/common/socks5.py --- a/src/common/socks5.py Wed Aug 13 22:46:18 2014 +0200 +++ b/src/common/socks5.py Fri Aug 22 14:23:05 2014 +0200 @@ -326,7 +326,7 @@ if listener.file_props.type_ == 's' and \ not self.isHashInSockObjs(self.senders, sock_hash): sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, - sock[0], sock[1][0], sock[1][1], fingerprint='server', + sock[0], sock[1][0], sock[1][1], fingerprint=None, file_props=listener.file_props) self._add(sockobj, self.senders, listener.file_props, sock_hash) # Start waiting for data @@ -341,7 +341,7 @@ sh['target'] = None sockobj = Socks5ReceiverServer(idlequeue=self.idlequeue, streamhost=sh,sid=None, file_props=listener.file_props, - fingerprint='server') + fingerprint=None) self._add(sockobj, self.readers, listener.file_props, sock_hash) sockobj.set_sock(sock[0])

1 0

gajim: add /ping command in groupchat to ping occupants
by Gajim 14 Nov '14

14 Nov '14

changeset 0446dbae707d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0446dbae707d description: add /ping command in groupchat to ping occupants diffstat: src/chat_control.py | 14 +++++++++----- src/command_system/implementation/standard.py | 9 +++++++++ src/common/connection.py | 5 +++-- src/groupchat_control.py | 9 +++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) diffs (91 lines): diff -r 7c677497ea8c -r 0446dbae707d src/chat_control.py --- a/src/chat_control.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/chat_control.py Fri Aug 22 15:44:07 2014 +0200 @@ -211,11 +211,6 @@ return self.print_conversation(_('Ping?'), 'status') - def _nec_ping_reply(self, obj): - if self.contact != obj.contact: - return - self.print_conversation(_('Pong! (%s s.)') % obj.seconds, 'status') - def _nec_ping_error(self, obj): if self.contact != obj.contact: return @@ -2884,6 +2879,15 @@ return self.update_ui() + def _nec_ping_reply(self, obj): + if obj.control: + if obj.control != self: + return + else: + if self.contact != obj.contact: + return + self.print_conversation(_('Pong! (%s s.)') % obj.seconds, 'status') + def set_control_active(self, state): ChatControlBase.set_control_active(self, state) # send chatstate inactive to the one we're leaving diff -r 7c677497ea8c -r 0446dbae707d src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/command_system/implementation/standard.py Fri Aug 22 15:44:07 2014 +0200 @@ -410,3 +410,12 @@ @doc(_("Allow an occupant to send you public or private messages")) def unblock(self, who): self.on_unblock(None, who) + + @command + @doc(_("Send a ping to the contact")) + def ping(self, nick): + if self.account == gajim.ZEROCONF_ACC_NAME: + raise CommandError(_('Command is not supported for zeroconf accounts')) + gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + gajim.connections[self.account].sendPing(gc_c, self) + diff -r 7c677497ea8c -r 0446dbae707d src/common/connection.py --- a/src/common/connection.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/common/connection.py Fri Aug 22 15:44:07 2014 +0200 @@ -1569,10 +1569,11 @@ assert id_ == self.awaiting_xmpp_ping_id self.awaiting_xmpp_ping_id = None - def sendPing(self, pingTo=None): + def sendPing(self, pingTo=None, control=None): """ Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent to server to detect connection failure at application level + If control is set, display result there """ if not gajim.account_is_connected(self.name): return @@ -1595,7 +1596,7 @@ return timeDiff = round(timePong - timePing, 2) gajim.nec.push_incoming_event(PingReplyEvent(None, conn=self, - contact=pingTo, seconds=timeDiff)) + contact=pingTo, seconds=timeDiff, control=control)) if pingTo: timePing = time_time() self.connection.SendAndCallForResponse(iq, _on_response) diff -r 7c677497ea8c -r 0446dbae707d src/groupchat_control.py --- a/src/groupchat_control.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/groupchat_control.py Fri Aug 22 15:44:07 2014 +0200 @@ -1374,6 +1374,15 @@ obj.xhtml, self.session, msg_id=obj.msg_id, encrypted=obj.encrypted, displaymarking=obj.displaymarking) + def _nec_ping_reply(self, obj): + if obj.control: + if obj.control != self: + return + else: + if self.contact != obj.contact: + return + self.print_conversation(_('Pong! (%s s.)') % obj.seconds) + def got_connected(self): # Make autorejoin stop. if self.autorejoin:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014