Commits June 2010

commits@gajim.org

4 participants
38 discussions

gajim: don't traceback when receiving a single message
by Yann Leboulanger 09 Jun '10

09 Jun '10

changeset 8a06f34896d0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8a06f34896d0 description: don't traceback when receiving a single message diffstat: src/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 216809d94dc4 -r 8a06f34896d0 src/session.py --- a/src/session.py Mon Jun 07 19:11:44 2010 +0200 +++ b/src/session.py Wed Jun 09 10:39:36 2010 +0200 @@ -338,7 +338,7 @@ if msg_type == 'normal' and popup: # it's single message to be autopopuped dialogs.SingleMessageWindow(self.conn.name, contact.jid, action='receive', from_whom=jid, subject=subject, message=msg, - resource=resource, session=self, form_node=form_node, displaymarking=displaymarking) + resource=resource, session=self, form_node=form_node) return # We print if window is opened and it's not a single message

1 0

gajim: receive jingle file transfer session initiate message, sh...
by fantasticsid＠lagaule.org 08 Jun '10

08 Jun '10

changeset 5fa0a6559312 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5fa0a6559312 description: receive jingle file transfer session initiate message, shout 'FILE-REQUEST' event to connection object. diffstat: src/common/jingle.py | 2 +- src/common/jingle_ft.py | 40 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diffs (74 lines): diff -r a9c7f40cbcba -r 5fa0a6559312 src/common/jingle.py --- a/src/common/jingle.py Tue Jun 08 16:39:44 2010 +0800 +++ b/src/common/jingle.py Tue Jun 08 21:24:41 2010 +0800 @@ -135,7 +135,7 @@ else: jingle = JingleSession(self, weinitiate=True, jid=jid) self.__sessions[jingle.sid] = jingle - jingle.add_content('file', JingleFileTransfer(jingle, file_props)) + jingle.add_content('file', JingleFileTransfer(jingle, file_props=file_props)) jingle.start_session() return jingle.sid diff -r a9c7f40cbcba -r 5fa0a6559312 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jun 08 16:39:44 2010 +0800 +++ b/src/common/jingle_ft.py Tue Jun 08 21:24:41 2010 +0800 @@ -29,7 +29,7 @@ class JingleFileTransfer(JingleContent): - def __init__(self, session, file_props, transport=None): + def __init__(self, session, transport=None, file_props=None): JingleContent.__init__(self, session, transport) #events we might be interested in @@ -42,13 +42,47 @@ self.callbacks['transport-info'] += [self.__on_transport_info] self.file_props = file_props + if file_props == None: + self.weinitiate = False + else: + self.weinitiate = True if transport == None: self.transport = JingleTransportICEUDP() + + self.session = session def __on_session_initiate(self, stanza, content, error, action): - log.info("__on_session_initiate") - pass + jid = unicode(stanza.getFrom()) + log.info("jid:%s"%jid) + + file_props = {'type': 'r'} + file_props['sender'] = jid + file_props['request-id'] = unicode(stanza.getAttr('id')) + + file_tag = content.getTag('description').getTag('offer').getTag('file') + for attribute in file_tag.getAttrs(): + if attribute in ('name', 'size', 'hash', 'date'): + val = file_tag.getAttr(attribute) + if val is None: + continue + file_props[attribute] = val + file_desc_tag = file_tag.getTag('desc') + if file_desc_tag is not None: + file_props['desc'] = file_desc_tag.getData() + + file_props['receiver'] = self.session.ourjid + log.info("ourjid: %s"%self.session.ourjid) + file_props['sid'] = unicode(stanza.getTag('jingle').getAttr('sid')) + file_props['transfered_size'] = [] + + log.info("FT request: %s"%file_props) + + #TODO + #add file transfer to queue + self.session.connection.dispatch('FILE_REQUEST', (jid, file_props)) + + def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept")

1 0

gajim: construct well-formed jingle FT session-initiate stanza
by fantasticsid＠lagaule.org 08 Jun '10

08 Jun '10

changeset a9c7f40cbcba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9c7f40cbcba description: construct well-formed jingle FT session-initiate stanza diffstat: src/common/jingle_ft.py | 20 +++++++++++++++++++- src/filetransfers_window.py | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diffs (39 lines): diff -r 5bb15846f6be -r a9c7f40cbcba src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun Jun 06 23:22:52 2010 +0800 +++ b/src/common/jingle_ft.py Tue Jun 08 16:39:44 2010 +0800 @@ -75,4 +75,22 @@ pass def _fill_content(self, content): - content.addChild("description", namespace = xmpp.NS_JINGLE_FILE_TRANSFER) + description_node = xmpp.simplexml.Node(tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description') + + sioffer = xmpp.simplexml.Node(tag='offer') + file_tag = sioffer.setTag('file', namespace=xmpp.NS_FILE) + file_tag.setAttr('name', self.file_props['name']) + file_tag.setAttr('size', self.file_props['size']) + desc = file_tag.setTag('desc') + if 'desc' in self.file_props: + desc.setData(self.file_props['desc']) + + description_node.addChild(node=sioffer) + + content.addChild(node=description_node) + +def get_content(desc): + return JingleFileTransfer + + +contents[xmpp.NS_JINGLE_FILE_TRANSFER] = get_content diff -r 5bb15846f6be -r a9c7f40cbcba src/filetransfers_window.py --- a/src/filetransfers_window.py Sun Jun 06 23:22:52 2010 +0800 +++ b/src/filetransfers_window.py Tue Jun 08 16:39:44 2010 +0800 @@ -304,7 +304,7 @@ return False self.add_transfer(account, contact, file_props) if contact.supports(NS_JINGLE_FILE_TRANSFER): - log.info("contact supports jingle file transfer") + log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) else: log.info("contact does not support jingle file transfer")

1 0

gajim: [Dave Cridland] add XEP-0258 support. Great thanks for th...
by Yann Leboulanger 07 Jun '10

07 Jun '10

changeset 216809d94dc4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=216809d94dc4 description: [Dave Cridland] add XEP-0258 support. Great thanks for that! Fixes #5772 diffstat: data/gui/chat_control.ui | 19 ++++++----- data/gui/groupchat_control.ui | 18 ++++++---- src/chat_control.py | 63 +++++++++++++++++++++++++++++++++----- src/common/connection.py | 38 +++++++++++++++++------ src/common/connection_handlers.py | 38 ++++++++++++++++++++++- src/common/gajim.py | 2 +- src/common/xmpp/protocol.py | 2 + src/conversation_textview.py | 19 +++++++++++- src/groupchat_control.py | 27 +++++++++------ src/gui_interface.py | 4 +- src/message_control.py | 4 +- src/session.py | 20 +++++++---- 12 files changed, 191 insertions(+), 63 deletions(-) diffs (truncated from 821 to 300 lines): diff -r 97215812fd6a -r 216809d94dc4 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Wed Jun 02 22:14:57 2010 +0200 +++ b/data/gui/chat_control.ui Mon Jun 07 19:11:44 2010 +0200 @@ -5,7 +5,6 @@ <object class="GtkVBox" id="chat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="orientation">vertical</property> <property name="spacing">1</property> <child> <object class="GtkHBox" id="hbox3"> @@ -13,7 +12,6 @@ <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> @@ -43,7 +41,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> <property name="border_width">5</property> - <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> @@ -195,7 +192,6 @@ <child> <object class="GtkVBox" id="vbox106"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> @@ -314,7 +310,6 @@ <object class="GtkVSeparator" id="vseparator1"> <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="orientation">vertical</property> </object> <packing> <property name="expand">False</property> @@ -470,7 +465,6 @@ <object class="GtkVSeparator" id="vseparator3"> <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="orientation">vertical</property> </object> <packing> <property name="expand">False</property> @@ -500,6 +494,14 @@ </packing> </child> <child> + <object class="GtkComboBox" id="label_selector"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">12</property> + </packing> + </child> + <child> <object class="GtkAlignment" id="alignment1"> <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> @@ -508,7 +510,7 @@ </child> </object> <packing> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -555,7 +557,7 @@ </object> <packing> <property name="expand">False</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> </object> @@ -572,7 +574,6 @@ <child> <object class="GtkVBox" id="audio_vbox"> <property name="no_show_all">True</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label3"> diff -r 97215812fd6a -r 216809d94dc4 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Wed Jun 02 22:14:57 2010 +0200 +++ b/data/gui/groupchat_control.ui Mon Jun 07 19:11:44 2010 +0200 @@ -5,7 +5,6 @@ <object class="GtkVBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> @@ -35,7 +34,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> <property name="border_width">5</property> - <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> @@ -133,7 +131,6 @@ <object class="GtkVSeparator" id="vseparator2"> <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="orientation">vertical</property> </object> <packing> <property name="expand">False</property> @@ -233,7 +230,6 @@ <object class="GtkVSeparator" id="vseparator4"> <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="orientation">vertical</property> </object> <packing> <property name="expand">False</property> @@ -270,6 +266,14 @@ </packing> </child> <child> + <object class="GtkComboBox" id="label_selector"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">9</property> + </packing> + </child> + <child> <object class="GtkAlignment" id="alignment2"> <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> @@ -278,7 +282,7 @@ </child> </object> <packing> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -326,7 +330,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> </object> @@ -346,12 +350,10 @@ <object class="GtkVBox" id="vbox108"> <property name="width_request">0</property> <property name="visible">True</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkVBox" id="vbox109"> <property name="visible">True</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> diff -r 97215812fd6a -r 216809d94dc4 src/chat_control.py --- a/src/chat_control.py Wed Jun 02 22:14:57 2010 +0200 +++ b/src/chat_control.py Mon Jun 07 19:11:44 2010 +0200 @@ -232,6 +232,29 @@ def status_url_clicked(self, widget, url): helpers.launch_browser_mailer('url', url) + def setup_seclabel(self, combo): + self.seclabel_combo = combo + self.seclabel_combo.hide() + self.seclabel_combo.set_no_show_all(True) + lb = gtk.ListStore(str) + self.seclabel_combo.set_model(lb) + cell = gtk.CellRendererText() + cell.set_property('xpad', 5) # padding for status text + self.seclabel_combo.pack_start(cell, True) + # text to show is in in first column of liststore + self.seclabel_combo.add_attribute(cell, 'text', 0) + if gajim.connections[self.account].seclabel_supported: + gajim.connections[self.account].seclabel_catalogue(self.contact.jid, self.on_seclabels_ready) + + def on_seclabels_ready(self): + lb = self.seclabel_combo.get_model() + lb.clear() + for label in gajim.connections[self.account].seclabel_catalogues[self.contact.jid][2]: + lb.append([label]) + self.seclabel_combo.set_active(0) + self.seclabel_combo.set_no_show_all(False) + self.seclabel_combo.show_all() + def __init__(self, type_id, parent_win, widget_name, contact, acct, resource=None): # Undo needs this variable to know if space has been pressed. @@ -721,6 +744,16 @@ self.drag_entered_conv = True self.conv_textview.tv.set_editable(True) + def get_seclabel(self): + label = None + if self.seclabel_combo is not None: + idx = self.seclabel_combo.get_active() + if idx != -1: + cat = gajim.connections[self.account].seclabel_catalogues[self.contact.jid] + lname = cat[2][idx] + label = cat[1][lname] + return label + def send_message(self, message, keyID='', type_='chat', chatstate=None, msg_id=None, composing_xep=None, resource=None, xhtml=None, callback=None, callback_args=[], process_commands=True): @@ -733,9 +766,11 @@ if process_commands and self.process_as_command(message): return + label = self.get_seclabel() MessageControl.send_message(self, message, keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep, resource=resource, user_nick=self.user_nick, xhtml=xhtml, + label=label, callback=callback, callback_args=callback_args) # Record message history @@ -769,7 +804,7 @@ other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id=None, - graphics=True): + graphics=True, displaymarking=None): """ Print 'chat' type messages """ @@ -781,7 +816,8 @@ end = True textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics) + subject, old_kind, xhtml, simple=simple, graphics=graphics, + displaymarking=displaymarking) if xep0184_id is not None: textview.show_xep0184_warning(xep0184_id) @@ -1429,6 +1465,7 @@ session = gajim.connections[self.account].find_controlless_session( self.contact.jid, resource) + self.setup_seclabel(self.xml.get_object('label_selector')) if session: session.control = self self.session = session @@ -2048,20 +2085,23 @@ gobject.source_remove(self.possible_inactive_timeout_id) self._schedule_activity_timers() - def _on_sent(id_, contact, message, encrypted, xhtml): + def _on_sent(id_, contact, message, encrypted, xhtml, label): if contact.supports(NS_RECEIPTS) and gajim.config.get_per('accounts', self.account, 'request_receipt'): xep0184_id = id_ else: xep0184_id = None - + if label: + displaymarking = label.getTag('displaymarking') + else: + displaymarking = None self.print_conversation(message, self.contact.jid, encrypted=encrypted, - xep0184_id=xep0184_id, xhtml=xhtml) + xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, composing_xep=composing_xep, xhtml=xhtml, callback=_on_sent, - callback_args=[contact, message, encrypted, xhtml], + callback_args=[contact, message, encrypted, xhtml, self.get_seclabel()], process_commands=process_commands) def check_for_possible_paused_chatstate(self, arg): @@ -2150,7 +2190,8 @@ self.session.is_loggable(), self.session and self.session.verified_identity) def print_conversation(self, text, frm='', tim=None, encrypted=False, - subject=None, xhtml=None, simple=False, xep0184_id=None): + subject=None, xhtml=None, simple=False, xep0184_id=None, + displaymarking=None): """ Print a line in the conversation

1 0

gajim: added JingleFileTransfer for managing jingle ft content
by fantasticsid＠lagaule.org 06 Jun '10

06 Jun '10

changeset 5bb15846f6be in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5bb15846f6be description: added JingleFileTransfer for managing jingle ft content code added to trigger jingle ft session when needed diffstat: src/common/caps_cache.py | 4 +- src/common/jingle.py | 15 ++++++++ src/common/jingle_ft.py | 78 +++++++++++++++++++++++++++++++++++++++++++++ src/filetransfers_window.py | 3 +- 4 files changed, 97 insertions(+), 3 deletions(-) diffs (146 lines): diff -r d4488f7f75af -r 5bb15846f6be src/common/caps_cache.py --- a/src/common/caps_cache.py Tue Jun 01 15:14:18 2010 +0800 +++ b/src/common/caps_cache.py Sun Jun 06 23:22:52 2010 +0800 @@ -38,10 +38,10 @@ log = logging.getLogger('gajim.c.caps_cache') from common.xmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS) + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO] + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER] # Query entry status codes NEW = 0 diff -r d4488f7f75af -r 5bb15846f6be src/common/jingle.py --- a/src/common/jingle.py Tue Jun 01 15:14:18 2010 +0800 +++ b/src/common/jingle.py Sun Jun 06 23:22:52 2010 +0800 @@ -35,7 +35,10 @@ from jingle_session import JingleSession, JingleStates from jingle_rtp import JingleAudio, JingleVideo +from jingle_ft import JingleFileTransfer +import logging +logger = logging.getLogger('gajim.c.jingle') class ConnectionJingle(object): """ @@ -124,6 +127,18 @@ jingle.start_session() return jingle.sid + def start_file_transfer(self, jid, file_props): + logger.info("start file transfer with file: %s", str(file_props)) + jingle = self.get_jingle_session(jid, media='file') + if jingle: + jingle.add_content('file', JingleFileTransfer(jingle, file_props)) + else: + jingle = JingleSession(self, weinitiate=True, jid=jid) + self.__sessions[jingle.sid] = jingle + jingle.add_content('file', JingleFileTransfer(jingle, file_props)) + jingle.start_session() + return jingle.sid + def iter_jingle_sessions(self, jid, sid=None, media=None): if sid: diff -r d4488f7f75af -r 5bb15846f6be src/common/jingle_ft.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/jingle_ft.py Sun Jun 06 23:22:52 2010 +0800 @@ -0,0 +1,78 @@ +# -*- coding:utf-8 -*- +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + + +""" +Handles Jingle File Transfer (XEP 0234) +""" + +import gajim +import xmpp +from jingle_content import contents, JingleContent +from jingle_transport import JingleTransportICEUDP +import logging + +log = logging.getLogger('gajim.c.jingle_ft') + + +class JingleFileTransfer(JingleContent): + def __init__(self, session, file_props, transport=None): + JingleContent.__init__(self, session, transport) + + #events we might be interested in + self.callbacks['session-initiate'] += [self.__on_session_initiate] + self.callbacks['session-accept'] += [self.__on_session_accept] + self.callbacks['session-terminate'] += [self.__on_session_terminate] + self.callbacks['transport-accept'] += [self.__on_transport_accept] + self.callbacks['transport-replace'] += [self.__on_transport_replace] #fallback transport method + self.callbacks['transport-reject'] += [self.__on_transport_reject] + self.callbacks['transport-info'] += [self.__on_transport_info] + + self.file_props = file_props + + if transport == None: + self.transport = JingleTransportICEUDP() + + def __on_session_initiate(self, stanza, content, error, action): + log.info("__on_session_initiate") + pass + + def __on_session_accept(self, stanza, content, error, action): + log.info("__on_session_accept") + pass + + def __on_session_terminate(self, stanza, content, error, action): + log.info("__on_session_terminate") + pass + + def __on_transport_accept(self, stanza, content, error, action): + log.info("__on_transport_accept") + pass + + def __on_transport_replace(self, stanza, content, error, action): + log.info("__on_transport_replace") + pass + + def __on_transport_reject(self, stanza, content, error, action): + log.info("__on_transport_reject") + pass + + def __on_transport_info(self, stanza, content, error, action): + log.info("__on_transport_info") + pass + + def _fill_content(self, content): + content.addChild("description", namespace = xmpp.NS_JINGLE_FILE_TRANSFER) diff -r d4488f7f75af -r 5bb15846f6be src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Jun 01 15:14:18 2010 +0800 +++ b/src/filetransfers_window.py Sun Jun 06 23:22:52 2010 +0800 @@ -305,9 +305,10 @@ self.add_transfer(account, contact, file_props) if contact.supports(NS_JINGLE_FILE_TRANSFER): log.info("contact supports jingle file transfer") + gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) else: log.info("contact does not support jingle file transfer") - gajim.connections[account].send_file_request(file_props) + gajim.connections[account].send_file_request(file_props) return True def _start_receive(self, file_path, account, contact, file_props):

1 0

gajim: [Jonathan Michalon] flush and fsync config file before cl...
by Yann Leboulanger 02 Jun '10

02 Jun '10

changeset 97215812fd6a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=97215812fd6a description: [Jonathan Michalon] flush and fsync config file before closing it. Fixes #5768 diffstat: src/common/optparser.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (25 lines): diff -r ba59d9f1b8d9 -r 97215812fd6a src/common/optparser.py --- a/src/common/optparser.py Wed May 26 08:59:01 2010 +0200 +++ b/src/common/optparser.py Wed Jun 02 22:14:57 2010 +0200 @@ -115,13 +115,16 @@ gajim.config.foreach(self.write_line, f) except IOError, e: return str(e) + f.flush() + os.fsync(f.fileno()) f.close() if os.path.exists(self.__filename): - # win32 needs this - try: - os.remove(self.__filename) - except Exception: - pass + if os.name == 'nt': + # win32 needs this + try: + os.remove(self.__filename) + except Exception: + pass try: os.rename(self.__tempfile, self.__filename) except IOError, e:

1 0

gajim: fix typo. 'contacts' -> 'contact'
by fantasticsid＠lagaule.org 01 Jun '10

01 Jun '10

changeset d4488f7f75af in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d4488f7f75af description: fix typo. 'contacts' -> 'contact' diffstat: src/filetransfers_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 69cc5a130b9c -r d4488f7f75af src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Jun 01 15:09:42 2010 +0800 +++ b/src/filetransfers_window.py Tue Jun 01 15:14:18 2010 +0800 @@ -304,9 +304,9 @@ return False self.add_transfer(account, contact, file_props) if contact.supports(NS_JINGLE_FILE_TRANSFER): - log.info("contacts supports jingle file transfer") + log.info("contact supports jingle file transfer") else: - log.info("contacts does not support jingle file transfer") + log.info("contact does not support jingle file transfer") gajim.connections[account].send_file_request(file_props) return True

1 0

gajim: add namespace for jingle file transfer
by fantasticsid＠lagaule.org 01 Jun '10

01 Jun '10

changeset 69cc5a130b9c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=69cc5a130b9c description: add namespace for jingle file transfer add jingle FT to gajim.gajim_optional_features diffstat: src/chat_control.py | 6 +++--- src/common/connection_handlers.py | 2 +- src/common/helpers.py | 1 + src/common/xmpp/protocol.py | 1 + src/filetransfers_window.py | 8 ++++++++ src/gui_menu_builder.py | 4 ++-- 6 files changed, 16 insertions(+), 6 deletions(-) diffs (107 lines): diff -r e18788a1300e -r 69cc5a130b9c src/chat_control.py --- a/src/chat_control.py Mon May 24 18:59:36 2010 +0800 +++ b/src/chat_control.py Tue Jun 01 15:09:42 2010 +0800 @@ -51,7 +51,7 @@ from common.pep import MOODS, ACTIVITIES from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION -from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP +from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER from command_system.implementation.middleware import ChatCommandProcessor from command_system.implementation.middleware import CommandTools @@ -1496,12 +1496,12 @@ self._video_button.set_sensitive(self.video_available) # Send file - if self.contact.supports(NS_FILE) and self.contact.resource: + if (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and self.contact.resource: self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text('') else: self._send_file_button.set_sensitive(False) - if not self.contact.supports(NS_FILE): + if not (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)): self._send_file_button.set_tooltip_text(_( "This contact does not support file transfer.")) else: diff -r e18788a1300e -r 69cc5a130b9c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon May 24 18:59:36 2010 +0800 +++ b/src/common/connection_handlers.py Tue Jun 01 15:09:42 2010 +0800 @@ -182,7 +182,7 @@ query = iq.setTag('query') query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, - common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, common.xmpp.NS_JINGLE_FILE_TRANSFER): feature = common.xmpp.Node('feature') feature.setAttr('var', f) query.addChild(node=feature) diff -r e18788a1300e -r 69cc5a130b9c src/common/helpers.py --- a/src/common/helpers.py Mon May 24 18:59:36 2010 +0800 +++ b/src/common/helpers.py Tue Jun 01 15:09:42 2010 +0800 @@ -1316,6 +1316,7 @@ gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_VIDEO) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_ICE_UDP) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_FILE_TRANSFER) gajim.caps_hash[a] = caps_cache.compute_caps_hash([gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) # re-send presence with new hash diff -r e18788a1300e -r 69cc5a130b9c src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon May 24 18:59:36 2010 +0800 +++ b/src/common/xmpp/protocol.py Tue Jun 01 15:09:42 2010 +0800 @@ -69,6 +69,7 @@ NS_JINGLE_RTP ='urn:xmpp:jingle:apps:rtp:1' # XEP-0167 NS_JINGLE_RTP_AUDIO='urn:xmpp:jingle:apps:rtp:audio' # XEP-0167 NS_JINGLE_RTP_VIDEO='urn:xmpp:jingle:apps:rtp:video' # XEP-0167 +NS_JINGLE_FILE_TRANSFER='urn:xmpp:jingle:apps:file-transfer:1' # XEP-0234 NS_JINGLE_RAW_UDP='urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 NS_JINGLE_ICE_UDP='urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176 NS_LAST ='jabber:iq:last' diff -r e18788a1300e -r 69cc5a130b9c src/filetransfers_window.py --- a/src/filetransfers_window.py Mon May 24 18:59:36 2010 +0800 +++ b/src/filetransfers_window.py Tue Jun 01 15:09:42 2010 +0800 @@ -35,6 +35,10 @@ from common import helpers from common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) +from common.xmpp.protocol import NS_JINGLE_FILE_TRANSFER +import logging + +log = logging.getLogger('gajim.filetransfer_window') C_IMAGE = 0 C_LABELS = 1 @@ -299,6 +303,10 @@ if file_props is None: return False self.add_transfer(account, contact, file_props) + if contact.supports(NS_JINGLE_FILE_TRANSFER): + log.info("contacts supports jingle file transfer") + else: + log.info("contacts does not support jingle file transfer") gajim.connections[account].send_file_request(file_props) return True diff -r e18788a1300e -r 69cc5a130b9c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon May 24 18:59:36 2010 +0800 +++ b/src/gui_menu_builder.py Tue Jun 01 15:09:42 2010 +0800 @@ -25,7 +25,7 @@ from common import gajim from common import helpers -from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION +from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION, NS_JINGLE_FILE_TRANSFER def build_resources_submenu(contacts, account, action, room_jid=None, room_account=None, cap=None): @@ -225,7 +225,7 @@ else: start_chat_menuitem.connect('activate', gajim.interface.on_open_chat_window, contact, account) - if contact.supports(NS_FILE): + if contact.supports(NS_FILE) or contact.supports(NS_JINGLE_FILE_TRANSFER): send_file_menuitem.set_sensitive(True) send_file_menuitem.connect('activate', roster.on_send_file_menuitem_activate, contact, account)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2010