Commits June 2007

commits@gajim.org

7 participants
163 discussions

[commit-gajim] r8248 - trunk/src/common
by asterix＠gajim.org 09 Jun '07

09 Jun '07

Author: asterix Date: 2007-06-09 09:07:05 +0200 (Sat, 09 Jun 2007) New Revision: 8248 Modified: trunk/src/common/socks5.py Log: [Santiago Gala] IPv6 filetransfert. see #1969 Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2007-06-08 20:31:25 UTC (rev 8247) +++ trunk/src/common/socks5.py 2007-06-09 07:07:05 UTC (rev 8248) @@ -348,9 +348,10 @@ def __init__(self, idlequeue, host, port, initiator, target, sid): if host is not None: try: - self.host = socket.gethostbyname(host) + self.host = host + self.ais = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM) except socket.gaierror: - self.host = None + self.ais = None self.idlequeue = idlequeue self.fd = -1 self.port = port @@ -793,6 +794,8 @@ only pollin events though ''' self.port = port + self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC, + socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE) self.queue_idx = -1 self.idlequeue = idlequeue self.queue = None @@ -801,14 +804,21 @@ self.fd = -1 def bind(self): - self._serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) - self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) - # will fail when port as busy, or we don't have rights to bind - try: - self._serv.bind(('0.0.0.0', self.port)) - except Exception, e: + for ai in self.ais: + #try the different possibilities (ipv6, ipv4, etc.) + self._serv = socket.socket(*ai[:3]) + self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) + self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + # will fail when port as busy, or we don't have rights to bind + try: + self._serv.bind(ai[4]) + self.ai = ai + break + except: + self.ai = None + continue + if not self.ai: # unable to bind, show error dialog return None self._serv.listen(socket.SOMAXCONN) @@ -884,9 +894,18 @@ def connect(self): ''' create the socket and plug it to the idlequeue ''' - self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - # this will not block the GUI - self._sock.setblocking(False) + for ai in self.ais: + try: + self._sock=socket.socket(*ai[:3]) + # this will not block the GUI + self._sock.setblocking(False) + self._server=ai[4] + break + except: + if sys.exc_value[0] == errno.EINPROGRESS: + break + #for all errors, we try other addresses + continue self.fd = self._sock.fileno() self.state = 0 # about to be connected self.idlequeue.plug_idle(self, True, False) @@ -950,7 +969,7 @@ def do_connect(self): try: - self._sock.connect((self.host, self.port)) + self._sock.connect(self._server) self._sock.setblocking(False) self._send=self._sock.send self._recv=self._sock.recv

1 0

[commit-gajim] r8247 - trunk/src
by steve-e＠gajim.org 08 Jun '07

08 Jun '07

Author: steve-e Date: 2007-06-08 22:31:25 +0200 (Fri, 08 Jun 2007) New Revision: 8247 Modified: trunk/src/roster_window.py Log: Adapt multi_contact_menu to the style of the other menus Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-08 20:28:47 UTC (rev 8246) +++ trunk/src/roster_window.py 2007-06-08 20:31:25 UTC (rev 8247) @@ -2321,13 +2321,22 @@ list_.append((contact, account)) menu = gtk.Menu() - - remove_item = gtk.ImageMenuItem(_('_Remove from Roster')) - icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) - remove_item.set_image(icon) - menu.append(remove_item) - remove_item.connect('activate', self.on_req_usub, list_) - + account = None + for (contact, current_account) in list_: + # check that we use the same account for every sender + if account is not None and account != current_account: + account = None + break + account = current_account + if account is not None: + send_group_message_item = gtk.ImageMenuItem(_('Send Group M_essage')) + icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) + send_group_message_item.set_image(icon) + menu.append(send_group_message_item) + send_group_message_item.connect('activate', + self.on_send_single_message_menuitem_activate, account, list_) + + # Invite to Groupchat invite_item = gtk.ImageMenuItem(_('In_vite to')) muc_icon = self.load_icon('muc_active') if muc_icon: @@ -2373,27 +2382,20 @@ invite_item.set_submenu(sub_menu) menu.append(invite_item) + item = gtk.SeparatorMenuItem() # separator + menu.append(item) + + # Edit Groups edit_groups_item = gtk.ImageMenuItem(_('Edit _Groups')) icon = gtk.image_new_from_stock(gtk.STOCK_EDIT, gtk.ICON_SIZE_MENU) edit_groups_item.set_image(icon) menu.append(edit_groups_item) edit_groups_item.connect('activate', self.on_edit_groups, list_) - account = None - for (contact, current_account) in list_: - # check that we use the same account for every sender - if account is not None and account != current_account: - account = None - break - account = current_account - if account is not None: - send_group_message_item = gtk.ImageMenuItem(_('Send Group M_essage')) - icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) - send_group_message_item.set_image(icon) - menu.append(send_group_message_item) - send_group_message_item.connect('activate', - self.on_send_single_message_menuitem_activate, account, list_) + item = gtk.SeparatorMenuItem() # separator + menu.append(item) + # Block if is_blocked: unblock_menuitem = gtk.ImageMenuItem(_('_Unblock')) icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) @@ -2406,7 +2408,14 @@ block_menuitem.set_image(icon) block_menuitem.connect('activate', self.on_block, None, list_) menu.append(block_menuitem) - # unsensitive if one account is not connected + + # Remove + remove_item = gtk.ImageMenuItem(_('_Remove from Roster')) + icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) + remove_item.set_image(icon) + menu.append(remove_item) + remove_item.connect('activate', self.on_req_usub, list_) + # unsensitive remove if one account is not connected if one_account_offline: remove_item.set_sensitive(False)

1 0

[commit-gajim] r8246 - trunk/src/common
by steve-e＠gajim.org 08 Jun '07

08 Jun '07

Author: steve-e Date: 2007-06-08 22:28:47 +0200 (Fri, 08 Jun 2007) New Revision: 8246 Modified: trunk/src/common/connection.py Log: Fix Account Creat Wizzard, let it not use a removed function. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-06-08 19:42:02 UTC (rev 8245) +++ trunk/src/common/connection.py 2007-06-08 20:28:47 UTC (rev 8246) @@ -248,10 +248,7 @@ % (data[0], data[3]))) return is_form = data[2] - if is_form: - conf = data[1] - else: - conf = data[1].asDict() + conf = data[1] self.dispatch('NEW_ACC_CONNECTED', (conf, is_form)) return if not data[1]: # wrong answer @@ -260,10 +257,7 @@ (data[0], data[3]))) return is_form = data[2] - if is_form: - conf = data[1] - else: - conf = data[1].asDict() + conf = data[1] self.dispatch('REGISTER_AGENT_INFO', (data[0], conf, is_form)) elif realm == common.xmpp.NS_PRIVACY: if event == common.xmpp.features_nb.PRIVACY_LISTS_RECEIVED:

1 0

[commit-gajim] r8245 - in branches/e2e_encryption: data/glade src src/common
by bct＠gajim.org 08 Jun '07

08 Jun '07

Author: bct Date: 2007-06-08 21:42:02 +0200 (Fri, 08 Jun 2007) New Revision: 8245 Modified: branches/e2e_encryption/data/glade/chat_control_popup_menu.glade branches/e2e_encryption/src/chat_control.py branches/e2e_encryption/src/common/stanza_session.py Log: stubs for XEP-0116 Modified: branches/e2e_encryption/data/glade/chat_control_popup_menu.glade =================================================================== --- branches/e2e_encryption/data/glade/chat_control_popup_menu.glade 2007-06-07 22:49:47 UTC (rev 8244) +++ branches/e2e_encryption/data/glade/chat_control_popup_menu.glade 2007-06-08 19:42:02 UTC (rev 8245) @@ -66,6 +66,16 @@ </child> <child> + <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle XEP-0116 Encryption</property> + <property name="use_underline">True</property> + <property name="active">False</property> + <signal name="activate" handler="_on_toggle_e2e_menuitem_activate" last_modification_time="Tue, 05 Jun 2007 22:22:40 MDT"/> + </widget> + </child> + + <child> <widget class="GtkCheckMenuItem" id="compact_view_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">_Compact View Alt+C</property> Modified: branches/e2e_encryption/src/chat_control.py =================================================================== --- branches/e2e_encryption/src/chat_control.py 2007-06-07 22:49:47 UTC (rev 8244) +++ branches/e2e_encryption/src/chat_control.py 2007-06-08 19:42:02 UTC (rev 8245) @@ -1255,7 +1255,7 @@ # this is here (and not in send_chatstate) # because we want it sent with REAL message # (not standlone) eg. one that has body - + if contact.our_chatstate: # We already asked for xep 85, don't ask it twice composing_jep = 'asked_once' @@ -1939,6 +1939,12 @@ tb = self.xml.get_widget('gpg_togglebutton') tb.set_active(not tb.get_active()) + def _on_toggle_e2e_menuitem_activate(self, widget): + if 'security' in self.session.features and self.session.features['security'] == 'e2e': + self.session.negotiate_e2e() + else: + self.session.terminate_e2e() + def got_connected(self): ChatControlBase.got_connected(self) # Refreshing contact Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-06-07 22:49:47 UTC (rev 8244) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-06-08 19:42:02 UTC (rev 8245) @@ -28,6 +28,102 @@ self.thread_id = self.generate_thread_id() self.last_send = 0 + self.features = {} def generate_thread_id(self): return "".join([random.choice(string.letters) for x in xrange(0,32)]) + + def negotiate_e2e(): + + pass + + +#<x type='form' xmlns='jabber:x:data'> +# <field type='hidden' var='FORM_TYPE'> +# <value>urn:xmpp:ssn</value> +# </field> +# <field type='boolean' var='accept'> +# <value>1</value> +# <required/> +# </field> +# <field type='list-single' var='otr'> +# <option><value>false</value></option> +# <option><value>true</value></option> +# <required/> +# </field> +# <field type='list-single' var='disclosure'> +# <option><value>never</value></option> +# <required/> +# </field> +# <field type='list-single' var='security'> +# <option><value>e2e</value></option> +# <option><value>c2s</value></option> +# <required/> +# </field> +# <field type='list-single' var='modp'> +# <option><value>5</value></option> +# <option><value>14</value></option> +# <option><value>2</value></option> +# <option><value>1</value></option> +# </field> +# <field type='hidden' var='crypt_algs'> +# <value>aes128-ctr</value> +# </field> +# <field type='hidden' var='hash_algs'> +# <value>sha256</value> +# </field> +# <field type='hidden' var='compress'> +# <value>none</value> +# </field> +# <field type='list-multi' var='stanzas'> +# <option><value>message</value></option> +# <option><value>iq</value></option> +# <option><value>presence</value></option> +# </field> +# <field type='hidden' var='init_pubkey'> +# <value>none</value> +# </field> +# <field type='hidden' var='resp_pubkey'> +# <value>none</value> +# </field> +# <field type='list-single' var='ver'> +# <option><value>1.3</value></option> +# <option><value>1.2</value></option> +# </field> +# <field type='hidden' var='rekey_freq'> +# <value>4294967295</value> +# </field> +# <field type='hidden' var='my_nonce'> +# <value> ** Alice's Base64 encoded ESession ID ** </value> +# </field> +# <field type='hidden' var='sas_algs'> +# <value>sas28x5</value> +# </field> +# <field type='hidden' var='dhhashes'> +# <value> ** Base64 encoded value of He5 ** </value> +# <value> ** Base64 encoded value of He14 ** </value> +# <value> ** Base64 encoded value of He2 ** </value> +# <value> ** Base64 encoded value of He1 ** </value> +# </field> +# </x> + + def terminate_e2e(): + pass + +#<message from='alice(a)example.org/pda' to='bob(a)example.com/laptop'> +# <thread>ffd7076498744578d10edabfe7f4a866</thread> +# <c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'> +# <data> ** Base64 encoded encrypted terminate form ** </data> +# <old> ** Base64 encoded old MAC key ** </old> +# <mac> ** Base64 encoded a_mac ** </mac> +# </c> +#</message> + +# <feature xmlns='http://jabber.org/protocol/feature-neg'> +# <x xmlns='jabber:x:data' type='submit'> +# <field var='FORM_TYPE'> +# <value>urn:xmpp:ssn</value> +# </field> +# <field var='terminate'><value>1</value></field> +# </x> +# </feature>

1 0

[commit-gajim] r8244 - in trunk/src/common: . xmpp
by liori＠gajim.org 07 Jun '07

07 Jun '07

Author: liori Date: 2007-06-08 00:49:47 +0200 (Fri, 08 Jun 2007) New Revision: 8244 Modified: trunk/src/common/connection.py trunk/src/common/xmpp/transports_nb.py Log: Some comments added. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-06-07 12:47:07 UTC (rev 8243) +++ trunk/src/common/connection.py 2007-06-07 22:49:47 UTC (rev 8244) @@ -87,7 +87,11 @@ def __init__(self, name): ConnectionHandlers.__init__(self) self.name = name - self.connected = 0 # offline + # self.connected: + # 0=>offline, + # 1=>connection in progress, + # 2=>authorised + self.connected = 0 self.connection = None # xmpppy ClientCommon instance # this property is used to prevent double connections self.last_connection = None # last ClientCommon instance @@ -296,6 +300,8 @@ self.dispatch('STANZA_SENT', unicode(data)) def select_next_host(self, hosts): + '''Chooses best 'real' host basing on the SRV priority and weight data; + more info in RFC2782''' hosts_best_prio = [] best_prio = 65535 sum_weight = 0 Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2007-06-07 12:47:07 UTC (rev 8243) +++ trunk/src/common/xmpp/transports_nb.py 2007-06-07 22:49:47 UTC (rev 8244) @@ -298,7 +298,7 @@ self.renew_send_timeout() def connect(self,server=None, proxy = None, secure = None): - ''' Try to establish connection. Returns non-empty string on success. ''' + ''' Try to establish connection. Returns True/False on success/failure. ''' if not server: server=self._server else: @@ -418,6 +418,12 @@ self.idlequeue.remove_timeout(self.fd) def onreceive(self, recv_handler): + ''' Sets the on_receive callback. Do not confuse it with + on_receive() method, which is the callback itself. + + If recv_handler==None, it tries to set that callback assuming that + our owner also has a Dispatcher object plugged in, to its + ProcessNonBlocking method.''' if not recv_handler: if hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking

1 0

[commit-gajim] r8243 - trunk/src
by roidelapluie＠gajim.org 07 Jun '07

07 Jun '07

Author: roidelapluie Date: 2007-06-07 14:47:07 +0200 (Thu, 07 Jun 2007) New Revision: 8243 Modified: trunk/src/groupchat_control.py Log: remove groupchats from roster when the tab is destroyed Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-06-07 11:58:56 UTC (rev 8242) +++ trunk/src/groupchat_control.py 2007-06-07 12:47:07 UTC (rev 8243) @@ -1451,6 +1451,10 @@ del self.handlers[i] # Remove unread events from systray gajim.events.remove_events(self.account, self.room_jid) + contact = gajim.contacts.get_contact_with_highest_priority(self.account, \ + self.room_jid) + if contact: + gajim.interface.roster.remove_contact(contact, self.account) def allow_shutdown(self, method): '''If check_selection is True, '''

1 0

[commit-gajim] r8242 - trunk/src
by roidelapluie＠gajim.org 07 Jun '07

07 Jun '07

Author: roidelapluie Date: 2007-06-07 13:58:56 +0200 (Thu, 07 Jun 2007) New Revision: 8242 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py Log: Open private messages in minimized rooms by middle-clicking on systray icon. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-06-06 21:55:43 UTC (rev 8241) +++ trunk/src/chat_control.py 2007-06-07 11:58:56 UTC (rev 8242) @@ -825,11 +825,15 @@ room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) groupchat_control = gajim.interface.msg_win_mgr.get_control( room_jid, self.account) - if not groupchat_control and \ - gajim.interface.minimized_controls.has_key(self.account) and \ + if gajim.interface.minimized_controls.has_key(self.account) and \ room_jid in gajim.interface.minimized_controls[self.account]: groupchat_control = \ gajim.interface.minimized_controls[self.account][room_jid] + contact = \ + gajim.contacts.get_contact_with_highest_priority(self.account, \ + room_jid) + if contact: + gajim.interface.roster.draw_contact(room_jid, self.account) groupchat_control.draw_contact(nick) mw = gajim.interface.msg_win_mgr.get_window(room_jid, self.account) if mw: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-06-06 21:55:43 UTC (rev 8241) +++ trunk/src/groupchat_control.py 2007-06-07 11:58:56 UTC (rev 8242) @@ -97,12 +97,15 @@ class PrivateChatControl(ChatControl): TYPE_ID = message_control.TYPE_PM - def __init__(self, parent_win, gc_contact, contact, acct): + def __init__(self, parent_win, gc_contact, contact, account): room_jid = contact.jid.split('/')[0] - room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, acct) + room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, account) + if gajim.interface.minimized_controls.has_key(account) and \ + gajim.interface.minimized_controls[account].has_key(room_jid): + room_ctrl = gajim.interface.minimized_controls[account][room_jid] self.room_name = room_ctrl.name self.gc_contact = gc_contact - ChatControl.__init__(self, parent_win, contact, acct) + ChatControl.__init__(self, parent_win, contact, account) self.TYPE_ID = 'pm' def send_message(self, message): @@ -127,7 +130,7 @@ return ChatControl.send_message(self, message) - + def update_ui(self): if self.contact.show == 'offline': self.got_disconnected() @@ -556,7 +559,10 @@ self.list_treeview.expand_row(path[0:1], False) self.list_treeview.scroll_to_cell(path) self.list_treeview.set_cursor(path) - gajim.interface.roster.draw_contact(self.room_jid, self.account) + contact = gajim.contacts.get_contact_with_highest_priority(self.account, \ + self.room_jid) + if contact: + gajim.interface.roster.draw_contact(self.room_jid, self.account) def get_contact_iter(self, nick): model = self.list_treeview.get_model() @@ -1841,7 +1847,7 @@ else: # We want to send a private message nick = model[path][C_NICK].decode('utf-8') self._start_private_message(nick) - + def on_list_treeview_row_activated(self, widget, path, col = 0): '''When an iter is double clicked: open the chat window''' if not gajim.single_click:

1 0

[commit-gajim] r8241 - trunk/src
by asterix＠gajim.org 06 Jun '07

06 Jun '07

Author: asterix Date: 2007-06-06 23:55:43 +0200 (Wed, 06 Jun 2007) New Revision: 8241 Modified: trunk/src/roster_window.py Log: don't open autojoined groupchats when we go from invisible to offline Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-06-06 21:40:56 UTC (rev 8240) +++ trunk/src/roster_window.py 2007-06-06 21:55:43 UTC (rev 8241) @@ -3282,7 +3282,7 @@ # tab is opened, send initial join_gc() gajim.connections[account].join_gc(gc_control.nick, gc_control.room_jid, None) - if was_invisible: + if was_invisible and status != 'offline': # We come back from invisible, join bookmarks for bm in gajim.connections[account].bookmarks: room_jid = bm['jid']

1 0

[commit-gajim] r8240 - trunk/src/common/xmpp
by asterix＠gajim.org 06 Jun '07

06 Jun '07

Author: asterix Date: 2007-06-06 23:40:56 +0200 (Wed, 06 Jun 2007) New Revision: 8240 Modified: trunk/src/common/xmpp/features_nb.py Log: Do not use xmpppy DataForm class Modified: trunk/src/common/xmpp/features_nb.py =================================================================== --- trunk/src/common/xmpp/features_nb.py 2007-06-06 21:07:06 UTC (rev 8239) +++ trunk/src/common/xmpp/features_nb.py 2007-06-06 21:40:56 UTC (rev 8240) @@ -128,16 +128,13 @@ return df=tag.getTag('x',namespace=NS_DATA) if df: - con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,DataForm(node=df),True,'')) + con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,df,True,'')) return - df=DataForm(typ='form') + df={} for i in resp.getQueryPayload(): if not isinstance(i, Node): - pass - elif i.getName()=='instructions': - df.addInstructions(i.getData()) - else: - df.setField(i.getName()).setValue(i.getData()) + continue + df[i.getName()] = i.getData() con.Event(NS_REGISTER, REGISTER_DATA_RECEIVED, (agent,df,False,'')) def register(disp, host, info, cb):

1 0

[commit-gajim] r8239 - trunk/src
by asterix＠gajim.org 06 Jun '07

06 Jun '07

Author: asterix Date: 2007-06-06 23:07:06 +0200 (Wed, 06 Jun 2007) New Revision: 8239 Modified: trunk/src/config.py Log: correct widget name Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-06-06 09:57:33 UTC (rev 8238) +++ trunk/src/config.py 2007-06-06 21:07:06 UTC (rev 8239) @@ -2842,7 +2842,7 @@ 'http://www.jabber.org/network/oldnetwork.shtml') def on_save_password_checkbutton_toggled(self, widget): - self.xml.get_widget('pass1_entry').grab_focus() + self.xml.get_widget('password_entry').grab_focus() def on_cancel_button_clicked(self, widget): self.window.destroy()

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

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 June 2007