Commits June 2010

commits@gajim.org

4 participants
38 discussions

gajim: stop saving bookmarks in pubsub if server doesn't support...
by Yann Leboulanger 21 Jun '10

21 Jun '10

changeset ec96e9f90375 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec96e9f90375 description: stop saving bookmarks in pubsub if server doesn't support #publish-options. see #5787 diffstat: src/common/connection.py | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diffs (37 lines): diff -r f31ced32a647 -r ec96e9f90375 src/common/connection.py --- a/src/common/connection.py Mon Jun 21 10:09:00 2010 +0200 +++ b/src/common/connection.py Mon Jun 21 19:15:08 2010 +0200 @@ -1899,21 +1899,19 @@ if bm.get('print_status', None): iq2.setTagData('print_status', bm['print_status']) - if self.pubsub_supported and storage_type != 'xml': - if self.pubsub_publish_options_supported: - options = common.xmpp.Node(common.xmpp.NS_DATA + ' x', - attrs={'type': 'submit'}) - f = options.addChild('field', attrs={'var': 'FORM_TYPE', - 'type': 'hidden'}) - f.setTagData('value', common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS) - f = options.addChild('field', attrs={'var': 'pubsub#persist_items'}) - f.setTagData('value', 'true') - f = options.addChild('field', attrs={'var': 'pubsub#access_model'}) - f.setTagData('value', 'whitelist') - else: - options = None + if self.pubsub_supported and self.pubsub_publish_options_supported and \ + storage_type != 'xml': + options = common.xmpp.Node(common.xmpp.NS_DATA + ' x', + attrs={'type': 'submit'}) + f = options.addChild('field', attrs={'var': 'FORM_TYPE', + 'type': 'hidden'}) + f.setTagData('value', common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS) + f = options.addChild('field', attrs={'var': 'pubsub#persist_items'}) + f.setTagData('value', 'true') + f = options.addChild('field', attrs={'var': 'pubsub#access_model'}) + f.setTagData('value', 'whitelist') self.send_pb_publish('', 'storage:bookmarks', iq, 'current', - options=options) + options=options) if storage_type != 'pubsub': iqA = common.xmpp.Iq(typ='set') iqB = iqA.addChild(name='query', namespace=common.xmpp.NS_PRIVATE)

1 0

gajim: add missing icons
by Yann Leboulanger 21 Jun '10

21 Jun '10

changeset f31ced32a647 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f31ced32a647 description: add missing icons diffstat: icons/hicolor/16x16/status/audio-mic-volume-high.png | 0 icons/hicolor/16x16/status/audio-mic-volume-low.png | 0 icons/hicolor/16x16/status/audio-mic-volume-medium.png | 0 icons/hicolor/16x16/status/audio-mic-volume-muted.png | 0 4 files changed, 0 insertions(+), 0 deletions(-) diffs (8 lines): diff -r e53a1f0971b7 -r f31ced32a647 icons/hicolor/16x16/status/audio-mic-volume-high.png Binary file icons/hicolor/16x16/status/audio-mic-volume-high.png has changed diff -r e53a1f0971b7 -r f31ced32a647 icons/hicolor/16x16/status/audio-mic-volume-low.png Binary file icons/hicolor/16x16/status/audio-mic-volume-low.png has changed diff -r e53a1f0971b7 -r f31ced32a647 icons/hicolor/16x16/status/audio-mic-volume-medium.png Binary file icons/hicolor/16x16/status/audio-mic-volume-medium.png has changed diff -r e53a1f0971b7 -r f31ced32a647 icons/hicolor/16x16/status/audio-mic-volume-muted.png Binary file icons/hicolor/16x16/status/audio-mic-volume-muted.png has changed

1 0

gajim: fix missing )
by Yann Leboulanger 20 Jun '10

20 Jun '10

changeset e53a1f0971b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e53a1f0971b7 description: fix missing ) diffstat: src/common/jingle_rtp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5e2745dc45d2 -r e53a1f0971b7 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jun 20 22:48:49 2010 +0200 +++ b/src/common/jingle_rtp.py Sun Jun 20 22:56:20 2010 +0200 @@ -199,7 +199,7 @@ log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % ( message.structure['error-no'], message.structure['error-msg'], - message.structure['debug-msg']) + message.structure['debug-msg'])) elif message.type == gst.MESSAGE_ERROR: # TODO: Fix it to fallback to videotestsrc anytime an error occur, # or raise an error, Jingle way

1 0

gajim: improve jingle audio GUI
by Yann Leboulanger 20 Jun '10

20 Jun '10

changeset 5e2745dc45d2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5e2745dc45d2 description: improve jingle audio GUI diffstat: data/gui/chat_control.ui | 1372 +++++++++++++++++++++++---------------------- src/chat_control.py | 33 +- 2 files changed, 728 insertions(+), 677 deletions(-) diffs (truncated from 1591 to 300 lines): diff -r 54f3f403023e -r 5e2745dc45d2 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sun Jun 20 22:46:25 2010 +0200 +++ b/data/gui/chat_control.ui Sun Jun 20 22:48:49 2010 +0200 @@ -5,170 +5,114 @@ <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"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="left_padding">3</property> + <property name="right_padding">3</property> <child> - <object class="GtkAlignment" id="alignment"> + <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> - <property name="left_padding">3</property> - <property name="right_padding">3</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> + <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> <child> - <object class="GtkHBox" id="hbox3004"> + <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> + <property name="ypad">5</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="banner_vbox"> + <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="GtkImage" id="banner_status_image"> + <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> - <property name="ypad">5</property> - <property name="stock">gtk-missing-image</property> + <property name="xalign">0</property> + <property name="label"><span weight="heavy" size="large">Contact name</span></property> + <property name="use_markup">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="banner_vbox"> + <object class="GtkLabel" id="banner_label"> <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> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label"><span weight="heavy" size="large">Contact name</span></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">label</property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <signal name="populate_popup" handler="on_banner_label_populate_popup"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">label</property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + <signal name="populate_popup" handler="on_banner_label_populate_popup"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="mood_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="activity_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> </object> <packing> <property name="position">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkImage" id="mood_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="activity_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkImage" id="tune_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEventBox" id="location_eventbox"> - <property name="visible">True</property> - <property name="visible_window">False</property> - <child> - <object class="GtkImage" id="location_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="audio_banner_image"> - <property name="visible">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkImage" id="video_banner_image"> - <property name="visible">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="width_request">11</property> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">6</property> - </packing> - </child> + <object class="GtkImage" id="tune_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkEventBox" id="avatar_eventbox"> + <object class="GtkEventBox" id="location_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <object class="GtkImage" id="avatar_image"> - <property name="visible">True</property> + <object class="GtkImage" id="location_image"> + <property name="no_show_all">True</property> <property name="stock">None</property> + <property name="icon-size">1</property> </object> </child> </object> @@ -178,104 +122,109 @@ <property name="position">3</property> </packing> </child> + <child> + <object class="GtkImage" id="audio_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="video_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="width_request">11</property> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">6</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox106">

1 0

gajim: change print into log.debug
by Yann Leboulanger 20 Jun '10

20 Jun '10

changeset 54f3f403023e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=54f3f403023e description: change print into log.debug diffstat: src/common/jingle_rtp.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diffs (33 lines): diff -r 2b891440f49a -r 54f3f403023e src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jun 20 12:56:10 2010 +0300 +++ b/src/common/jingle_rtp.py Sun Jun 20 22:46:25 2010 +0200 @@ -171,6 +171,7 @@ def _on_gst_message(self, bus, message): if message.type == gst.MESSAGE_ELEMENT: name = message.structure.get_name() + log.debug('gst element message: %s: %s' % (name, message)) if name == 'farsight-new-active-candidate-pair': pass elif name == 'farsight-recv-codecs-changed': @@ -190,17 +191,15 @@ self.send_candidate(candidate) elif name == 'farsight-component-state-changed': state = message.structure['state'] - print message.structure['component'], state if state == farsight.STREAM_STATE_FAILED: reason = xmpp.Node('reason') reason.setTag('failed-transport') self.session.remove_content(self.creator, self.name, reason) elif name == 'farsight-error': - print 'Farsight error #%d!' % message.structure['error-no'] - print 'Message: %s' % message.structure['error-msg'] - print 'Debug: %s' % message.structure['debug-msg'] - else: - print name + log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % ( + message.structure['error-no'], + message.structure['error-msg'], + message.structure['debug-msg']) elif message.type == gst.MESSAGE_ERROR: # TODO: Fix it to fallback to videotestsrc anytime an error occur, # or raise an error, Jingle way

1 0

gajim: Fix the fix for checking translated string
by Alexander Cherniuk 20 Jun '10

20 Jun '10

changeset 2b891440f49a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b891440f49a description: Fix the fix for checking translated string diffstat: src/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r d7487c126eec -r 2b891440f49a src/config.py --- a/src/config.py Sun Jun 20 00:33:01 2010 +0200 +++ b/src/config.py Sun Jun 20 12:56:10 2010 +0300 @@ -459,11 +459,11 @@ create_av_combobox('video_framerate', {_('Default'): '', '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ - x[1] == '' else float(x[0][:-3])) + not x[1] else float(x[0][:-3])) create_av_combobox('video_size', {_('Default'): '', '800x600': '800x600', '640x480': '640x480', '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ - x[1] == '' else int(x[0][:3])) + not x[1] else int(x[0][:3])) else: for opt_name in ('audio_input', 'audio_output', 'video_input',

1 0

gajim: fix checking translated string. Fixes #5786
by Yann Leboulanger 19 Jun '10

19 Jun '10

changeset d7487c126eec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d7487c126eec description: fix checking translated string. Fixes #5786 diffstat: src/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 9ba1d2f98414 -r d7487c126eec src/config.py --- a/src/config.py Sat Jun 19 17:08:30 2010 +0300 +++ b/src/config.py Sun Jun 20 00:33:01 2010 +0200 @@ -459,11 +459,11 @@ create_av_combobox('video_framerate', {_('Default'): '', '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ - x[0] == 'Default' else float(x[0][:-3])) + x[1] == '' else float(x[0][:-3])) create_av_combobox('video_size', {_('Default'): '', '800x600': '800x600', '640x480': '640x480', '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ - x[0] == 'Default' else int(x[0][:3])) + x[1] == '' else int(x[0][:3])) else: for opt_name in ('audio_input', 'audio_output', 'video_input',

1 0

gajim: contruct transport candidates for jingle socks5 bytestream
by fantasticsid＠lagaule.org 19 Jun '10

19 Jun '10

changeset a2d2a17abfd8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a2d2a17abfd8 description: contruct transport candidates for jingle socks5 bytestream diffstat: src/common/jingle_ft.py | 14 +++- src/common/jingle_session.py | 2 + src/common/jingle_transport.py | 119 ++++++++++++++++++++++++++++++++++++++ src/common/protocol/bytestream.py | 2 +- src/common/xmpp/protocol.py | 1 + 5 files changed, 134 insertions(+), 4 deletions(-) diffs (220 lines): diff -r c4e1118a99ea -r a2d2a17abfd8 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Jun 14 21:21:22 2010 +0800 +++ b/src/common/jingle_ft.py Sat Jun 19 22:52:17 2010 +0800 @@ -22,7 +22,7 @@ import gajim import xmpp from jingle_content import contents, JingleContent -from jingle_transport import JingleTransportICEUDP +from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 import logging log = logging.getLogger('gajim.c.jingle_ft') @@ -32,6 +32,8 @@ def __init__(self, session, transport=None, file_props=None): JingleContent.__init__(self, session, transport) + log.info("transport value: %s" % transport) + #events we might be interested in self.callbacks['session-initiate'] += [self.__on_session_initiate] self.callbacks['session-accept'] += [self.__on_session_accept] @@ -57,7 +59,10 @@ if transport is None: - self.transport = JingleTransportICEUDP() + self.transport = JingleTransportSocks5() + self.transport.set_file_props(self.file_props) + self.transport.set_our_jid(session.ourjid) + log.info('ourjid: %s' % session.ourjid) self.session = session self.media = 'file' @@ -89,7 +94,10 @@ file_props['transfered_size'] = [] self.file_props = file_props - + if self.transport is None: + self.transport = JingleTransportSocks5() + self.transport.set_our_jid(self.session.ourjid) + self.transport.set_file_props(self.file_props) log.info("FT request: %s" % file_props) #TODO diff -r c4e1118a99ea -r a2d2a17abfd8 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Jun 14 21:21:22 2010 +0800 +++ b/src/common/jingle_session.py Sat Jun 19 22:52:17 2010 +0800 @@ -502,6 +502,8 @@ for element in jingle.iterTags('content'): transport = get_jingle_transport(element.getTag('transport')) + if transport: + transport.ourjid = self.ourjid content_type = get_jingle_content(element.getTag('description')) if content_type: try: diff -r c4e1118a99ea -r a2d2a17abfd8 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Jun 14 21:21:22 2010 +0800 +++ b/src/common/jingle_transport.py Sat Jun 19 22:52:17 2010 +0800 @@ -16,6 +16,13 @@ """ import xmpp +import socket +from common import gajim +from common.protocol.bytestream import ConnectionSocks5Bytestream +import logging + +log = logging.getLogger('gajim.c.jingle_transport') + transports = {} @@ -71,6 +78,117 @@ """ return [] +class JingleTransportSocks5(JingleTransport): + """ + Socks5 transport in jingle scenario + Note: Don't forget to call set_file_props after initialization + """ + def __init__(self): + JingleTransport.__init__(self, TransportType.streaming) + + def set_file_props(self, file_props): + self.file_props = file_props + + def set_our_jid(self, jid): + self.ourjid = jid + + def make_candidate(self, candidate): + import logging + log = logging.getLogger() + log.info('candidate dict, %s' % candidate) + attrs = { + 'cid': candidate['candidate_id'], + 'host': candidate['host'], + 'jid': candidate['jid'], + 'port': candidate['port'], + 'priority': candidate['priority'], + 'type': candidate['type'] + } + + return xmpp.Node('candidate', attrs=attrs) + + def make_transport(self, candidates=None): + self._add_local_ips_as_candidates() + self._add_additional_candidates() + self._add_proxy_candidates() + transport = JingleTransport.make_transport(self, candidates) + transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) + return transport + + def parse_transport_stanza(self, transport): + pass + + def _add_local_ips_as_candidates(self): + local_ip_cand = [] + port = gajim.config.get('file_transfers_port') + type_preference = 126 #type preference of connection type. XEP-0260 section 2.2 + jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) + conn = gajim.connections[jid_wo_resource] + c = {'host': conn.peerhost[0]} + c['candidate_id'] = conn.connection.getAnID() + c['port'] = port + c['type'] = 'direct' + c['jid'] = self.ourjid + c['priority'] = (2**16) * type_preference + + local_ip_cand.append(c) + + for addr in socket.getaddrinfo(socket.gethostname(), None): + if not addr[4][0] in local_ip_cand and not addr[4][0].startswith('127'): + c = {'host': addr[4][0]} + c['candidate_id'] = conn.connection.getAnID() + c['port'] = port + c['type'] = 'direct' + c['jid'] = self.ourjid + c['priority'] = (2**16) * type_preference + local_ip_cand.append(c) + + self.candidates += local_ip_cand + + def _add_additional_candidates(self): + type_preference = 126 + additional_ip_cand = [] + port = gajim.config.get('file_transfers_port') + ft_add_hosts = gajim.config.get('ft_add_hosts_to_send') + jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) + conn = gajim.connections[jid_wo_resource] + + if ft_add_hosts: + hosts = [e.strip() for e in ft_add_hosts.split(',')] + for h in hosts: + c = {'host': h} + c['candidate_id'] = conn.connection.getAnID() + c['port'] = port + c['type'] = 'direct' + c['jid'] = self.ourjid + c['priority'] = (2**16) * type_preference + additional_ip_cand.append(c) + self.candidates += additional_ip_cand + + def _add_proxy_candidates(self): + type_preference = 10 + proxy_cand = [] + socks5conn = ConnectionSocks5Bytestream() + socks5conn.name = self.ourjid + proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) + jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) + conn = gajim.connections[jid_wo_resource] + + if proxyhosts: + file_props['proxy_receiver'] = unicode(file_props['receiver']) + file_props['proxy_sender'] = unicode(file_props['sender']) + file_props['proxyhosts'] = proxyhosts + + for proxyhost in proxyhosts: + c = {'host': proxyhost['host']} + c['candidate_id'] = conn.connection.getAnID() + c['port'] = proxyhost['port'] + c['type'] = 'proxy' + c['jid'] = self.ourjid + c['priority'] = (2**16) * type_preference + proxy_cand.append(c) + self.candidates += proxy_cand + import farsight @@ -146,3 +264,4 @@ return candidates transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP +transports[xmpp.NS_JINGLE_BYTESTREAM] = JingleTransportSocks5 diff -r c4e1118a99ea -r a2d2a17abfd8 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Jun 14 21:21:22 2010 +0800 +++ b/src/common/protocol/bytestream.py Sat Jun 19 22:52:17 2010 +0800 @@ -141,7 +141,7 @@ if not session.accepted: session.approve_session() session.approve_content('file') - return + return iq = xmpp.Iq(to=unicode(file_props['sender']), typ='result') iq.setAttr('id', file_props['request-id']) diff -r c4e1118a99ea -r a2d2a17abfd8 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon Jun 14 21:21:22 2010 +0800 +++ b/src/common/xmpp/protocol.py Sat Jun 19 22:52:17 2010 +0800 @@ -72,6 +72,7 @@ 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_JINGLE_BYTESTREAM ='urn:xmpp:jingle:transports:s5b:1' # XEP-0260 NS_LAST ='jabber:iq:last' NS_LOCATION ='http://jabber.org/protocol/geoloc' # XEP-0080 NS_MESSAGE ='message' # Jabberd2

1 0

gajim: Removed incidentally commited artifact
by Alexander Cherniuk 19 Jun '10

19 Jun '10

changeset 9ba1d2f98414 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9ba1d2f98414 description: Removed incidentally commited artifact diffstat: src/config.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 7a01ef1a661a -r 9ba1d2f98414 src/config.py --- a/src/config.py Sat Jun 19 15:44:10 2010 +0200 +++ b/src/config.py Sat Jun 19 17:08:30 2010 +0300 @@ -456,8 +456,6 @@ create_av_combobox('video_output', VideoOutputManager().get_devices( )) - def cmp_framerate(f1, f2): - print 'tt' create_av_combobox('video_framerate', {_('Default'): '', '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \

1 0

gajim: ability to fix framerate and video size for jingle video.
by Yann Leboulanger 19 Jun '10

19 Jun '10

changeset 7a01ef1a661a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7a01ef1a661a description: ability to fix framerate and video size for jingle video. diffstat: data/gui/preferences_window.ui | 48 +++++++++++++++++++++++++++++++++++++- src/common/config.py | 2 + src/common/jingle_rtp.py | 16 ++++++++++++- src/config.py | 52 +++++++++++++++++++++++++++++++---------- 4 files changed, 103 insertions(+), 15 deletions(-) diffs (198 lines): diff -r bda0dc14fb70 -r 7a01ef1a661a data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Fri Jun 18 07:45:07 2010 +0200 +++ b/data/gui/preferences_window.ui Sat Jun 19 15:44:10 2010 +0200 @@ -2136,7 +2136,7 @@ <child> <object class="GtkTable" id="table8"> <property name="visible">True</property> - <property name="n_rows">2</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -2184,6 +2184,52 @@ <property name="bottom_attach">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Video framerate</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Video size</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="video_framerate_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_video_framerate_combobox_changed"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="video_size_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_video_size_combobox_changed"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> </object> </child> </object> diff -r bda0dc14fb70 -r 7a01ef1a661a src/common/config.py --- a/src/common/config.py Fri Jun 18 07:45:07 2010 +0200 +++ b/src/common/config.py Sat Jun 19 15:44:10 2010 +0200 @@ -277,6 +277,8 @@ 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'], 'video_output_device': [opt_str, 'autovideosink'], + 'video_framerate': [opt_str, '', _('Optionally fix jingle output video framerate. Example: 10/1 or 25/2')], + 'video_size': [opt_str, '', _('Optionally resize jingle output video. Example: 320x240')], 'audio_input_volume': [opt_int, 50], 'audio_output_volume': [opt_int, 50], 'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], diff -r bda0dc14fb70 -r 7a01ef1a661a src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Jun 18 07:45:07 2010 +0200 +++ b/src/common/jingle_rtp.py Sat Jun 19 15:44:10 2010 +0200 @@ -365,8 +365,22 @@ JingleRTPContent.setup_stream(self) # the local parts + if gajim.config.get('video_framerate'): + framerate = 'videorate ! video/x-raw-yuv,framerate=%s ! ' % \ + gajim.config.get('video_framerate') + else: + framerate = '' + try: + w, h = gajim.config.get('video_size').split('x') + except: + w = h = None + if w and h: + video_size = 'video/x-raw-yuv,width=%s,height=%s ! ' % (w, h) + else: + video_size = '' self.src_bin = self.make_bin_from_config('video_input_device', - '%s ! videoscale ! ffmpegcolorspace', _("video input")) + '%%s ! %svideoscale ! %sffmpegcolorspace' % (framerate, video_size), + _("video input")) #caps = gst.element_factory_make('capsfilter') #caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) diff -r bda0dc14fb70 -r 7a01ef1a661a src/config.py --- a/src/config.py Fri Jun 18 07:45:07 2010 +0200 +++ b/src/config.py Sat Jun 19 15:44:10 2010 +0200 @@ -429,27 +429,47 @@ buf.connect('changed', self.on_msg_textview_changed) ### Audio / Video tab ### - def create_av_combobox(opt_name, device_dict): + def create_av_combobox(opt_name, device_dict, config_name=None, + key=None): combobox = self.xml.get_object(opt_name + '_combobox') cell = gtk.CellRendererText() combobox.pack_start(cell, True) combobox.add_attribute(cell, 'text', 0) model = gtk.ListStore(str, str) combobox.set_model(model) - - for index, (name, value) in enumerate(sorted(device_dict.iteritems())): + if config_name: + config = gajim.config.get(config_name) + else: + config = gajim.config.get(opt_name + '_device') + + for index, (name, value) in enumerate(sorted(device_dict.\ + iteritems(), key=key)): model.append((name, value)) - if gajim.config.get(opt_name + '_device') == value: + if config == value: combobox.set_active(index) if HAS_GST: create_av_combobox('audio_input', AudioInputManager().get_devices()) - create_av_combobox('audio_output', AudioOutputManager().get_devices()) + create_av_combobox('audio_output', AudioOutputManager().get_devices( + )) create_av_combobox('video_input', VideoInputManager().get_devices()) - create_av_combobox('video_output', VideoOutputManager().get_devices()) + create_av_combobox('video_output', VideoOutputManager().get_devices( + )) + + def cmp_framerate(f1, f2): + print 'tt' + create_av_combobox('video_framerate', {_('Default'): '', + '15fps': '15/1', '10fps': '10/1', '5fps': '5/1', + '2.5fps': '5/2'}, 'video_framerate', key=lambda x: -1 if \ + x[0] == 'Default' else float(x[0][:-3])) + create_av_combobox('video_size', {_('Default'): '', + '800x600': '800x600', '640x480': '640x480', + '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ + x[0] == 'Default' else int(x[0][:3])) + else: for opt_name in ('audio_input', 'audio_output', 'video_input', - 'video_output'): + 'video_output', 'video_framerate', 'video_size'): combobox = self.xml.get_object(opt_name + '_combobox') combobox.set_sensitive(False) @@ -1076,23 +1096,29 @@ def on_msg_treemodel_row_deleted(self, model, path): self.save_status_messages(model) - def on_av_combobox_changed(self, combobox, opt_name): + def on_av_combobox_changed(self, combobox, config_name): model = combobox.get_model() active = combobox.get_active() device = model[active][1].decode('utf-8') - gajim.config.set(opt_name + '_device', device) + gajim.config.set(config_name, device) def on_audio_input_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'audio_input') + self.on_av_combobox_changed(widget, 'audio_input_device') def on_audio_output_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'audio_output') + self.on_av_combobox_changed(widget, 'audio_output_device') def on_video_input_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_input') + self.on_av_combobox_changed(widget, 'video_input_device') def on_video_output_combobox_changed(self, widget): - self.on_av_combobox_changed(widget, 'video_output') + self.on_av_combobox_changed(widget, 'video_output_device') + + def on_video_framerate_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'video_framerate') + + def on_video_size_combobox_changed(self, widget): + self.on_av_combobox_changed(widget, 'video_size') def on_stun_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_stun_server',

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