Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r9939 - trunk/src
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 18:45:39 +0200 (Tue, 15 Jul 2008) New Revision: 9939 Modified: trunk/src/chat_control.py Log: GPG is always authenticated as we use GPG's WoT. An idea: Currently, we don't send the message when the key has not enough trust. How about showing the unauthenticated icon then, but sending the message? Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-15 14:39:54 UTC (rev 9938) +++ trunk/src/chat_control.py 2008-07-15 16:45:39 UTC (rev 9939) @@ -1130,20 +1130,26 @@ # Enable encryption if needed e2e_is_active = self.session and self.session.enable_encryption self.gpg_is_active = False - gpg_pref = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled') + gpg_pref = gajim.config.get_per('contacts', contact.jid, + 'gpg_enabled') # try GPG first - if not e2e_is_active and gpg_pref and gajim.config.get_per('accounts', self.account, 'keyid') and\ + if not e2e_is_active and gpg_pref and \ + gajim.config.get_per('accounts', self.account, 'keyid') and \ gajim.connections[self.account].USE_GPG: self.gpg_is_active = True gajim.encrypted_chats[self.account].append(contact.jid) msg = _('GPG encryption enabled') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + ChatControlBase.print_conversation_line(self, msg, + 'status', '', None) if self.session: - self.session.loggable = gajim.config.get('log_encrypted_sessions') - self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \ - self.session.is_loggable(), self.session and self.session.verified_identity) + self.session.loggable = gajim.config.get( + 'log_encrypted_sessions') + # GPG is always authenticated as we use GPG's WoT + self._show_lock_image(self.gpg_is_active, 'GPG', + self.gpg_is_active, + self.session and self.session.is_loggable(), True) # then try E2E # XXX: Once we have fallback to disco, remove notexistant check elif not e2e_is_active and \

1 0

[commit-gajim] r9938 - trunk/src/common
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 16:39:54 +0200 (Tue, 15 Jul 2008) New Revision: 9938 Modified: trunk/src/common/connection.py Log: D'oh! Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-15 14:22:34 UTC (rev 9937) +++ trunk/src/common/connection.py 2008-07-15 14:39:54 UTC (rev 9938) @@ -1126,7 +1126,7 @@ if ((composing_xep == 'XEP-0085' or not composing_xep) \ and composing_xep != 'asked_once') or \ (gajim.capscache.is_supported(contact, - xmpp.NS_CHATSTATES) and \ + common.xmpp.NS_CHATSTATES) and \ not gajim.capscache.is_supported(contact, 'notexistant')): # XEP-0085

1 0

[commit-gajim] r9937 - trunk/src
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 16:22:34 +0200 (Tue, 15 Jul 2008) New Revision: 9937 Modified: trunk/src/remote_control.py Log: Fix #4100. dbus-monitor actually showed the traceback that wouldn't appear anywhere else. Note to others: DBus.String needs to be converted using str()! Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-07-15 13:51:20 UTC (rev 9936) +++ trunk/src/remote_control.py 2008-07-15 14:22:34 UTC (rev 9937) @@ -653,10 +653,10 @@ @dbus.service.method(INTERFACE, in_signature='ss', out_signature='') def send_xml(self, xml, account): if account: - gajim.connections[account].send_stanza(xml) + gajim.connections[account].send_stanza(str(xml)) else: for acc in gajim.contacts.get_accounts(): - gajim.connections[acc].send_stanza(xml) + gajim.connections[acc].send_stanza(str(xml)) @dbus.service.method(INTERFACE, in_signature='ssss', out_signature='') def join_room(self, room_jid, nick, password, account):

1 0

[commit-gajim] r9936 - trunk/src/common
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 15:51:20 +0200 (Tue, 15 Jul 2008) New Revision: 9936 Modified: trunk/src/common/connection.py Log: Proper checking for XEP-0085, with workaround for the caps missing problem. Same here, remove check to notexistant once we have fallback to disco. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-15 13:31:25 UTC (rev 9935) +++ trunk/src/common/connection.py 2008-07-15 13:51:20 UTC (rev 9936) @@ -1121,16 +1121,25 @@ # please note that the only valid tag inside a message containing a <body> # tag is the active event if chatstate is not None: - if (composing_xep == 'XEP-0085' or not composing_xep) and \ - composing_xep != 'asked_once': + # XXX: Once we have fallback to disco, + # remove notexistant check + if ((composing_xep == 'XEP-0085' or not composing_xep) \ + and composing_xep != 'asked_once') or \ + (gajim.capscache.is_supported(contact, + xmpp.NS_CHATSTATES) and \ + not gajim.capscache.is_supported(contact, + 'notexistant')): # XEP-0085 - msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES) - if composing_xep in ('XEP-0022', 'asked_once') or not composing_xep: + msg_iq.setTag(chatstate, + namespace = common.xmpp.NS_CHATSTATES) + if composing_xep in ('XEP-0022', 'asked_once') or \ + not composing_xep: # XEP-0022 chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT) if chatstate is 'composing' or msgtxt: - chatstate_node.addChild(name = 'composing') + chatstate_node.addChild( + name = 'composing') if forward_from: addresses = msg_iq.addChild('addresses',

1 0

[commit-gajim] r9935 - trunk/data/glade
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 15:31:25 +0200 (Tue, 15 Jul 2008) New Revision: 9935 Modified: trunk/data/glade/message_window.glade Log: Revert r9902. bct agreed on that. Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-15 13:30:31 UTC (rev 9934) +++ trunk/data/glade/message_window.glade 2008-07-15 13:31:25 UTC (rev 9935) @@ -111,22 +111,6 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> <widget class="GtkButton" id="authentication_button"> <property name="no_show_all">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -146,6 +130,22 @@ <property name="padding">0</property> </packing> </child> + <child> + <widget class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">3</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> <property name="expand">False</property>

1 0

[commit-gajim] r9934 - trunk/src
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 15:30:31 +0200 (Tue, 15 Jul 2008) New Revision: 9934 Modified: trunk/src/chat_control.py Log: Revert r9928 and implement a workaround that allows real E2E checking. This workaround will still work once fallback to disco is supported, though it SHOULD be removed then as it's not necassary anymore then. @bct: Now we only need to get rid of that password dialog :). Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-15 03:16:58 UTC (rev 9933) +++ trunk/src/chat_control.py 2008-07-15 13:30:31 UTC (rev 9934) @@ -45,7 +45,7 @@ from common.logger import Constants constants = Constants() from common.rst_xhtml_generator import create_xhtml -from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC +from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_ESESSION try: import gtkspell @@ -1144,6 +1144,12 @@ self.session.loggable = gajim.config.get('log_encrypted_sessions') self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \ self.session.is_loggable(), self.session and self.session.verified_identity) + # then try E2E + # XXX: Once we have fallback to disco, remove notexistant check + elif not e2e_is_active and \ + gajim.capscache.is_supported(contact, NS_ESESSION) and \ + not gajim.capscache.is_supported(contact, 'notexistant'): + self.begin_e2e_negotiation() self.status_tooltip = gtk.Tooltips() @@ -1806,7 +1812,10 @@ toggle_gpg_menuitem.set_active(self.gpg_is_active) # disable esessions if we or the other client don't support them - if not gajim.HAVE_PYCRYPTO: + # XXX: Once we have fallback to disco, remove notexistant check + if not gajim.HAVE_PYCRYPTO or \ + not gajim.capscache.is_supported(contact, NS_ESESSION) or \ + gajim.capscache.is_supported(contact, 'notexistant'): toggle_e2e_menuitem.set_sensitive(False) else: toggle_e2e_menuitem.set_active(e2e_is_active)

1 0

[commit-gajim] r9933 - trunk/src
by bct＠gajim.org 15 Jul '08

15 Jul '08

Author: bct Date: 2008-07-15 05:16:58 +0200 (Tue, 15 Jul 2008) New Revision: 9933 Modified: trunk/src/gajim.py Log: show warning dialog when receiving an unencryptable message Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-14 23:49:25 UTC (rev 9932) +++ trunk/src/gajim.py 2008-07-15 03:16:58 UTC (rev 9933) @@ -1733,11 +1733,13 @@ def handle_event_failed_decrypt(self, account, data): jid, tim, session = data + details = _('Unable to decrypt message from ' + '%s\nIt may have been tampered with.') % (jid) + if session.control: - session.control.print_conversation_line('Unable to decrypt message from '+ - '%s\nIt may have been tampered with.' % (jid), 'status', '', tim) + session.control.print_conversation_line(details, 'status', '', tim) else: - print 'failed decrypt, unable to find a control to notify you in.' + dialogs.WarningDialog(_('Unable to decrypt message'), details) def handle_event_privacy_lists_received(self, account, data): # ('PRIVACY_LISTS_RECEIVED', account, list)

1 0

[commit-gajim] r9932 - trunk
by bct＠gajim.org 14 Jul '08

14 Jul '08

Author: bct Date: 2008-07-15 01:49:25 +0200 (Tue, 15 Jul 2008) New Revision: 9932 Modified: trunk/AUTHORS Log: sorted AUTHORS by last name and added myself Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2008-07-14 23:46:22 UTC (rev 9931) +++ trunk/AUTHORS 2008-07-14 23:49:25 UTC (rev 9932) @@ -1,15 +1,16 @@ CURRENT DEVELOPERS: +Stephan Erb (steve-e AT h3c.de) +Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Nikos Kouremenos (kourem AT gmail.com) -Travis Shirk (travis AT pobox.com) -Stephan Erb (steve-e AT h3c.de) Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: Stefan Bethge (stefan AT lanpartei.de) +Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) -Vincent Hanquez (tab AT snarc.org)

1 0

[commit-gajim] r9931 - in trunk/src: . common
by bct＠gajim.org 14 Jul '08

14 Jul '08

Author: bct Date: 2008-07-15 01:46:22 +0200 (Tue, 15 Jul 2008) New Revision: 9931 Modified: trunk/src/common/events.py trunk/src/groupchat_control.py trunk/src/session.py Log: fix encrypted/unencrypted notifications in PM Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2008-07-14 23:21:08 UTC (rev 9930) +++ trunk/src/common/events.py 2008-07-14 23:46:22 UTC (rev 9931) @@ -36,7 +36,7 @@ file-request-error, file-send-error, file-stopped, gc_msg, pm, printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm parameters is (per type_): - chat, normal: [message, subject, kind, time, encrypted, resource, + chat, normal, pm: [message, subject, kind, time, encrypted, resource, msg_id] where kind in error, incoming file-*: file_props Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-07-14 23:21:08 UTC (rev 9930) +++ trunk/src/groupchat_control.py 2008-07-14 23:46:22 UTC (rev 9931) @@ -645,18 +645,14 @@ else: self.print_conversation(msg, nick, tim, xhtml) - def on_private_message(self, nick, msg, tim, xhtml, session, msg_id = None): + def on_private_message(self, nick, msg, tim, xhtml, session, + msg_id = None, encrypted = False): # Do we have a queue? fjid = self.room_jid + '/' + nick no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 - # We print if window is opened - if session.control: - session.control.print_conversation(msg, tim = tim, xhtml = xhtml) - return - event = gajim.events.create_event('pm', (msg, '', 'incoming', tim, - False, '', msg_id, xhtml, session)) + encrypted, '', msg_id, xhtml, session)) gajim.events.add_event(self.account, fjid, event) autopopup = gajim.config.get('autopopup') Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-14 23:21:08 UTC (rev 9930) +++ trunk/src/session.py 2008-07-14 23:46:22 UTC (rev 9931) @@ -188,8 +188,14 @@ if pm: nickname = resource - groupchat_control.on_private_message(nickname, msgtxt, tim, - xhtml, self, msg_id) + if self.control: + # print if a control is open + self.control.print_conversation(msgtxt, + tim = tim, xhtml = xhtml, encrypted = encrypted) + else: + # otherwise pass it off to the control to be queued + groupchat_control.on_private_message(nickname, msgtxt, tim, + xhtml, self, msg_id=msg_id, encrypted=encrypted) else: self.roster_message(jid, msgtxt, tim, encrypted, msg_type, subject, resource, msg_id, user_nick, advanced_notif_num,

1 0

[commit-gajim] r9930 - trunk/src
by bct＠gajim.org 14 Jul '08

14 Jul '08

Author: bct Date: 2008-07-15 01:21:08 +0200 (Tue, 15 Jul 2008) New Revision: 9930 Modified: trunk/src/gajim.py Log: fix clicking notification when someone logs in Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-14 05:01:22 UTC (rev 9929) +++ trunk/src/gajim.py 2008-07-14 23:21:08 UTC (rev 9930) @@ -2135,11 +2135,12 @@ elif type_ in ('printed_chat', 'chat', ''): # '' is for log in/out notifications - event = gajim.events.get_first_event(account, fjid, type_) - if not event: - event = gajim.events.get_first_event(account, jid, type_) - if not event: - return + if type_ != '': + event = gajim.events.get_first_event(account, fjid, type_) + if not event: + event = gajim.events.get_first_event(account, jid, type_) + if not event: + return if type_ == 'printed_chat': ctrl = event.parameters[0]

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
23
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 July 2008