Commits December 2011

commits@gajim.org

3 participants
147 discussions

gajim: msn auth is now availble through https
by Yann Leboulanger 31 Dec '11

31 Dec '11

changeset f0b5cb8fe1cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0b5cb8fe1cd description: msn auth is now availble through https diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 62a3c2e30276 -r f0b5cb8fe1cd src/common/config.py --- a/src/common/config.py Sat Dec 31 15:54:11 2011 +0100 +++ b/src/common/config.py Sat Dec 31 15:54:32 2011 +0100 @@ -386,7 +386,7 @@ 'ft_send_local_ips': [ opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], - 'oauth2_redirect_url': [ opt_str, 'http%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], + 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ],

1 0

gajim: handle MISSING PASSPHRASE in gnupg.py
by Yann Leboulanger 31 Dec '11

31 Dec '11

changeset 62a3c2e30276 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=62a3c2e30276 description: handle MISSING PASSPHRASE in gnupg.py diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a8cbcf420d64 -r 62a3c2e30276 src/common/gnupg.py --- a/src/common/gnupg.py Mon Dec 19 10:26:36 2011 +0100 +++ b/src/common/gnupg.py Sat Dec 31 15:54:11 2011 +0100 @@ -962,7 +962,7 @@ def handle_status(self, key, value): if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", - "GOOD_PASSPHRASE", "BEGIN_SIGNING"): + "GOOD_PASSPHRASE", "BEGIN_SIGNING", "MISSING_PASSPHRASE"): pass elif key == "SIG_CREATED": (self.type,

1 0

gajim: dont use content-remove for FT use session-terminate
by Jefry Lagrange 29 Dec '11

29 Dec '11

changeset d0ce81321fa1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d0ce81321fa1 description: dont use content-remove for FT use session-terminate diffstat: src/gui_interface.py | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diffs (26 lines): diff -r 7a9de4d181e1 -r d0ce81321fa1 src/gui_interface.py --- a/src/gui_interface.py Thu Dec 29 14:08:35 2011 +0100 +++ b/src/gui_interface.py Thu Dec 29 17:22:51 2011 -0500 @@ -927,19 +927,10 @@ jid = unicode(file_props['receiver']) gajim.socks5queue.remove_sender(file_props['sid'], True, True) # End jingle session - if file_props.get('session-type') == 'jingle' and file_props['type'] ==\ - 'r': - session = gajim.connections[account].get_jingle_session(jid, + session = gajim.connections[account].get_jingle_session(jid, sid=file_props['session-sid']) - # get content: - content = None - for c in session.contents.values(): - if c.file_props['sid'] == file_props['sid']: - content = c - break - if not content: - return - session.remove_content('initiator', c.name) + if session: + session.end_session() if helpers.allow_popup_window(account): if file_props['error'] == 0:

1 0

gajim: fix sending jingle ack
by Yann Leboulanger 29 Dec '11

29 Dec '11

changeset 7a9de4d181e1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7a9de4d181e1 description: fix sending jingle ack diffstat: src/common/jingle_ft.py | 4 ++++ src/common/jingle_session.py | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diffs (46 lines): diff -r 72730fbb5184 -r 7a9de4d181e1 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Dec 29 11:39:02 2011 +0100 +++ b/src/common/jingle_ft.py Thu Dec 29 14:08:35 2011 +0100 @@ -116,6 +116,7 @@ if self.state == STATE_TRANSPORT_REPLACE: # We ack the session accept response = stanza.buildReply('result') + response.delChild(response.getQuery()) con.connection.send(response) # We send the file con.files_props[self.file_props['sid']] = self.file_props @@ -131,6 +132,7 @@ host['sid'] = self.file_props['sid'] response = stanza.buildReply('result') + response.delChild(response.getQuery()) con.connection.send(response) if not gajim.socks5queue.get_file_props( @@ -174,6 +176,7 @@ self.session.transport_replace() else: response = stanza.buildReply('result') + response.delChild(response.getQuery()) self.session.connection.connection.send(response) self.start_transfer() raise xmpp.NodeProcessed @@ -203,6 +206,7 @@ self.nominated_cand['peer-cand'] = streamhost_used if self.state == STATE_CAND_SENT_PENDING_REPLY: response = stanza.buildReply('result') + response.delChild(response.getQuery()) self.session.connection.connection.send(response) self.start_transfer() raise xmpp.NodeProcessed diff -r 72730fbb5184 -r 7a9de4d181e1 src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Dec 29 11:39:02 2011 +0100 +++ b/src/common/jingle_session.py Thu Dec 29 14:08:35 2011 +0100 @@ -344,6 +344,7 @@ Default callback for action stanzas -- simple ack and stop processing """ response = stanza.buildReply('result') + response.delChild(response.getQuery()) self.connection.connection.send(response) def __on_error(self, stanza, jingle, error, action):

1 0

gajim: merge from trunk
by Yann Leboulanger 29 Dec '11

29 Dec '11

changeset 72730fbb5184 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=72730fbb5184 description: merge from trunk diffstat: .hgtags | 2 + ChangeLog | 31 + Makefile.am | 14 +- README.html | 4 +- autogen.sh | 2 +- data/gui/accounts_window.ui | 205 +- data/gui/chat_control.ui | 2 +- data/gui/contact_context_menu.ui | 2 +- data/gui/history_window.ui | 21 +- data/gui/plugins_window.ui | 398 +- data/gui/preferences_window.ui | 136 +- data/gui/roster_window.ui | 14 +- debian/README.Debian | 2 - debian/changelog | 33 + debian/control | 6 +- debian/copyright | 4 +- debian/docs | 2 +- debian/install | 1 + debian/patches/00_debian-copying.diff | 21 - debian/patches/01_configure-ac.diff | 33 - debian/patches/series | 2 - debian/rules | 6 +- gajim.nsi | 28 +- plugins/Makefile.am | 12 +- plugins/acronyms_expander/acronyms_expander.py | 6 +- plugins/banner_tweaks/__init__.py | 2 - plugins/banner_tweaks/config_dialog.ui | 75 - plugins/banner_tweaks/manifest.ini | 10 - plugins/banner_tweaks/plugin.py | 201 - plugins/dbus_plugin/plugin.py | 3 + plugins/events_dump/plugin.py | 1 + plugins/ftp_manager/__init__.py | 1 - plugins/ftp_manager/config_dialog.ui | 281 - plugins/ftp_manager/ftp_manager.py | 460 - plugins/ftp_manager/manifest.ini | 7 - plugins/google_translation/__init__.py | 1 - plugins/google_translation/manifest.ini | 8 - plugins/google_translation/plugin.py | 118 - plugins/length_notifier/__init__.py | 2 - plugins/length_notifier/config_dialog.ui | 152 - plugins/length_notifier/length_notifier.py | 155 - plugins/length_notifier/manifest.ini | 9 - plugins/new_events_example/plugin.py | 2 + plugins/roster_buttons/plugin.py | 4 +- plugins/roster_buttons/roster_buttons.ui | 8 +- plugins/snarl_notifications/plugin.py | 4 + plugins/triggers/__init__.py | 1 - plugins/triggers/config_dialog.ui | 900 --- plugins/triggers/manifest.ini | 7 - plugins/triggers/triggers.py | 637 -- plugins/whiteboard/__init__.py | 1 - plugins/whiteboard/brush_tool.png | Bin plugins/whiteboard/line_tool.png | Bin plugins/whiteboard/manifest.ini | 7 - plugins/whiteboard/oval_tool.png | Bin plugins/whiteboard/plugin.py | 477 - plugins/whiteboard/whiteboard.png | Bin plugins/whiteboard/whiteboard_widget.py | 419 - plugins/whiteboard/whiteboard_widget.ui | 192 - po/de.po | 4447 ++++++++-------- po/fr.po | 6526 ++++++++++++++--------- po/ja.po | 5834 +++++++++----------- po/ru.po | 4075 +++++++------- po/uk.po | 3400 ++++++------ po/zh_TW.po | 5358 ++++++++++-------- scripts/dev/plugins_translate | 95 + setup_win32.py | 9 +- src/chat_control.py | 340 +- src/command_system/implementation/execute.py | 2 +- src/command_system/implementation/standard.py | 19 +- src/common/commands.py | 9 +- src/common/config.py | 24 +- src/common/connection.py | 364 +- src/common/connection_handlers.py | 175 +- src/common/connection_handlers_events.py | 276 +- src/common/contacts.py | 68 +- src/common/defs.py | 2 +- src/common/events.py | 10 +- src/common/gajim.py | 37 +- src/common/ged.py | 13 +- src/common/gnupg.py | 2 +- src/common/helpers.py | 177 +- src/common/jingle.py | 5 +- src/common/jingle_rtp.py | 21 +- src/common/jingle_session.py | 7 +- src/common/jingle_transport.py | 7 +- src/common/logger.py | 106 +- src/common/optparser.py | 11 +- src/common/protocol/bytestream.py | 110 +- src/common/proxy65_manager.py | 15 +- src/common/pubsub.py | 7 +- src/common/stanza_session.py | 12 +- src/common/xmpp/__init__.py | 1 + src/common/xmpp/auth_nb.py | 186 +- src/common/xmpp/bosh.py | 18 +- src/common/xmpp/client_nb.py | 13 +- src/common/xmpp/dispatcher_nb.py | 40 + src/common/xmpp/protocol.py | 116 +- src/common/xmpp/roster_nb.py | 16 +- src/common/xmpp/smacks.py | 130 + src/common/xmpp/stringprepare.py | 4 +- src/common/xmpp/tls_nb.py | 3 +- src/common/zeroconf/client_zeroconf.py | 103 +- src/common/zeroconf/connection_zeroconf.py | 64 +- src/common/zeroconf/zeroconf_bonjour.py | 2 +- src/config.py | 73 +- src/conversation_textview.py | 16 +- src/dialogs.py | 98 +- src/features_window.py | 139 +- src/filetransfers_window.py | 132 +- src/gajim.py | 73 +- src/groupchat_control.py | 136 +- src/groups.py | 1 - src/gtkgui_helpers.py | 1 + src/gui_interface.py | 216 +- src/gui_menu_builder.py | 6 +- src/history_window.py | 8 +- src/htmltextview.py | 99 +- src/message_control.py | 33 +- src/message_window.py | 20 + src/notify.py | 178 +- src/plugins/gui.py | 4 +- src/plugins/plugin.py | 55 +- src/plugins/pluginmanager.py | 37 +- src/plugins/plugins_i18n.py | 41 + src/remote_control.py | 21 +- src/roster_window.py | 178 +- src/secrets.py | 2 +- src/session.py | 129 +- src/tooltips.py | 1 + src/upower_listener.py | 50 + test/unit/test_contacts.py | 8 +- test/unit/test_xmpp_smacks.py | 133 + 133 files changed, 19069 insertions(+), 20210 deletions(-) diffs (truncated from 73300 to 300 lines): diff -r e472bdfe92b4 -r 72730fbb5184 .hgtags --- a/.hgtags Tue Dec 27 23:47:00 2011 -0500 +++ b/.hgtags Thu Dec 29 11:39:02 2011 +0100 @@ -4,3 +4,5 @@ 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 +db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 +50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1 diff -r e472bdfe92b4 -r 72730fbb5184 ChangeLog --- a/ChangeLog Tue Dec 27 23:47:00 2011 -0500 +++ b/ChangeLog Thu Dec 29 11:39:02 2011 +0100 @@ -1,3 +1,34 @@ +Gajim 0.15 (XX XX 2011) + + * Plugin system + * Whiteboard (via a plugin) + * Message archiving + * Stream managment + * IBB + * Nested roster group + * Roster filtrering + * UPower support + * GPG support for windows + +Gajim 0.14.4 (22 July 2011) + + * Fix translation issue + * other minor fixes + +Gajim 0.14.3 (19 June 2011) + + * Fix history viewer + * Fix closing roster window + * Prevent some erros with metacontacts + +Gajim 0.14.2 (07 June 2011) + + * Fix CPU usage when testing file transfer proxies + * Fix invalid XML char regex + * Fix subscription request window handling + * Fix URL display in chat message banner + * Other minor bugfixes + Gajim 0.14.1 (26 October 2010) * Fix changing account name diff -r e472bdfe92b4 -r 72730fbb5184 Makefile.am --- a/Makefile.am Tue Dec 27 23:47:00 2011 -0500 +++ b/Makefile.am Thu Dec 29 11:39:02 2011 +0100 @@ -1,20 +1,12 @@ -SUBDIRS = src data plugins po icons +SUBDIRS = src data po icons plugins ACLOCAL_AMFLAGS = -I m4 bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote -docfilesdir = $(docdir) -docfiles_DATA = README \ - README.html \ - ChangeLog \ - COPYING \ - THANKS \ - THANKS.artists \ - AUTHORS - EXTRA_DIST = \ - $(docfiles_DATA) \ + README.html \ + THANKS.artists \ autogen.sh \ intltool-extract.in \ intltool-merge.in \ diff -r e472bdfe92b4 -r 72730fbb5184 README.html --- a/README.html Tue Dec 27 23:47:00 2011 -0500 +++ b/README.html Thu Dec 29 11:39:02 2011 +0100 @@ -72,7 +72,7 @@ </ul> <p>steps to compile gajim:</p> <pre> - $ sh autogen.sh + $ ./autogen.sh $ ./configure $ make </pre> @@ -95,7 +95,7 @@ <h2>Miscellaneous</h2> <h3>XML & Debugging</h3> -<p>If you want to see the xml stanzas and/or help us debugging +<p>If you want to see the xml stanzas and/or help us debugging you're advised to enable verbose via advanced configuration window. If you don't want to make this permanent, execute gajim with --verbose everytime you want to have verbose output.</p> diff -r e472bdfe92b4 -r 72730fbb5184 autogen.sh --- a/autogen.sh Tue Dec 27 23:47:00 2011 -0500 +++ b/autogen.sh Thu Dec 29 11:39:02 2011 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.14.0.1" + gajimversion="0.15-beta2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r e472bdfe92b4 -r 72730fbb5184 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Tue Dec 27 23:47:00 2011 -0500 +++ b/data/gui/accounts_window.ui Thu Dec 29 11:39:02 2011 +0100 @@ -63,13 +63,42 @@ </child> <child> <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_stock">True</property> <signal name="clicked" handler="on_add_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment5"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label29"> + <property name="visible">True</property> + <property name="label" translatable="yes">Add</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -78,13 +107,42 @@ </child> <child> <object class="GtkButton" id="remove_button"> - <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_stock">True</property> <signal name="clicked" handler="on_remove_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="label" translatable="yes">Delete</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -99,52 +157,37 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <signal name="clicked" handler="on_rename_button_clicked"/> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkAlignment" id="alignment6"> <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> - <property name="spacing">6</property> + <property name="xscale">0</property> + <property name="yscale">0</property> <child> - <object class="GtkLabel" id="label26"> + <object class="GtkHBox" id="hbox8"> <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> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="rename_image"> + <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> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label25"> + <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> + <property name="label" translatable="yes">Re_name</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="rename_image"> - <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> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label25"> - <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> - <property name="label" translatable="yes">Re_name</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label27"> - <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> - </object> - <packing> - <property name="position">3</property> - </packing> </child> </object> </child> @@ -451,48 +494,70 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label28"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Client Cert File:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">cert_entry1</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Client Cert File:</property>

1 0

gajim: create a new session for every new file transfer; enable ...
by Jefry Lagrange 28 Dec '11

28 Dec '11

changeset e472bdfe92b4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e472bdfe92b4 description: create a new session for every new file transfer; enable OpenSSL diffstat: src/common/jingle.py | 22 +++++++--------------- src/common/jingle_ft.py | 3 --- src/common/jingle_session.py | 29 ++++++++++++++++++----------- src/common/socks5.py | 12 ++++++------ 4 files changed, 31 insertions(+), 35 deletions(-) diffs (141 lines): diff -r 4dbe49e6e8a9 -r e472bdfe92b4 src/common/jingle.py --- a/src/common/jingle.py Mon Dec 26 21:18:45 2011 -0500 +++ b/src/common/jingle.py Tue Dec 27 23:47:00 2011 -0500 @@ -140,26 +140,18 @@ def start_file_transfer(self, jid, file_props): logger.info("start file transfer with file: %s" % file_props) - jingle = self.get_jingle_session(jid, media='file') contact = gajim.contacts.get_contact_with_highest_priority(self.name, gajim.get_jid_without_resource(jid)) if contact is None: return use_security = contact.supports(xmpp.NS_JINGLE_XTLS) - if jingle: - file_props['sid'] = jingle.sid - c = JingleFileTransfer(jingle, file_props=file_props, - use_security=use_security) - jingle.add_content('file' + helpers.get_random_string_16(), c) - jingle.on_session_state_changed(c) - else: - jingle = JingleSession(self, weinitiate=True, jid=jid) - self._sessions[jingle.sid] = jingle - file_props['sid'] = jingle.sid - c = JingleFileTransfer(jingle, file_props=file_props, - use_security=use_security) - jingle.add_content('file' + helpers.get_random_string_16(), c) - jingle.start_session() + jingle = JingleSession(self, weinitiate=True, jid=jid) + self._sessions[jingle.sid] = jingle + file_props['sid'] = jingle.sid + c = JingleFileTransfer(jingle, file_props=file_props, + use_security=use_security) + jingle.add_content('file' + helpers.get_random_string_16(), c) + jingle.start_session() return c.transport.sid diff -r 4dbe49e6e8a9 -r e472bdfe92b4 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Dec 26 21:18:45 2011 -0500 +++ b/src/common/jingle_ft.py Tue Dec 27 23:47:00 2011 -0500 @@ -373,9 +373,6 @@ def start_transfer(self): - # We start the transfer, session negociation is over. - self.session.state = 0 # STATE 0 SESSION_ENDED - self.state = STATE_TRANSFERING # It tells wether we start the transfer as client or server diff -r 4dbe49e6e8a9 -r e472bdfe92b4 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Dec 26 21:18:45 2011 -0500 +++ b/src/common/jingle_session.py Tue Dec 27 23:47:00 2011 -0500 @@ -488,19 +488,25 @@ # subscription) and the receiver has a policy of not communicating via # Jingle with unknown entities, it SHOULD return a <service-unavailable/> # error. - - # Check if there's already a session with this user: - for session in self.connection.iter_jingle_sessions(self.peerjid): - if not session is self: - reason = xmpp.Node('reason') - alternative_session = reason.setTag('alternative-session') - alternative_session.setTagData('sid', session.sid) - self.__ack(stanza, jingle, error, action) - self._session_terminate(reason) - raise xmpp.NodeProcessed - + + # 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': + for session in self.connection.iter_jingle_sessions(self.peerjid): + if not session is self: + reason = xmpp.Node('reason') + alternative_session = reason.setTag('alternative-session') + alternative_session.setTagData('sid', session.sid) + self.__ack(stanza, jingle, error, action) + self._session_terminate(reason) + raise xmpp.NodeProcessed + + # If there's no content we understand... if not contents: @@ -699,6 +705,7 @@ self.connection.connection.send(stanza) def _session_terminate(self, reason=None): + assert self.state != JingleStates.ended stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') if self.connection.connection and self.connection.connected >= 2: diff -r 4dbe49e6e8a9 -r e472bdfe92b4 src/common/socks5.py --- a/src/common/socks5.py Mon Dec 26 21:18:45 2011 -0500 +++ b/src/common/socks5.py Tue Dec 27 23:47:00 2011 -0500 @@ -517,10 +517,10 @@ for ai in self.ais: try: self._sock = socket.socket(*ai[:3]) - ''' + if not self.fingerprint is None: self._sock = OpenSSL.SSL.Connection( - jingle_xtls.get_context('client'), self._sock)''' + jingle_xtls.get_context('client'), self._sock) # this will not block the GUI self._sock.setblocking(False) self._server = ai[4] @@ -956,12 +956,12 @@ if _sock is not None: - '''if self.fingerprint is not None: + if self.fingerprint is not None: self._sock = OpenSSL.SSL.Connection( jingle_xtls.get_context('server'), _sock) else: self._sock.setblocking(False) - ''' + self.fd = _sock.fileno() self._recv = _sock.recv self._send = _sock.send @@ -1445,9 +1445,9 @@ # try the different possibilities (ipv6, ipv4, etc.) try: self._serv = socket.socket(*ai[:3]) - '''if self.fingerprint is not None: + if self.fingerprint is not None: self._serv = OpenSSL.SSL.Connection( - jingle_xtls.get_context('server'), self._serv)''' + jingle_xtls.get_context('server'), self._serv) except socket.error, e: if e.args[0] == EAFNOSUPPORT: self.ai = None

1 0

gajim: fix sending multiple files at the same time
by Jefry Lagrange 27 Dec '11

27 Dec '11

changeset 4dbe49e6e8a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4dbe49e6e8a9 description: fix sending multiple files at the same time diffstat: src/common/jingle_ft.py | 5 ++++- src/common/jingle_session.py | 10 +++++++--- src/common/socks5.py | 42 ++++++++++++++++++++++++++++-------------- 3 files changed, 39 insertions(+), 18 deletions(-) diffs (144 lines): diff -r b8c439e2d76b -r 4dbe49e6e8a9 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Dec 24 18:12:05 2011 -0500 +++ b/src/common/jingle_ft.py Mon Dec 26 21:18:45 2011 -0500 @@ -372,7 +372,10 @@ def start_transfer(self): - + + # We start the transfer, session negociation is over. + self.session.state = 0 # STATE 0 SESSION_ENDED + self.state = STATE_TRANSFERING # It tells wether we start the transfer as client or server diff -r b8c439e2d76b -r 4dbe49e6e8a9 src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Dec 24 18:12:05 2011 -0500 +++ b/src/common/jingle_session.py Mon Dec 26 21:18:45 2011 -0500 @@ -243,10 +243,15 @@ elif content and self.weinitiate: self.__content_accept(content) elif self.state == JingleStates.active: - # We can either send a content-add or a content-accept + # We can either send a content-add or a content-accept. However, if + # we are sending a file we can only use session_initiate. if not content: return - if (content.creator == 'initiator') == self.weinitiate: + we_created_content = (content.creator == 'initiator') \ + == self.weinitiate + if we_created_content and content.media == 'file': + self.__session_initiate() + if we_created_content: # We initiated this content. It's a pending content-add. self.__content_add(content) else: @@ -694,7 +699,6 @@ self.connection.connection.send(stanza) def _session_terminate(self, reason=None): - assert self.state != JingleStates.ended stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') if self.connection.connection and self.connection.connected >= 2: diff -r b8c439e2d76b -r 4dbe49e6e8a9 src/common/socks5.py --- a/src/common/socks5.py Sat Dec 24 18:12:05 2011 -0500 +++ b/src/common/socks5.py Mon Dec 26 21:18:45 2011 -0500 @@ -93,17 +93,22 @@ sid = fp['sid'] self.type = type # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) - self.listener = Socks5Listener(self.idlequeue, port, fp, - fingerprint=fingerprint) - self.listener.queue = self - self.listener.bind() - if self.listener.started is False: - self.listener = None - # We cannot bind port, call error callback and fail - self.error_cb(_('Unable to bind to port %s.') % port, - _('Maybe you have another running instance of Gajim. File ' - 'Transfer will be cancelled.')) - return None + if self.listener is None or self.listener.connections == []: + self.listener = Socks5Listener(self.idlequeue, port, fp, + fingerprint=fingerprint) + self.listener.queue = self + self.listener.bind() + if self.listener.started is False: + self.listener = None + # We cannot bind port, call error callback and fail + self.error_cb(_('Unable to bind to port %s.') % port, + _('Maybe you have another running instance of Gajim. File ' + 'Transfer will be cancelled.')) + return None + else: + # There is already a listener, we update the file's information + # on the new connection. + self.listener.file_props = fp self.connected += 1 return self.listener @@ -724,6 +729,7 @@ """ Read file contents from socket and write them to file """ + if self.file_props is None or ('file-name' in self.file_props) is False: self.file_props['error'] = -2 return None @@ -773,14 +779,14 @@ # Transfer stopped somehow: # reset, paused or network error self.rem_fd(fd) - self.disconnect(False) + self.disconnect() self.file_props['error'] = -1 return 0 try: fd.write(buff) except IOError, e: self.rem_fd(fd) - self.disconnect(False) + self.disconnect() self.file_props['error'] = -6 # file system error return 0 if self.file_props['received-len'] >= int(self.file_props['size']): @@ -809,7 +815,12 @@ self.idlequeue.remove_timeout(self.fd) self.idlequeue.unplug_idle(self.fd) if self.mode == 'server': - self.queue.listener.disconnect() + try: + self.queue.listener.connections.remove(self._sock) + except ValueError: + pass # Not in list + if self.queue.listener.connections == []: + self.queue.listener.disconnect() try: self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() @@ -1127,6 +1138,7 @@ def pollin(self): + self.idlequeue.remove_timeout(self.fd) if self.connected: try: if self.state < 5: @@ -1426,6 +1438,7 @@ self.fd = -1 self.fingerprint = fingerprint self.file_props = fp + self.connections = [] def bind(self): for ai in self.ais: @@ -1501,6 +1514,7 @@ """ _sock = self._serv.accept() _sock[0].setblocking(False) + self.connections.append(_sock[0]) return _sock

1 0

gajim: fix closing listening port
by Jefry Lagrange 24 Dec '11

24 Dec '11

changeset b8c439e2d76b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8c439e2d76b description: fix closing listening port diffstat: src/common/socks5.py | 46 ++++++++++++++++++++++++++++++---------------- src/gui_interface.py | 5 +++-- 2 files changed, 33 insertions(+), 18 deletions(-) diffs (135 lines): diff -r 2ef1876c2266 -r b8c439e2d76b src/common/socks5.py --- a/src/common/socks5.py Thu Dec 22 21:52:37 2011 -0500 +++ b/src/common/socks5.py Sat Dec 24 18:12:05 2011 -0500 @@ -93,19 +93,19 @@ sid = fp['sid'] self.type = type # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) - if self.listener is None: - self.listener = Socks5Listener(self.idlequeue, port, fp, + self.listener = Socks5Listener(self.idlequeue, port, fp, fingerprint=fingerprint) - self.listener.queue = self - self.listener.bind() - if self.listener.started is False: - self.listener = None - # We cannot bind port, call error callback and fail - self.error_cb(_('Unable to bind to port %s.') % port, + self.listener.queue = self + self.listener.bind() + if self.listener.started is False: + self.listener = None + # We cannot bind port, call error callback and fail + self.error_cb(_('Unable to bind to port %s.') % port, _('Maybe you have another running instance of Gajim. File ' 'Transfer will be cancelled.')) - return None - self.connected += 1 + return None + + self.connected += 1 return self.listener def send_success_reply(self, file_props, streamhost): @@ -311,6 +311,12 @@ def send_file(self, file_props, account, mode): for key in self.senders.keys(): + if self.senders == {}: + # Python acts very weird with this. When there is no keys + # in the dictionary It says that it has a key. + # Maybe it is my machine. Without this there is a KeyError + # traceback. + return if file_props['name'] in key and file_props['sid'] in key \ and self.senders[key].mode == mode: @@ -416,7 +422,7 @@ elif self.progress_transfer_cb is not None: self.progress_transfer_cb(actor.account, actor.file_props) - def remove_receiver(self, idx, do_disconnect=True): + def remove_receiver(self, idx, do_disconnect=True, remove_all=False): """ Remove reciver from the list and decrease the number of active connections with 1 @@ -429,14 +435,16 @@ self.idlequeue.remove_timeout(reader.fd) if do_disconnect: reader.disconnect() - break + if not remove_all: + break else: if reader.streamhost is not None: reader.streamhost['state'] = -1 del(self.readers[key]) - break - - def remove_sender(self, idx, do_disconnect=True): + if not remove_all: + break + + def remove_sender(self, idx, do_disconnect=True, remove_all=False): """ Remove sender from the list of senders and decrease the number of active connections with 1 @@ -447,13 +455,16 @@ sender = self.senders[key] if do_disconnect: sender.disconnect() - return + if not remove_all: + break else: self.idlequeue.unplug_idle(sender.fd) self.idlequeue.remove_timeout(sender.fd) del(self.senders[key]) if self.connected > 0: self.connected -= 1 + if not remove_all: + break if len(self.senders) == 0 and self.listener is not None: self.listener.disconnect() self.listener = None @@ -483,6 +494,7 @@ self.file = None self.connected = False self.type = '' + self.mode = '' def _is_connected(self): @@ -796,6 +808,8 @@ self.close_file() self.idlequeue.remove_timeout(self.fd) self.idlequeue.unplug_idle(self.fd) + if self.mode == 'server': + self.queue.listener.disconnect() try: self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() diff -r 2ef1876c2266 -r b8c439e2d76b src/gui_interface.py --- a/src/gui_interface.py Thu Dec 22 21:52:37 2011 -0500 +++ b/src/gui_interface.py Sat Dec 24 18:12:05 2011 -0500 @@ -918,9 +918,10 @@ if file_props['type'] == 'r': # we receive a file jid = unicode(file_props['sender']) + gajim.socks5queue.remove_receiver(file_props['sid'], True, True) else: # we send a file jid = unicode(file_props['receiver']) - + gajim.socks5queue.remove_sender(file_props['sid'], True, True) # End jingle session if file_props.get('session-type') == 'jingle' and file_props['type'] ==\ 'r': @@ -957,7 +958,7 @@ elif file_props['error'] in (-1, -6): msg_type = 'file-stopped' event_type = _('File Transfer Stopped') - + if event_type == '': # FIXME: ugly workaround (this can happen Gajim sent, Gaim recvs) # this should never happen but it does. see process_result() in

1 0

gajim: fix bad refactoring
by Jefry Lagrange 23 Dec '11

23 Dec '11

changeset 2ef1876c2266 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ef1876c2266 description: fix bad refactoring diffstat: src/common/jingle_ft.py | 8 ++++---- src/common/socks5.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diffs (108 lines): diff -r cecb094f42f3 -r 2ef1876c2266 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Dec 22 20:12:11 2011 -0500 +++ b/src/common/jingle_ft.py Thu Dec 22 21:52:37 2011 -0500 @@ -376,13 +376,13 @@ self.state = STATE_TRANSFERING # It tells wether we start the transfer as client or server - type = None + mode = None if self.isOurCandUsed(): - type = 'client' + mode = 'client' streamhost_used = self.nominated_cand['our-cand'] else: - type = 'server' + mode = 'server' streamhost_used = self.nominated_cand['peer-cand'] if streamhost_used['type'] == 'proxy': @@ -445,7 +445,7 @@ else: jid = gajim.get_jid_without_resource(self.session.ourjid) gajim.socks5queue.send_file(self.file_props, - self.session.connection.name, type) + self.session.connection.name, mode) def get_content(desc): return JingleFileTransfer diff -r cecb094f42f3 -r 2ef1876c2266 src/common/socks5.py --- a/src/common/socks5.py Thu Dec 22 20:12:11 2011 -0500 +++ b/src/common/socks5.py Thu Dec 22 21:52:37 2011 -0500 @@ -309,10 +309,10 @@ result = reader.write_next() self.process_result(result, reader) - def send_file(self, file_props, account, type): + def send_file(self, file_props, account, mode): for key in self.senders.keys(): if file_props['name'] in key and file_props['sid'] in key \ - and self.senders[key].type == type: + and self.senders[key].mode == mode: log.info("socks5: sending file") sender = self.senders[key] @@ -570,7 +570,7 @@ self.pollend() else: - if self.type == 'client': + if self.mode == 'client': self.queue.reconnect_client(self, self.streamhost) def open_file_for_reading(self): @@ -1088,7 +1088,7 @@ Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) - self.type = 'server' + self.mode = 'server' def main(self): """ @@ -1191,7 +1191,7 @@ Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) - self.type = 'client' + self.mode = 'client' def main(self, timeout=0): """ @@ -1338,7 +1338,7 @@ def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props={}): - Socks5.__init__(self, idlequeue, host, port, None, None, + Socks5Client.__init__(self, idlequeue, host, port, None, None, file_props['sid']) Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, @@ -1353,7 +1353,7 @@ def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props={}): - Socks5.__init__(self, idlequeue, host, port, None, None, + Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props['sid']) Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, @@ -1365,7 +1365,7 @@ def __init__(self, idlequeue, streamhost, sid, file_props = None, fingerprint=None): - Socks5.__init__(self, idlequeue, streamhost['host'], + Socks5Client.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid) @@ -1380,7 +1380,7 @@ def __init__(self, idlequeue, streamhost, sid, file_props = None, fingerprint=None): - Socks5.__init__(self, idlequeue, streamhost['host'], + Socks5Server.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid)

1 0

gajim: refactoring
by Jefry Lagrange 23 Dec '11

23 Dec '11

changeset cecb094f42f3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cecb094f42f3 description: refactoring diffstat: src/common/jingle_transport.py | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diffs (73 lines): diff -r ad00da030d2b -r cecb094f42f3 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Nov 18 18:21:34 2011 -0500 +++ b/src/common/jingle_transport.py Thu Dec 22 20:12:11 2011 -0500 @@ -59,6 +59,8 @@ Build a candidate stanza for the given candidate """ pass + + def make_transport(self, candidates=None): """ @@ -77,6 +79,20 @@ Return the list of transport candidates from a transport stanza """ return [] + + def set_connection(self, conn): + self.connection = conn + if not self.sid: + self.sid = self.connection.connection.getAnID() + + def set_file_props(self, file_props): + self.file_props = file_props + + def set_our_jid(self, jid): + self.ourjid = jid + + def set_sid(self, sid): + self.sid = sid class JingleTransportSocks5(JingleTransport): """ @@ -91,16 +107,6 @@ if node and node.getAttr('sid'): self.sid = node.getAttr('sid') - def set_file_props(self, file_props): - self.file_props = file_props - - def set_our_jid(self, jid): - self.ourjid = jid - - def set_connection(self, conn): - self.connection = conn - if not self.sid: - self.sid = self.connection.connection.getAnID() def make_candidate(self, candidate): import logging @@ -309,9 +315,6 @@ self.sid = node.getAttr('sid') - def set_sid(self, sid): - self.sid = sid - def make_transport(self): transport = xmpp.Node('transport') @@ -319,11 +322,7 @@ transport.setAttr('block-size', self.block_sz) transport.setAttr('sid', self.sid) return transport - - def set_file_props(self, file_props): - self.file_props = file_props - - + import farsight class JingleTransportICEUDP(JingleTransport):

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 December 2011