Commits

commits@gajim.org

17632 discussions

gajim: don't call GTK functions inside a Thread.
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset cd07cd473ab3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cd07cd473ab3 description: don't call GTK functions inside a Thread. diffstat: src/gui_interface.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r 24193ae70518 -r cd07cd473ab3 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 10:36:21 2012 +0400 +++ b/src/gui_interface.py Fri Aug 24 09:14:08 2012 +0200 @@ -954,13 +954,13 @@ # then the file is not corrupt jid = unicode(file_props.sender) if session.file_hash == hash_: - self.popup_ft_result(account, jid, file_props) - ft_win.set_status(file_props, 'ok') + gobject.idle_add(self.popup_ft_result, account, jid, file_props) + gobject.idle_add(ft_win.set_status, file_props, 'ok') else: # wrong hash, we need to get the file again! file_props.error = -10 - self.popup_ft_result(account, jid, file_props) - ft_win.set_status(file_props, 'hash_error') + gobject.idle_add(self.popup_ft_result, account, jid, file_props) + gobject.idle_add(ft_win.set_status, file_props, 'hash_error') # End jingle session if session: session.end_session()

1 0

gajim: merge
by Fomin Denis 24 Aug '12

24 Aug '12

changeset 24193ae70518 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=24193ae70518 description: merge

1 0

gajim: typo
by Fomin Denis 24 Aug '12

24 Aug '12

changeset 037a10dda218 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=037a10dda218 description: typo diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r e00cf699baf7 -r 037a10dda218 src/dialogs.py --- a/src/dialogs.py Thu Aug 23 22:11:21 2012 +0200 +++ b/src/dialogs.py Fri Aug 24 10:33:46 2012 +0400 @@ -1662,9 +1662,9 @@ *self.user_response_yes[1:]) else: if self.textview: + self.user_response_yes(self.is_checked(), txt) + else: self.user_response_yes(self.is_checked()) - else: - self.user_response_yes(self.is_checked(), txt) self.call_cancel_on_destroy = False self.destroy()

1 0

gajim: commenting debugging code
by Jefry Lagrange 24 Aug '12

24 Aug '12

changeset 0aa5291d7952 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0aa5291d7952 description: commenting debugging code diffstat: src/common/jingle_ft.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f1130d95de15 -r 0aa5291d7952 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Aug 23 23:16:25 2012 -0400 +++ b/src/common/jingle_ft.py Thu Aug 23 23:24:43 2012 -0400 @@ -147,7 +147,7 @@ h = xmpp.Hashes() hash_ = h.calculateHash(self.session.hash_algo, file_) # DEBUG - hash_ = '1294809248109223' + #hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return

1 0

gajim: get file_tag from file request
by Jefry Lagrange 24 Aug '12

24 Aug '12

changeset f1130d95de15 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1130d95de15 description: get file_tag from file request diffstat: src/common/connection_handlers_events.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 9c654f640243 -r f1130d95de15 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 23 22:42:59 2012 -0400 +++ b/src/common/connection_handlers_events.py Thu Aug 23 23:16:25 2012 -0400 @@ -2006,8 +2006,11 @@ if self.jingle_content: self.file_props.session_type = 'jingle' self.file_props.stream_methods = xmpp.NS_BYTESTREAM - file_tag = self.jingle_content.getTag('description').getTag( - 'offer').getTag('file') + desc = self.jingle_content.getTag('description') + if desc.getTag('offer'): + file_tag = desc.getTag('offer').getTag('file') + else: + file_tag = desc.getTag('request').getTag('file') for child in file_tag.getChildren(): name = child.getName() val = child.getData()

1 0

gajim: use contact with highest priority when requesting file
by Jefry Lagrange 24 Aug '12

24 Aug '12

changeset 9c654f640243 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c654f640243 description: use contact with highest priority when requesting file diffstat: src/filetransfers_window.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 6e9d371624df -r 9c654f640243 src/filetransfers_window.py --- a/src/filetransfers_window.py Thu Aug 23 17:53:17 2012 -0400 +++ b/src/filetransfers_window.py Thu Aug 23 22:42:59 2012 -0400 @@ -248,14 +248,17 @@ self.tree.get_selection().unselect_all() def show_hash_error(self, jid, file_props, account): + def on_yes(dummy): # Request the file to the sender - sid = gajim.connections[account].start_file_transfer(jid, + contact = gajim.contacts.get_contact_with_highest_priority(account, + jid) + fjid = contact.get_full_jid() + sid = gajim.connections[account].start_file_transfer(fjid, file_props, True) file_props.sid = sid - if file_props.type_ == 'r': file_name = os.path.basename(file_props.file_name) else:

1 0

gajim: coding standards
by Jefry Lagrange 23 Aug '12

23 Aug '12

changeset 6e9d371624df in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6e9d371624df description: coding standards diffstat: src/common/jingle_session.py | 44 ++------------------------------------------ 1 files changed, 2 insertions(+), 42 deletions(-) diffs (258 lines): diff -r 963f8a6b18da -r 6e9d371624df src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Aug 23 17:45:38 2012 -0400 +++ b/src/common/jingle_session.py Thu Aug 23 17:53:17 2012 -0400 @@ -91,15 +91,12 @@ if not sid: sid = con.connection.getAnID() self.sid = sid # sessionid - # iq stanza id, used to determine which sessions to summon callback # later on when iq-result stanza arrives if iq_id is not None: self.iq_ids = [iq_id] else: self.iq_ids = [] - - self.accepted = True # is this session accepted by user # Hash algorithm that we are using to calculate the integrity of the # file. Could be 'md5', 'sha-1', etc... @@ -134,7 +131,6 @@ 'iq-result': [self.__broadcast], 'iq-error': [self.__on_error], } - def collect_iq_id(self, iq_id): if iq_id is not None: @@ -190,7 +186,6 @@ def get_content(self, media=None, name=None): if media is None: return - for content in self.contents.values(): if content.media == media: if name is None or content.name == name: @@ -204,7 +199,6 @@ Creator must be one of ('we', 'peer', 'initiator', 'responder') """ assert creator in ('we', 'peer', 'initiator', 'responder') - if (creator == 'we' and self.weinitiate) or (creator == 'peer' and \ not self.weinitiate): creator = 'initiator' @@ -214,7 +208,6 @@ content.creator = creator content.name = name self.contents[(creator, name)] = content - if (creator == 'initiator') == self.weinitiate: # The content is from us, accept it content.accepted = True @@ -236,7 +229,6 @@ ''' Currently used for transport replacement ''' - content = self.contents[(creator,name)] transport.set_sid(content.transport.sid) transport.set_file_props(content.transport.file_props) @@ -244,7 +236,6 @@ # The content will have to be resend now that it is modified content.sent = False content.accepted = True - def on_session_state_changed(self, content=None): if self.state == JingleStates.ended: @@ -342,9 +333,7 @@ else: # it's an iq-result (ack) stanza action = 'iq-result' - callables = self.callbacks[action] - try: for callable in callables: callable(stanza=stanza, jingle=jingle, error=error, action=action) @@ -384,14 +373,12 @@ self.modify_content(creator, name, transport) cont = self.contents[(creator, name)] cont.transport = transport - stanza, jingle = self.__make_jingle('transport-replace') self.__append_contents(jingle) self.__broadcast(stanza, jingle, None, 'transport-replace') self.connection.connection.send(stanza) self.state = JingleStates.pending - def __on_transport_replace(self, stanza, jingle, error, action): for content in jingle.iterTags('content'): creator = content['creator'] @@ -404,14 +391,12 @@ # Anyway, content's transport is not modifiable yet pass elif transport_ns == xmpp.NS_JINGLE_IBB: - transport = JingleTransportIBB() self.modify_content(creator, name, transport) self.state = JingleStates.pending self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE self.__ack(stanza, jingle, error, action) self.__session_accept() - else: stanza, jingle = self.__make_jingle('transport-reject') content = jingle.setTag('content', attrs={'creator': creator, @@ -446,7 +431,6 @@ raise xmpp.NodeProcessed self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify') raise xmpp.NodeProcessed - def __on_content_remove(self, stanza, jingle, error, action): for content in jingle.iterTags('content'): @@ -469,7 +453,6 @@ if self.state != JingleStates.pending: raise OutOfOrder self.state = JingleStates.active - def __on_content_accept(self, stanza, jingle, error, action): """ @@ -485,18 +468,15 @@ def __on_content_add(self, stanza, jingle, error, action): if self.state == JingleStates.ended: raise OutOfOrder - parse_result = self.__parse_contents(jingle) contents = parse_result[0] rejected_contents = parse_result[1] - for name, creator in rejected_contents: # TODO content = JingleContent() self.add_content(name, content, creator) self.__content_reject(content) self.contents[(content.creator, content.name)].destroy() - gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None, conn=self.connection, jingle_session=self, contents=contents)) @@ -507,22 +487,16 @@ """ if self.state != JingleStates.ended: raise OutOfOrder - self.initiator = jingle['initiator'] self.responder = self.ourjid self.peerjid = self.initiator self.accepted = False # user did not accept this session yet - # TODO: If the initiator is unknown to the receiver (e.g., via presence # subscription) and the receiver has a policy of not communicating via # Jingle with unknown entities, it SHOULD return a <service-unavailable/> # error. - - # Lets check what kind of jingle session does the peer want contents, contents_rejected, reason_txt = self.__parse_contents(jingle) - - # If we are not receivin a file # Check if there's already a session with this user: if contents[0][0] != 'file': @@ -534,9 +508,6 @@ self.__ack(stanza, jingle, error, action) self._session_terminate(reason) raise xmpp.NodeProcessed - - - # If there's no content we understand... if not contents: # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate @@ -545,9 +516,7 @@ self.__ack(stanza, jingle, error, action) self._session_terminate(reason) raise xmpp.NodeProcessed - self.state = JingleStates.pending - # Send event about starting a session gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None, conn=self.connection, jingle_session=self, contents=contents)) @@ -560,13 +529,11 @@ # for cn in self.contents.values(): # cn.on_stanza(stanza, None, error, action) # return - # special case: iq-result stanza does not come with a jingle element if action == 'iq-result': for cn in self.contents.values(): cn.on_stanza(stanza, None, error, action) return - for content in jingle.iterTags('content'): name = content['name'] creator = content['creator'] @@ -588,7 +555,6 @@ else: # TODO text = reason - if reason == 'cancel' and self.session_type_FT: gajim.nec.push_incoming_event(JingleTransferCancelledEvent(None, conn=self.connection, jingle_session=self, media=None, @@ -606,7 +572,6 @@ contents = [] contents_rejected = [] reasons = set() - for element in jingle.iterTags('content'): transport = get_jingle_transport(element.getTag('transport')) if transport: @@ -627,28 +592,22 @@ else: contents_rejected.append((element['name'], 'peer')) reasons.add('unsupported-applications') - failure_reason = None - # Store the first reason of failure for reason in ('failed-application', 'unsupported-transports', 'unsupported-applications'): if reason in reasons: failure_reason = reason break - return (contents, contents_rejected, failure_reason) def __dispatch_error(self, error=None, text=None, type_=None): - if text: text = '%s (%s)' % (error, text) if type_ != 'modify': gajim.nec.push_incoming_event(JingleErrorReceivedEvent(None, conn=self.connection, jingle_session=self, reason=text or error)) - - def __reason_from_stanza(self, stanza): # TODO: Move to GUI? @@ -674,7 +633,6 @@ attrs = {'action': action, 'sid': self.sid, 'initiator' : self.initiator} - jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) if reason is not None: jingle.addChild(node=reason) @@ -805,3 +763,5 @@ def content_negotiated(self, media): gajim.nec.push_incoming_event(JingleConnectedReceivedEvent(None, conn=self.connection, jingle_session=self, media=media)) + +

1 0

gajim: coding standards
by Jefry Lagrange 23 Aug '12

23 Aug '12

changeset 963f8a6b18da in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=963f8a6b18da description: coding standards diffstat: src/common/jingle_ft.py | 31 +++---------------------------- src/common/jingle_ftstates.py | 19 +++++++------------ src/common/socks5.py | 40 ++++++---------------------------------- src/dialogs.py | 4 ++-- 4 files changed, 18 insertions(+), 76 deletions(-) diffs (truncated from 569 to 300 lines): diff -r e00cf699baf7 -r 963f8a6b18da src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Aug 23 22:11:21 2012 +0200 +++ b/src/common/jingle_ft.py Thu Aug 23 17:45:38 2012 -0400 @@ -50,9 +50,7 @@ def __init__(self, session, transport=None, file_props=None, use_security=False): JingleContent.__init__(self, session, transport) - log.info("transport value: %s" % transport) - # events we might be interested in self.callbacks['session-initiate'] += [self.__on_session_initiate] self.callbacks['session-initiate-sent'] += [ @@ -68,31 +66,25 @@ self.callbacks['transport-reject'] += [self.__on_transport_reject] self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] - self.use_security = use_security - self.file_props = file_props if file_props is None: self.weinitiate = False else: self.weinitiate = True - if self.file_props is not None: self.file_props.sender = session.ourjid self.file_props.receiver = session.peerjid self.file_props.session_type = 'jingle' self.file_props.session_sid = session.sid self.file_props.transfered_size = [] - log.info("FT request: %s" % file_props) - if transport is None: self.transport = JingleTransportSocks5() self.transport.set_connection(session.connection) self.transport.set_file_props(self.file_props) self.transport.set_our_jid(session.ourjid) log.info('ourjid: %s' % session.ourjid) - self.session = session self.media = 'file' self.nominated_cand = {} @@ -128,6 +120,7 @@ # Delete this after file_props refactoring this shouldn't be necesary self.session.file_hash = self.file_props.hash_ self.session.hash_algo = self.file_props.algo + def __on_session_initiate_sent(self, stanza, content, error, action): # Calculate file_hash in a new thread # if we haven't sent the hash already. @@ -142,7 +135,6 @@ checksum.setNamespace(xmpp.NS_JINGLE_FILE_TRANSFER) self.session.__session_info(checksum ) - def _calcHash(self): # Caculates the hash and returns a xep-300 hash stanza if self.session.hash_algo == None: @@ -155,7 +147,7 @@ h = xmpp.Hashes() hash_ = h.calculateHash(self.session.hash_algo, file_) # DEBUG - #hash_ = '1294809248109223' + hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return @@ -169,8 +161,6 @@ security = content.getTag('security') if not security: # responder can not verify our fingerprint self.use_security = False - - if self.state == STATE_TRANSPORT_REPLACE: # We ack the session accept response = stanza.buildReply('result') @@ -179,13 +169,11 @@ # We send the file self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed - self.file_props.streamhosts = self.transport.remote_candidates for host in self.file_props.streamhosts: host['initiator'] = self.session.initiator host['target'] = self.session.responder host['sid'] = self.file_props.sid - response = stanza.buildReply('result') response.delChild(response.getQuery()) con.connection.send(response) @@ -218,7 +206,6 @@ def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") - if content.getTag('transport').getTag('candidate-error'): self.nominated_cand['peer-cand'] = False if self.state == STATE_CAND_SENT: @@ -244,7 +231,6 @@ gajim.socks5queue.send_file(self.file_props, self.session.connection.name, 'client') return - args = {'content' : content, 'sendCand' : False} if self.state == STATE_CAND_SENT: @@ -257,8 +243,6 @@ else: self.__state_changed(STATE_CAND_RECEIVED, args) - - def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") @@ -277,12 +261,10 @@ def __transport_setup(self, stanza=None, content=None, error=None, action=None): # Sets up a few transport specific things for the file transfer - if self.transport.type_ == TransportType.IBB: # No action required, just set the state to transfering self.state = STATE_TRANSFERING - def on_connect(self, streamhost): """ send candidate-used stanza @@ -292,7 +274,6 @@ return args = {'streamhost' : streamhost, 'sendCand' : True} - self.nominated_cand['our-cand'] = streamhost self.__sendCand(args) @@ -313,19 +294,15 @@ self.file_props.hash_ = hash_id def _listen_host(self): - receiver = self.file_props.receiver sender = self.file_props.sender sha_str = helpers.get_auth_sha(self.file_props.sid, sender, receiver) self.file_props.sha_str = sha_str - port = gajim.config.get('file_transfers_port') - fingerprint = None if self.use_security: fingerprint = 'server' - if self.weinitiate: listener = gajim.socks5queue.start_listener(port, sha_str, self._store_socks5_sid, self.file_props, @@ -334,10 +311,10 @@ listener = gajim.socks5queue.start_listener(port, sha_str, self._store_socks5_sid, self.file_props, fingerprint=fingerprint, typ='receiver') - if not listener: # send error message, notify the user return + def isOurCandUsed(self): ''' If this method returns true then the candidate we nominated will be @@ -348,10 +325,8 @@ return True if self.nominated_cand['our-cand'] == False: return False - peer_pr = int(self.nominated_cand['peer-cand']['priority']) our_pr = int(self.nominated_cand['our-cand']['priority']) - if peer_pr != our_pr: return our_pr > peer_pr else: diff -r e00cf699baf7 -r 963f8a6b18da src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Thu Aug 23 22:11:21 2012 +0200 +++ b/src/common/jingle_ftstates.py Thu Aug 23 17:45:38 2012 -0400 @@ -16,6 +16,7 @@ from jingle_transport import * from common.socks5 import Socks5ReceiverClient, Socks5SenderClient + class JingleFileTransferStates: ''' This class implements the state machine design pattern @@ -64,27 +65,22 @@ # Send candidate used streamhost = args['streamhost'] self.jft.nominated_cand['our-cand'] = streamhost - content = xmpp.Node('content') content.setAttr('creator', 'initiator') content.setAttr('name', self.jft.name) - transport = xmpp.Node('transport') transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) transport.setAttr('sid', self.jft.transport.sid) - candidateused = xmpp.Node('candidate-used') candidateused.setAttr('cid', streamhost['cid']) - transport.addChild(node=candidateused) content.addChild(node=transport) - self.jft.session.send_transport_info(content) - def action(self, args=None): self._sendCand(args) + class StateCandReceived(JingleFileTransferStates): ''' This state happens when we receive a candidate. @@ -111,6 +107,7 @@ def action(self, args=None): self._recvCand(args) + class StateCandSentAndRecv( StateCandSent, StateCandReceived): ''' This state happens when we have received and sent the candidates. @@ -124,6 +121,7 @@ else: self._recvCand(args) + class StateTransportReplace(JingleFileTransferStates): ''' This state initiates transport replace @@ -132,6 +130,7 @@ def action(self, args=None): self.jft.session.transport_replace() + class StateTransfering(JingleFileTransferStates): ''' This state will start the transfer depeding on the type of transport @@ -146,14 +145,12 @@ def __start_SOCK5_transfer(self): # It tells wether we start the transfer as client or server mode = None - if self.jft.isOurCandUsed(): mode = 'client' streamhost_used = self.jft.nominated_cand['our-cand'] else: mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] - if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True # This needs to be changed when requesting @@ -164,7 +161,6 @@ self.jft.file_props.proxy_sender = streamhost_used['target'] self.jft.file_props.proxy_receiver = streamhost_used[ 'initiator'] - # This needs to be changed when requesting if not self.jft.weinitiate and streamhost_used['type'] == 'proxy': r = gajim.socks5queue.readers @@ -172,7 +168,6 @@ if r[reader].host == streamhost_used['host'] and \ r[reader].connected: return - # This needs to be changed when requesting if self.jft.weinitiate and streamhost_used['type'] == 'proxy': s = gajim.socks5queue.senders @@ -180,7 +175,6 @@ if s[sender].host == streamhost_used['host'] and \ s[sender].connected: return - if streamhost_used['type'] == 'proxy': self.jft.file_props.streamhost_used = True streamhost_used['sid'] = self.jft.file_props.sid @@ -188,7 +182,6 @@ self.jft.file_props.streamhosts.append(streamhost_used) self.jft.file_props.proxyhosts = [] self.jft.file_props.proxyhosts.append(streamhost_used) - # This needs to be changed when requesting if self.jft.weinitiate: gajim.socks5queue.idx += 1 @@ -224,3 +217,5 @@ elif self.jft.transport.type_ == TransportType.SOCKS5: self.__start_SOCK5_transfer() + + diff -r e00cf699baf7 -r 963f8a6b18da src/common/socks5.py

1 0

gajim: print in groupchat when the invited contact declines the ...
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset e00cf699baf7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e00cf699baf7 description: print in groupchat when the invited contact declines the invitation diffstat: src/common/connection_handlers_events.py | 28 ++++++++++++++++++++++++++++ src/gui_interface.py | 9 +++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diffs (77 lines): diff -r a41057bf3cbe -r e00cf699baf7 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 23 21:34:03 2012 +0200 +++ b/src/common/connection_handlers_events.py Thu Aug 23 22:11:21 2012 +0200 @@ -1068,12 +1068,18 @@ self.enc_tag = self.stanza.getTag('x', namespace=xmpp.NS_ENCRYPTED) self.invite_tag = None + self.decline_tag = None if not self.enc_tag: self.invite_tag = self.stanza.getTag('x', namespace=xmpp.NS_MUC_USER) if self.invite_tag and not self.invite_tag.getTag('invite'): self.invite_tag = None + self.decline_tag = self.stanza.getTag('x', + namespace=xmpp.NS_MUC_USER) + if self.decline_tag and not self.decline_tag.getTag('decline'): + self.decline_tag = None + self.thread_id = self.stanza.getThread() self.mtype = self.stanza.getType() if not self.mtype or self.mtype not in ('chat', 'groupchat', 'error'): @@ -1194,6 +1200,28 @@ return True +class GcDeclineReceivedEvent(nec.NetworkIncomingEvent): + name = 'gc-decline-received' + base_network_events = [] + + def generate(self): + self.room_jid = self.msg_obj.fjid + + item = self.msg_obj.invite_tag.getTag('decline') + try: + self.jid_from = helpers.parse_jid(item.getAttr('from')) + except helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) + return + jid = gajim.get_jid_without_resource(self.jid_from) + if gajim.config.get_per('accounts', self.conn.name, + 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( + self.conn.name, jid): + return + self.reason = item.getTagData('reason') + + return True + class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'decrypted-message-received' base_network_events = [] diff -r a41057bf3cbe -r e00cf699baf7 src/gui_interface.py --- a/src/gui_interface.py Thu Aug 23 21:34:03 2012 +0200 +++ b/src/gui_interface.py Thu Aug 23 22:11:21 2012 +0200 @@ -615,6 +615,14 @@ self.instances[account]['gc_config'][obj.jid].\ affiliation_list_received(obj.users_dict) + def handle_event_gc_decline(self, obj): + account = obj.conn.name + gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, account) + if gc_control: + gc_control.print_conversation( + _('%(jid)s declined the invitation') % {'jid': obj.room_jid}, + graphics=False) + def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued)) jid = gajim.get_jid_without_resource(obj.jid_from) @@ -1497,6 +1505,7 @@ 'file-request-received': [self.handle_event_file_request], 'fingerprint-error': [self.handle_event_fingerprint_error], 'gc-invitation-received': [self.handle_event_gc_invitation], + 'gc-decline-received': [self.handle_event_gc_decline], 'gc-presence-received': [self.handle_event_gc_presence], 'gc-message-received': [self.handle_event_gc_message], 'gmail-notify': [self.handle_event_gmail_notify],

1 0

gajim: decline groupchat invitation.
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset a41057bf3cbe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a41057bf3cbe description: decline groupchat invitation. diffstat: src/common/connection.py | 19 +++++++++++--- src/dialogs.py | 63 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 67 insertions(+), 15 deletions(-) diffs (152 lines): diff -r c28c95ded697 -r a41057bf3cbe src/common/connection.py --- a/src/common/connection.py Thu Aug 23 14:21:26 2012 +0200 +++ b/src/common/connection.py Thu Aug 23 21:34:03 2012 +0200 @@ -2629,11 +2629,22 @@ """ Send invitation """ - message=common.xmpp.Message(to = room) - c = message.addChild(name = 'x', namespace = common.xmpp.NS_MUC_USER) - c = c.addChild(name = 'invite', attrs={'to' : to}) + message=common.xmpp.Message(to=room) + c = message.addChild(name='x', namespace=common.xmpp.NS_MUC_USER) + c = c.addChild(name='invite', attrs={'to': to}) if continue_tag: - c.addChild(name = 'continue') + c.addChild(name='continue') + if reason != '': + c.setTagData('reason', reason) + self.connection.send(message) + + def decline_invitation(self, room, to, reason=''): + """ + decline a groupchat invitation + """ + message=common.xmpp.Message(to=room) + c = message.addChild(name='x', namespace=common.xmpp.NS_MUC_USER) + c = c.addChild(name='decline', attrs={'to': to}) if reason != '': c.setTagData('reason', reason) self.connection.send(message) diff -r c28c95ded697 -r a41057bf3cbe src/dialogs.py --- a/src/dialogs.py Thu Aug 23 14:21:26 2012 +0200 +++ b/src/dialogs.py Thu Aug 23 21:34:03 2012 +0200 @@ -1615,8 +1615,8 @@ HIG compliant YesNo dialog """ - def __init__(self, pritext, sectext='', checktext='', on_response_yes=None, - on_response_no=None, type_=gtk.MESSAGE_QUESTION): + def __init__(self, pritext, sectext='', checktext='', text_label=None, + on_response_yes=None, on_response_no=None, type_=gtk.MESSAGE_QUESTION): self.user_response_yes = on_response_yes self.user_response_no = on_response_no if hasattr(gajim.interface, 'roster') and gajim.interface.roster: @@ -1632,25 +1632,59 @@ self.vbox.pack_start(self.checkbutton, expand=False, fill=True) else: self.checkbutton = None + if text_label: + label = gtk.Label(text_label) + self.vbox.pack_start(label, expand=False, fill=True) + buff = gtk.TextBuffer() + self.textview = gtk.TextView(buff) + frame = gtk.Frame() + frame.set_shadow_type(gtk.SHADOW_IN) + frame.add(self.textview) + self.vbox.pack_start(frame, expand=False, fill=True) + else: + self.textview = None self.set_modal(False) self.popup() def on_response_yes(self, widget): if self.user_response_yes: + if self.textview: + buff = self.textview.get_buffer() + start, end = buff.get_bounds() + txt = self.textview.get_buffer().get_text(start, end) + if isinstance(self.user_response_yes, tuple): - self.user_response_yes[0](self.is_checked(), - *self.user_response_yes[1:]) + if self.textview: + self.user_response_yes[0](self.is_checked(), txt, + *self.user_response_yes[1:]) + else: + self.user_response_yes[0](self.is_checked(), + *self.user_response_yes[1:]) else: - self.user_response_yes(self.is_checked()) + if self.textview: + self.user_response_yes(self.is_checked()) + else: + self.user_response_yes(self.is_checked(), txt) self.call_cancel_on_destroy = False self.destroy() def on_response_no(self, widget): if self.user_response_no: + if self.textview: + buff = self.textview.get_buffer() + start, end = buff.get_bounds() + txt = self.textview.get_buffer().get_text(start, end) + if isinstance(self.user_response_no, tuple): - self.user_response_no[0](*self.user_response_no[1:]) + if self.textview: + self.user_response_no[0](txt, *self.user_response_no[1:]) + else: + self.user_response_no[0](*self.user_response_no[1:]) else: - self.user_response_no() + if self.textview: + self.user_response_no(txt) + else: + self.user_response_no() self.call_cancel_on_destroy = False self.destroy() @@ -4436,6 +4470,7 @@ self.account = account self.password = password self.is_continued = is_continued + self.contact_jid = contact_jid pritext = _('''You are invited to a groupchat''') #Don't translate $Contact @@ -4454,7 +4489,7 @@ sectext += '\n\n%s' % comment sectext += '\n\n' + _('Do you want to accept the invitation?') - def on_yes(checked): + def on_yes(checked, text): try: if self.is_continued: gajim.interface.join_gc_room(self.account, self.room_jid, @@ -4464,7 +4499,12 @@ except GajimGeneralException: pass - YesNoDialog(pritext, sectext, on_response_yes=on_yes) + def on_no(text): + gajim.connections[account].decline_invitation(self.room_jid, + self.contact_jid, text) + + YesNoDialog(pritext, sectext, text_label=_('Reason:'), + on_response_yes=on_yes, on_response_no=on_no) class ProgressDialog: def __init__(self, title_text, during_text, messages_queue): @@ -5231,8 +5271,9 @@ on_response_yes=None, on_response_no=None, account=None, certificate=None): self.account = account self.cert = certificate - YesNoDialog.__init__(self, pritext, sectext, checktext, on_response_yes, - on_response_no) + YesNoDialog.__init__(self, pritext, sectext=sectext, + checktext=checktext, on_response_yes=on_response_yes, + on_response_no=on_response_no) b = gtk.Button(_('View cert...')) b.connect('clicked', self.on_cert_clicked) b.show_all()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits