Commits April 2006

commits@gajim.org

3 participants
26 discussions

[commit-gajim] r6250 - trunk/src
by dkirov＠gajim.org 30 Apr '06

30 Apr '06

Author: dkirov Date: 2006-04-30 22:05:12 +0200 (Sun, 30 Apr 2006) New Revision: 6250 Modified: trunk/src/filetransfers_window.py Log: fixes 1909 what a silly typo! Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2006-04-30 19:52:02 UTC (rev 6249) +++ trunk/src/filetransfers_window.py 2006-04-30 20:05:12 UTC (rev 6250) @@ -325,6 +325,8 @@ dialog = dialogs.FTOverwriteConfirmationDialog( _('This file already exists'), _('What do you want to do?'), not dl_finished) + dialog.set_transient_for(dialog2) + dialog.set_destroy_with_parent(True) response = dialog.get_response() if response < 0: return @@ -505,7 +507,7 @@ if file_props.has_key('connected') and file_props['connected'] == False: status = 'stop' self.model.set(iter, 0, self.images[status]) - if percent == 100: + if transfered_size == full_size: self.set_status(typ, sid, 'ok') def get_iter_by_sid(self, typ, sid):

1 0

[commit-gajim] r6249 - trunk/src
by dkirov＠gajim.org 30 Apr '06

30 Apr '06

Author: dkirov Date: 2006-04-30 21:52:02 +0200 (Sun, 30 Apr 2006) New Revision: 6249 Modified: trunk/src/chat_control.py Log: don't activate PGP and FT menuitems/button for transports. fixes #1903 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-04-30 17:33:10 UTC (rev 6248) +++ trunk/src/chat_control.py 2006-04-30 19:52:02 UTC (rev 6249) @@ -934,7 +934,10 @@ def _update_gpg(self): tb = self.xml.get_widget('gpg_togglebutton') - if self.contact.keyID: # we can do gpg + # we can do gpg + # if self.contact is our own contact info (transports), + # don't enable pgp + if self.contact.keyID and self.contact.jid.find('@') != -1: tb.set_sensitive(True) tt = _('OpenPGP Encryption') @@ -1193,7 +1196,8 @@ toggle_gpg_menuitem.set_property('sensitive', is_sensitive) # If we don't have resource, we can't do file transfer - if contact.resource: + # in transports, contact holds our info we need to disable it too + if contact.resource and contact.jid.find('@') != -1: send_file_menuitem.set_sensitive(True) else: send_file_menuitem.set_sensitive(False)

1 0

[commit-gajim] r6248 - trunk/src/common/xmpp
by dkirov＠gajim.org 30 Apr '06

30 Apr '06

Author: dkirov Date: 2006-04-30 19:33:10 +0200 (Sun, 30 Apr 2006) New Revision: 6248 Modified: trunk/src/common/xmpp/auth_nb.py Log: handle challenge response multiple qops: #1907 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2006-04-29 09:44:47 UTC (rev 6247) +++ trunk/src/common/xmpp/auth_nb.py 2006-04-30 17:33:10 UTC (rev 6248) @@ -23,6 +23,65 @@ from client import PlugIn import sha,base64,random,dispatcher_nb +def challenge_splitter(data): + ''' Helper function that creates a dict from challenge string. + Sample chalenge string: + username="example.org",realm="somerealm",\ + nonce="OA6MG9tEQGm2hh",cnonce="OA6MHXh6VqTrRk",\ + nc=00000001,qop="auth,auth-int,auth-conf",charset=utf-8 + in the above example: + dict['qop'] = ('auth','auth-int','auth-conf') + dict['realm'] = 'somerealm' + ''' + X_KEYWORD, X_VALUE, X_END = 0, 1, 2 + quotes_open = False + keyword, value = '', '' + dict, arr = {}, None + + expecting = X_KEYWORD + for iter in range(len(data) + 1): + end = False + if iter == len(data): + expecting = X_END + end = True + else: + char = data[iter] + if expecting == X_KEYWORD: + if char == '=': + expecting = X_VALUE + elif char == ',': + pass + else: + keyword = '%s%c' % (keyword, char) + elif expecting == X_VALUE: + if char == '"': + if quotes_open: + end = True + else: + quotes_open = True + elif char == ",": + if quotes_open: + if not arr: + arr = [value] + else: + arr.append(value) + value = "" + else: + end = True + else: + value = '%s%c' % (value, char) + if end: + if arr: + arr.append(value) + dict[keyword] = arr + arr = None + else: + dict[keyword] = value + value, keyword = '', '' + expecting = X_KEYWORD + quotes_open = False + return dict + class SASL(PlugIn): ''' Implements SASL authentication. ''' def __init__(self,username,password, on_sasl): @@ -115,17 +174,14 @@ raise NodeProcessed ########################################3333 incoming_data = challenge.getData() - chal={} data=base64.decodestring(incoming_data) self.DEBUG('Got challenge:'+data,'ok') - for pair in data.split(','): - key, value = pair.split('=', 1) - if value[:1] == '"' and value[-1:] == '"': - value = value[1:-1] - chal[key] = value + chal = challenge_splitter(data) if not self.realm and chal.has_key('realm'): self.realm = chal['realm'] - if chal.has_key('qop') and chal['qop']=='auth': + if chal.has_key('qop') and ((type(chal['qop']) == str and \ + chal['qop'] =='auth') or (type(chal['qop']) == list and 'auth' in \ + chal['qop'])): resp={} resp['username'] = self.username if self.realm:

1 0

[commit-gajim] r6247 - trunk/src/common
by dkirov＠gajim.org 29 Apr '06

29 Apr '06

Author: dkirov Date: 2006-04-29 11:44:47 +0200 (Sat, 29 Apr 2006) New Revision: 6247 Modified: trunk/src/common/connection_handlers.py Log: converted line end to <LF> Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-04-28 20:55:45 UTC (rev 6246) +++ trunk/src/common/connection_handlers.py 2006-04-29 09:44:47 UTC (rev 6247) @@ -1033,9 +1033,9 @@ self.awaiting_answers = {} # List of IDs that will produce a timeout is answer doesn't arrive # {time_of_the_timeout: (id, message to send to gui), } - self.awaiting_timeouts = {} - # keep the jids we auto added (transports contacts) to not send the - # SUBSCRIBED event to gui + self.awaiting_timeouts = {} + # keep the jids we auto added (transports contacts) to not send the + # SUBSCRIBED event to gui self.automatically_added = [] try: idle.init() @@ -1348,7 +1348,7 @@ timestamp = None is_gc = False # is it a GC presence ? sigTag = None - avatar_sha = None + avatar_sha = None transport_auto_auth = False xtags = prs.getTags('x') for x in xtags: @@ -1362,11 +1362,11 @@ # JEP-0091 tim = prs.getTimestamp() tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') - timestamp = time.localtime(timegm(tim)) - if x.getNamespace() == 'http://delx.cjb.net/protocol/roster-subsync': - # see http://trac.gajim.org/ticket/326 - agent = gajim.get_server_from_jid(jid_stripped) - if self.connection.getRoster().getItem(agent): # to be sure it's a transport contact + timestamp = time.localtime(timegm(tim)) + if x.getNamespace() == 'http://delx.cjb.net/protocol/roster-subsync': + # see http://trac.gajim.org/ticket/326 + agent = gajim.get_server_from_jid(jid_stripped) + if self.connection.getRoster().getItem(agent): # to be sure it's a transport contact transport_auto_auth = True no_log_for = gajim.config.get_per('accounts', self.name,

1 0

[commit-gajim] r6246 - trunk/src
by asterix＠gajim.org 28 Apr '06

28 Apr '06

Author: asterix Date: 2006-04-28 22:55:45 +0200 (Fri, 28 Apr 2006) New Revision: 6246 Modified: trunk/src/groupchat_control.py trunk/src/vcard.py Log: VcardWindow now takes a new argument: is_fake, need to be true when we open a vcard for a fake jid Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-04-28 20:55:00 UTC (rev 6245) +++ trunk/src/groupchat_control.py 2006-04-28 20:55:45 UTC (rev 6246) @@ -1689,7 +1689,7 @@ gajim.interface.instances[self.account]['infos'][c2.jid].window.present() else: gajim.interface.instances[self.account]['infos'][c2.jid] = \ - vcard.VcardWindow(c2, self.account) + vcard.VcardWindow(c2, self.account, is_fake = True) def on_history(self, widget, nick): jid = gajim.construct_fjid(self.room_jid, nick) Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2006-04-28 20:55:00 UTC (rev 6245) +++ trunk/src/vcard.py 2006-04-28 20:55:45 UTC (rev 6246) @@ -61,7 +61,7 @@ class VcardWindow: '''Class for contact's information window''' - def __init__(self, contact, account, vcard = False): + def __init__(self, contact, account, vcard = False, is_fake = False): # the contact variable is the jid if vcard is true self.xml = gtk.glade.XML(GTKGUI_GLADE, 'vcard_information_window', APP) self.window = self.xml.get_widget('vcard_information_window') @@ -79,6 +79,7 @@ self.contact = contact # don't use it if vcard is true self.account = account self.vcard = vcard + self.is_fake = is_fake self.avatar_mime_type = None self.avatar_encoded = None @@ -368,10 +369,7 @@ self.fill_status_label() - is_fake = False - if gajim.contacts.is_pm_from_jid(self.account, self.contact.jid): - is_fake = True - gajim.connections[self.account].request_vcard(self.contact.jid, is_fake) + gajim.connections[self.account].request_vcard(self.contact.jid, self.is_fake) def add_to_vcard(self, vcard, entry, txt): '''Add an information to the vCard dictionary'''

1 0

[commit-gajim] r6245 - trunk/src
by asterix＠gajim.org 28 Apr '06

28 Apr '06

Author: asterix Date: 2006-04-28 22:55:00 +0200 (Fri, 28 Apr 2006) New Revision: 6245 Modified: trunk/src/config.py Log: no need to call request_vcard twice, it's already in VcardWindow class Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-04-28 20:54:29 UTC (rev 6244) +++ trunk/src/config.py 2006-04-28 20:55:00 UTC (rev 6245) @@ -1397,7 +1397,6 @@ else: gajim.interface.instances[self.account]['infos'][jid] = \ vcard.VcardWindow(jid, self.account, True) - gajim.connections[self.account].request_vcard(jid) def on_manage_proxies_button_clicked(self, widget): if gajim.interface.instances.has_key('manage_proxies'):

1 0

[commit-gajim] r6244 - trunk/src
by asterix＠gajim.org 28 Apr '06

28 Apr '06

Author: asterix Date: 2006-04-28 22:54:29 +0200 (Fri, 28 Apr 2006) New Revision: 6244 Modified: trunk/src/dialogs.py Log: no need to call request_vcard twice, it's already in VcardWindow class Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-04-28 19:41:35 UTC (rev 6243) +++ trunk/src/dialogs.py 2006-04-28 20:54:29 UTC (rev 6244) @@ -858,7 +858,6 @@ # Remove jabber page gajim.interface.instances[self.account]['infos'][self.jid].xml.\ get_widget('information_notebook').remove_page(0) - gajim.connections[self.account].request_vcard(self.jid) def on_deny_button_clicked(self, widget): '''refuse the request'''

1 0

[commit-gajim] r6243 - trunk/src/common
by dkirov＠gajim.org 28 Apr '06

28 Apr '06

Author: dkirov Date: 2006-04-28 21:41:35 +0200 (Fri, 28 Apr 2006) New Revision: 6243 Modified: trunk/src/common/optparser.py Log: old opt value of 'always_compact_view_chat' is string, not boolean Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2006-04-28 19:09:52 UTC (rev 6242) +++ trunk/src/common/optparser.py 2006-04-28 19:41:35 UTC (rev 6243) @@ -230,10 +230,10 @@ not self.old_values['useemoticons']: gajim.config.set('emoticons_theme', '') if self.old_values.has_key('always_compact_view_chat') and \ - self.old_values['always_compact_view_chat']: + self.old_values['always_compact_view_chat'] != 'False': gajim.config.set('always_hide_chat_buttons', True) if self.old_values.has_key('always_compact_view_gc') and \ - self.old_values['always_compact_view_gc']: + self.old_values['always_compact_view_gc'] != 'False': gajim.config.set('always_hide_groupchat_buttons', True) for account in gajim.config.get_per('accounts'):

1 0

[commit-gajim] r6242 - trunk/src
by asterix＠gajim.org 28 Apr '06

28 Apr '06

Author: asterix Date: 2006-04-28 21:09:52 +0200 (Fri, 28 Apr 2006) New Revision: 6242 Modified: trunk/src/roster_window.py Log: we can DND a contact on another account's group if we are in merged mode. Fixes #1888 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-04-28 18:42:18 UTC (rev 6241) +++ trunk/src/roster_window.py 2006-04-28 19:09:52 UTC (rev 6242) @@ -3131,8 +3131,12 @@ if type_source != 'contact': # source is not a contact return source_account = model[iter_source][C_ACCOUNT].decode('utf-8') - if account != source_account: # dropped in another account - return + if account != source_account: # dropped in another account + if self.regroup and type_dest == 'group': + # on a group in merge mode is ok + account = source_account + else: + return it = iter_source while model[it][C_TYPE] == 'contact': it = model.iter_parent(it)

1 0

[commit-gajim] r6241 - trunk/src/common
by dkirov＠gajim.org 28 Apr '06

28 Apr '06

Author: dkirov Date: 2006-04-28 20:42:18 +0200 (Fri, 28 Apr 2006) New Revision: 6241 Modified: trunk/src/common/connection.py Log: reset on_purpose var, when we manually change our status to !offline Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-04-28 16:20:24 UTC (rev 6240) +++ trunk/src/common/connection.py 2006-04-28 18:42:18 UTC (rev 6241) @@ -545,6 +545,7 @@ # set old_show to requested 'show' in case we need to # recconect before we auth to server self.old_show = show + self.on_purpose = False self.connect_and_init(show, msg, signed) elif show == 'offline' and self.connected:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2006