Commits November 2009

commits@gajim.org

9 participants
288 discussions

gajim: Keep the doc-strings (even one-liners) unified, please
by Alexander Cherniuk 30 Nov '09

30 Nov '09

changeset d637f4a4ef68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d637f4a4ef68 description: Keep the doc-strings (even one-liners) unified, please diffstat: src/common/jingle_rtp.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 84f0f6185600 -r d637f4a4ef68 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon Nov 30 22:29:32 2009 +0100 +++ b/src/common/jingle_rtp.py Tue Dec 01 00:07:36 2009 +0200 @@ -106,7 +106,9 @@ self.p2pstream.set_remote_candidates(candidates) def batch_dtmf(self, events): - """ Send several DTMF tones. """ + """ + Send several DTMF tones + """ if self._dtmf_running: raise Exception # TODO: Proper exception self._dtmf_running = True

1 0

gajim: [Jingle] a bit of documentation/clarification ; added mak...
by Thibaut GIRKA 30 Nov '09

30 Nov '09

changeset 84f0f6185600 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84f0f6185600 description: [Jingle] a bit of documentation/clarification ; added make_bin_from_config diffstat: src/common/jingle.py | 1 - src/common/jingle_content.py | 3 +++ src/common/jingle_rtp.py | 45 ++++++++++++++++++++------------------------- src/common/jingle_session.py | 4 ++-- 4 files changed, 25 insertions(+), 28 deletions(-) diffs (135 lines): diff -r f862fcd706e9 -r 84f0f6185600 src/common/jingle.py --- a/src/common/jingle.py Mon Nov 30 21:10:24 2009 +0100 +++ b/src/common/jingle.py Mon Nov 30 22:29:32 2009 +0100 @@ -25,7 +25,6 @@ # - video integration # * config: # - codecs -# - STUN # * figure out why it doesn't work with pidgin: # That's maybe a bug in pidgin: diff -r f862fcd706e9 -r 84f0f6185600 src/common/jingle_content.py --- a/src/common/jingle_content.py Mon Nov 30 21:10:24 2009 +0100 +++ b/src/common/jingle_content.py Mon Nov 30 22:29:32 2009 +0100 @@ -106,6 +106,9 @@ payload=payload) def send_candidate(self, candidate): + """ + Send a transport candidate for a previously defined transport. + """ content = self.__content() content.addChild(self.transport.make_transport([candidate])) self.session.send_transport_info(content) diff -r f862fcd706e9 -r 84f0f6185600 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon Nov 30 21:10:24 2009 +0100 +++ b/src/common/jingle_rtp.py Mon Nov 30 22:29:32 2009 +0100 @@ -60,7 +60,7 @@ # conference self.conference = gst.element_factory_make('fsrtpconference') - self.conference.set_property("sdes-cname", self.session.ourjid) + self.conference.set_property('sdes-cname', self.session.ourjid) self.pipeline.add(self.conference) self.funnel = None @@ -88,6 +88,16 @@ return (JingleContent.is_ready(self) and self.candidates_ready and self.p2psession.get_property('codecs-ready')) + def make_bin_from_config(self, config_key, pipeline, text): + try: + bin = gst.parse_bin_from_description(pipeline + % gajim.config.get(config_key), True) + except GError, error_str: + self.session.connection.dispatch('ERROR', + (_("%s configuration error") % text.capitalize(), + _("Couldn't setup %s. Check your configuration.\n\nError was:\n%s") + % (text, error_str))) + def add_remote_candidates(self, candidates): JingleContent.add_remote_candidates(self, candidates) # FIXME: connectivity should not be etablished yet @@ -96,6 +106,7 @@ self.p2pstream.set_remote_candidates(candidates) def batch_dtmf(self, events): + """ Send several DTMF tones. """ if self._dtmf_running: raise Exception # TODO: Proper exception self._dtmf_running = True @@ -259,19 +270,11 @@ # the local parts # TODO: Add queues? - try: - src_bin = gst.parse_bin_from_description('%s ! audioconvert' - % gajim.config.get('audio_input_device'), True) - except GError: - self.session.connection.dispatch('ERROR', (_("Audio configuration error"), - _("Couldn't setup audio input. Check your audio configuration."))) + src_bin = self.make_bin_from_config('audio_input_device', + '%s ! audioconvert', _("audio input")) - try: - self.sink = gst.parse_bin_from_description('audioconvert ! %s' - % gajim.config.get('audio_output_device'), True) - except GError: - self.session.connection.dispatch('ERROR', (_("Audio configuration error"), - _("Couldn't setup audio output. Check your audio configuration."))) + self.sink = self.make_bin_from_config('audio_output_device', + 'audioconvert ! %s', _("audio output")) self.mic_volume = src_bin.get_by_name('gajim_vol') self.mic_volume.set_property('volume', 1) @@ -299,24 +302,16 @@ JingleRTPContent.setup_stream(self) # the local parts - try: - src_bin = gst.parse_bin_from_description('%s ! videoscale ! ffmpegcolorspace' - % gajim.config.get('video_input_device'), True) - except GError: - self.session.connection.dispatch('ERROR', (_("Video configuration error"), - _("Couldn't setup video input. Check your video configuration."))) + src_bin = self.make_bin_from_config('video_input_device', + '%s ! videoscale ! ffmpegcolorspace', _("video input")) #caps = gst.element_factory_make('capsfilter') #caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) self.pipeline.add(src_bin)#, caps) #src_bin.link(caps) - try: - self.sink = gst.parse_bin_from_description('videoscale ! ffmpegcolorspace ! %s' - % gajim.config.get('video_output_device'), True) - except GError: - self.session.connection.dispatch('ERROR', (_("Video configuration error"), - _("Couldn't setup video output. Check your video configuration."))) + self.sink = self.make_bin_from_config('video_output_device', + '%s ! videoscale ! ffmpegcolorspace', _("video output")) self.pipeline.add(self.sink) src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad')) diff -r f862fcd706e9 -r 84f0f6185600 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Nov 30 21:10:24 2009 +0100 +++ b/src/common/jingle_session.py Mon Nov 30 22:29:32 2009 +0100 @@ -16,7 +16,6 @@ """ #TODO: -# * Have JingleContent here # * 'senders' attribute of 'content' element # * security preconditions # * actions: @@ -55,7 +54,8 @@ class JingleSession(object): """ - This represents one jingle session + This represents one jingle session, that is, one or more content types + negotiated between an initiator and a responder. """ def __init__(self, con, weinitiate, jid, sid=None):

1 0

gajim: add stun_server option in pref window.
by Yann Leboulanger 30 Nov '09

30 Nov '09

changeset f862fcd706e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f862fcd706e9 description: add stun_server option in pref window. diffstat: data/glade/preferences_window.glade | 72 ++++++++++++++++++++++++++++++++++-- src/common/config.py | 1 + src/common/jingle_rtp.py | 12 +++++- src/config.py | 11 ++++- 4 files changed, 88 insertions(+), 8 deletions(-) diffs (178 lines): diff -r aea792cc7263 -r f862fcd706e9 data/glade/preferences_window.glade --- a/data/glade/preferences_window.glade Mon Nov 30 16:37:08 2009 +0100 +++ b/data/glade/preferences_window.glade Mon Nov 30 21:10:24 2009 +0100 @@ -1962,7 +1962,6 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="x_options"></property> </packing> </child> <child> @@ -1975,7 +1974,6 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> </packing> </child> <child> @@ -2066,7 +2064,6 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="x_options"></property> </packing> </child> <child> @@ -2079,7 +2076,6 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> </packing> </child> </widget> @@ -2102,6 +2098,74 @@ <property name="position">1</property> </packing> </child> + <child> + <widget class="GtkFrame" id="frame7"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <widget class="GtkAlignment" id="alignment9"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkTable" id="table9"> + <property name="visible">True</property> + <property name="n_columns">3</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">STUN server:</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="label" translatable="yes"><i>(example: stunserver.org)</i></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="stun_server_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Connection</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> </widget> <packing> <property name="position">5</property> diff -r aea792cc7263 -r f862fcd706e9 src/common/config.py --- a/src/common/config.py Mon Nov 30 16:37:08 2009 +0100 +++ b/src/common/config.py Mon Nov 30 21:10:24 2009 +0100 @@ -276,6 +276,7 @@ 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'], 'video_output_device': [opt_str, 'autovideosink'], + 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], } __options_per_key = { diff -r aea792cc7263 -r f862fcd706e9 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon Nov 30 16:37:08 2009 +0100 +++ b/src/common/jingle_rtp.py Mon Nov 30 21:10:24 2009 +0100 @@ -70,8 +70,16 @@ # FIXME: Consider a workaround, here... # pidgin and telepathy-gabble don't follow the XEP, and it won't work # due to bad controlling-mode - params = {'controlling-mode': self.session.weinitiate,# 'debug': False} - 'stun-ip': '69.0.208.27', 'debug': False} + params = {'controlling-mode': self.session.weinitiate, 'debug': False} + stun_server = gajim.config.get('stun-server') + if stun_server: + try: + ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC, + socket.SOCK_STREAM)[0][4][0] + except socket.gaierror, (errnum, errstr): + log.warn('Lookup of stun ip failed: %s' % errstr) + else: + params['stun-ip'] = ip self.p2pstream = self.p2psession.new_stream(participant, farsight.DIRECTION_RECV, 'nice', params) diff -r aea792cc7263 -r f862fcd706e9 src/config.py --- a/src/config.py Mon Nov 30 16:37:08 2009 +0100 +++ b/src/config.py Mon Nov 30 21:10:24 2009 +0100 @@ -421,8 +421,7 @@ buf = self.xml.get_widget('msg_textview').get_buffer() buf.connect('changed', self.on_msg_textview_changed) - ### Style tab ### - # Audio + ### Audio / Video tab ### def create_av_combobox(opt_name, device_dict): combobox = self.xml.get_widget(opt_name + '_combobox') cell = gtk.CellRendererText() @@ -446,6 +445,11 @@ 'video_output'): combobox = self.xml.get_widget(opt_name + '_combobox') combobox.set_sensitive(False) + + # Connection + entry = self.xml.get_widget('stun_server_entry') + entry.set_text(gajim.config.get('stun_server')) + ### Advanced tab ### # open links with if os.name == 'nt': @@ -1057,6 +1061,9 @@ def on_video_output_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'video_output') + def stun_server_entry_changed(self, widget): + gajim.config.set('stun_server', widget.get_text().decode('utf-8')) + def on_applications_combobox_changed(self, widget): gajim.config.set('autodetect_browser_mailer', False) if widget.get_active() == 4:

1 0

gajim: don't traceback when gst is not installed
by Yann Leboulanger 30 Nov '09

30 Nov '09

changeset aea792cc7263 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aea792cc7263 description: don't traceback when gst is not installed diffstat: src/config.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diffs (38 lines): diff -r 385e65dabb82 -r aea792cc7263 src/config.py --- a/src/config.py Mon Nov 30 16:36:47 2009 +0100 +++ b/src/config.py Mon Nov 30 16:37:08 2009 +0100 @@ -59,7 +59,12 @@ from common import dataforms from common import GnuPG -from common.multimedia_helpers import AudioInputManager, AudioOutputManager, VideoInputManager, VideoOutputManager +try: + from common.multimedia_helpers import AudioInputManager, AudioOutputManager + from common.multimedia_helpers import VideoInputManager, VideoOutputManager + HAS_GST = True +except ImportError: + HAS_GST = False from common.exceptions import GajimGeneralException @@ -431,10 +436,16 @@ if gajim.config.get(opt_name + '_device') == value: combobox.set_active(index) - create_av_combobox('audio_input', AudioInputManager().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()) + if HAS_GST: + create_av_combobox('audio_input', AudioInputManager().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()) + else: + for opt_name in ('audio_input', 'audio_output', 'video_input', + 'video_output'): + combobox = self.xml.get_widget(opt_name + '_combobox') + combobox.set_sensitive(False) ### Advanced tab ### # open links with if os.name == 'nt':

1 0

gajim: don't try to import pysqlite2, we depend on sqlite3
by Yann Leboulanger 30 Nov '09

30 Nov '09

changeset 385e65dabb82 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=385e65dabb82 description: don't try to import pysqlite2, we depend on sqlite3 diffstat: src/common/check_paths.py | 9 +-------- src/common/exceptions.py | 11 ----------- src/common/logger.py | 8 +------- src/common/optparser.py | 9 +-------- src/history_manager.py | 8 +------- 5 files changed, 4 insertions(+), 41 deletions(-) diffs (99 lines): diff -r 41a7e43261c0 -r 385e65dabb82 src/common/check_paths.py --- a/src/common/check_paths.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/check_paths.py Mon Nov 30 16:36:47 2009 +0100 @@ -27,18 +27,11 @@ import sys import stat -import exceptions from common import gajim import logger # DO NOT MOVE ABOVE OF import gajim -try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite def create_log_db(): print _('creating logs database') diff -r 41a7e43261c0 -r 385e65dabb82 src/common/exceptions.py --- a/src/common/exceptions.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/exceptions.py Mon Nov 30 16:36:47 2009 +0100 @@ -21,17 +21,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -class PysqliteNotAvailable(Exception): - """ - Sqlite2 is not installed or python bindings are missing - """ - - def __init__(self): - Exception.__init__(self) - - def __str__(self): - return _('pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting...') - class PysqliteOperationalError(Exception): """ Sqlite2 raised pysqlite2.dbapi2.OperationalError diff -r 41a7e43261c0 -r 385e65dabb82 src/common/logger.py --- a/src/common/logger.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/logger.py Mon Nov 30 16:36:47 2009 +0100 @@ -38,13 +38,7 @@ import exceptions import gajim -try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite import configpaths LOG_DB_PATH = configpaths.gajimpaths['LOG_DB'] diff -r 41a7e43261c0 -r 385e65dabb82 src/common/optparser.py --- a/src/common/optparser.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/optparser.py Mon Nov 30 16:36:47 2009 +0100 @@ -34,14 +34,7 @@ from common import helpers from common import caps -import exceptions -try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite import logger class OptionsParser: diff -r 41a7e43261c0 -r 385e65dabb82 src/history_manager.py --- a/src/history_manager.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/history_manager.py Mon Nov 30 16:36:47 2009 +0100 @@ -102,13 +102,7 @@ ) = range(2, 6) -try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite class HistoryManager:

1 0

gajim: prevent traceback when writing in a closed gc control. Fi...
by Yann Leboulanger 30 Nov '09

30 Nov '09

changeset 41a7e43261c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=41a7e43261c0 description: prevent traceback when writing in a closed gc control. Fixes #5455 diffstat: src/htmltextview.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r b9993a87ea04 -r 41a7e43261c0 src/htmltextview.py --- a/src/htmltextview.py Mon Nov 30 14:58:43 2009 +0200 +++ b/src/htmltextview.py Mon Nov 30 14:32:59 2009 +0100 @@ -892,8 +892,10 @@ def on_text_buffer_mark_set(self, location, mark, unused_data): bounds = self.get_buffer().get_selection_bounds() if bounds: - clipboard = self.get_clipboard(gtk.gdk.SELECTION_PRIMARY) - clipboard.set_text(self.get_selected_text()) + # textview can be hidden while we add a new line in it. + if self.has_screen(): + clipboard = self.get_clipboard(gtk.gdk.SELECTION_PRIMARY) + clipboard.set_text(self.get_selected_text()) def get_selected_text(self): bounds = self.get_buffer().get_selection_bounds()

1 0

gajim: BaseException.message is deprecated since 2.6. Fixes #5465
by Alexander Cherniuk 30 Nov '09

30 Nov '09

changeset b9993a87ea04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b9993a87ea04 description: BaseException.message is deprecated since 2.6. Fixes #5465 diffstat: src/command_system/errors.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 988933a90557 -r b9993a87ea04 src/command_system/errors.py --- a/src/command_system/errors.py Mon Nov 30 12:53:26 2009 +0200 +++ b/src/command_system/errors.py Mon Nov 30 14:58:43 2009 +0200 @@ -20,13 +20,15 @@ """ def __init__(self, message, command=None, name=None): + self.message = message + self.command = command self.name = name if command and not name: self.name = command.first_name - super(BaseError, self).__init__(message) + super(BaseError, self).__init__() class DefinitionError(BaseError): """

1 0

gajim: Small refactoring bits
by Alexander Cherniuk 30 Nov '09

30 Nov '09

changeset 988933a90557 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=988933a90557 description: Small refactoring bits diffstat: src/common/contacts.py | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diffs (82 lines): diff -r 88ce17cd9d82 -r 988933a90557 src/common/contacts.py --- a/src/common/contacts.py Sun Nov 29 23:08:17 2009 +0100 +++ b/src/common/contacts.py Mon Nov 30 12:53:26 2009 +0200 @@ -31,7 +31,7 @@ from common import caps from common.account import Account -import common.gajim +import common.gajim class XMPPEntity(object): """ @@ -175,9 +175,7 @@ def is_transport(self): # if not '@' or '@' starts the jid then contact is transport - if self.jid.find('@') <= 0: - return True - return False + return self.jid.find('@') <= 0 class GC_Contact(CommonContact): @@ -443,18 +441,14 @@ """ Remove all contacts for a given jid """ - if jid not in self._contacts: - return - del self._contacts[jid] + if jid in self._contacts: + del self._contacts[jid] def get_contacts(self, jid): """ Return the list of contact instances for this jid """ - if jid in self._contacts: - return self._contacts[jid] - else: - return [] + return self._contacts.get(jid, []) def get_contact(self, jid, resource=None): ### WARNING ### @@ -472,7 +466,6 @@ for c in self._contacts[jid]: if c.resource == resource: return c - return None def iter_contacts(self): for jid in self._contacts.keys(): @@ -492,7 +485,6 @@ def get_first_contact_from_jid(self, jid): if jid in self._contacts: return self._contacts[jid][0] - return None def get_contacts_from_group(self, group): """ @@ -538,9 +530,8 @@ del self._rooms[gc_contact.room_jid] def remove_room(self, room_jid): - if room_jid not in self._rooms: - return - del self._rooms[room_jid] + if room_jid in self._rooms: + del self._rooms[room_jid] def get_gc_list(self): return self._rooms.keys() @@ -643,7 +634,7 @@ def remove_metacontact(self, account, jid): if not account in self._metacontacts_tags: - return None + return found = None for tag in self._metacontacts_tags[account]:

1 0

gajim: Merge local changes.
by Stephan Erb 29 Nov '09

29 Nov '09

changeset 88ce17cd9d82 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=88ce17cd9d82 description: Merge local changes. diffstat: src/common/jingle_rtp.py | 45 ++++++++++++++++++++++++--------------------- src/common/jingle_session.py | 2 +- src/common/multimedia_helpers.py | 6 ++---- 3 files changed, 27 insertions(+), 26 deletions(-) diffs (137 lines): diff -r 5295eaad5f00 -r 88ce17cd9d82 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Nov 29 23:06:49 2009 +0100 +++ b/src/common/jingle_rtp.py Sun Nov 29 23:08:17 2009 +0100 @@ -19,6 +19,7 @@ import xmpp import farsight, gst +from glib import GError import gajim @@ -35,12 +36,12 @@ self._dtmf_running = False self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO, 'video': farsight.MEDIA_TYPE_VIDEO}[media] - self.got_codecs = False self.candidates_ready = False # True when local candidates are prepared self.callbacks['session-initiate'] += [self.__on_remote_codecs] self.callbacks['content-add'] += [self.__on_remote_codecs] + self.callbacks['description-info'] += [self.__on_remote_codecs] self.callbacks['content-accept'] += [self.__on_remote_codecs, self.__on_content_accept] self.callbacks['session-accept'] += [self.__on_remote_codecs, @@ -177,8 +178,6 @@ """ Get peer codecs from what we get from peer """ - if self.got_codecs: - return codecs = [] for codec in content.getTag('description').iterTags('payload-type'): @@ -197,7 +196,6 @@ # glib.GError: There was no intersection between the remote codecs and # the local ones self.p2pstream.set_remote_codecs(codecs) - self.got_codecs = True def iter_codecs(self): codecs = self.p2psession.get_property('codecs') @@ -252,18 +250,21 @@ self.p2psession.set_codec_preferences(codecs) # the local parts + # TODO: Add queues? try: - self.sink = gst.parse_bin_from_description(gajim.config.get('audio_output_device'), True) - except: + src_bin = gst.parse_bin_from_description('%s ! audioconvert' + % gajim.config.get('audio_input_device'), True) + except GError: + self.session.connection.dispatch('ERROR', (_("Audio configuration error"), + _("Couldn't setup audio input. Check your audio configuration."))) + + try: + self.sink = gst.parse_bin_from_description('audioconvert ! %s' + % gajim.config.get('audio_output_device'), True) + except GError: self.session.connection.dispatch('ERROR', (_("Audio configuration error"), _("Couldn't setup audio output. Check your audio configuration."))) - try: - src_bin = gst.parse_bin_from_description(gajim.config.get('audio_input_device'), True) - except: - self.session.connection.dispatch('ERROR', (_("Audio configuration error"), - _("Couldn't setup audio input. Check your audio configuration."))) - self.mic_volume = src_bin.get_by_name('gajim_vol') self.mic_volume.set_property('volume', 1) @@ -291,24 +292,26 @@ # the local parts try: - src_bin = gst.parse_bin_from_description(gajim.config.get('video_input_device'), True) - except: + src_bin = gst.parse_bin_from_description('%s ! videoscale ! ffmpegcolorspace' + % gajim.config.get('video_input_device'), True) + except GError: self.session.connection.dispatch('ERROR', (_("Video configuration error"), _("Couldn't setup video input. Check your video configuration."))) - caps = gst.element_factory_make('capsfilter') - caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) + #caps = gst.element_factory_make('capsfilter') + #caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) - self.pipeline.add(src_bin, caps) - src_bin.link(caps) + self.pipeline.add(src_bin)#, caps) + #src_bin.link(caps) try: - self.sink = gst.parse_bin_from_description(gajim.config.get('video_output_device'), True) - except: + self.sink = gst.parse_bin_from_description('videoscale ! ffmpegcolorspace ! %s' + % gajim.config.get('video_output_device'), True) + except GError: self.session.connection.dispatch('ERROR', (_("Video configuration error"), _("Couldn't setup video output. Check your video configuration."))) self.pipeline.add(self.sink) - caps.get_pad('src').link(self.p2psession.get_property('sink-pad')) + src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad')) self.p2pstream.connect('src-pad-added', self._on_src_pad_added) # The following is needed for farsight to process ICE requests: diff -r 5295eaad5f00 -r 88ce17cd9d82 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Nov 29 23:06:49 2009 +0100 +++ b/src/common/jingle_session.py Sun Nov 29 23:08:17 2009 +0100 @@ -21,7 +21,7 @@ # * security preconditions # * actions: # - content-modify -# - description-info, session-info +# - session-info # - security-info # - transport-accept, transport-reject # - Tie-breaking diff -r 5295eaad5f00 -r 88ce17cd9d82 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Sun Nov 29 23:06:49 2009 +0100 +++ b/src/common/multimedia_helpers.py Sun Nov 29 23:08:17 2009 +0100 @@ -78,11 +78,9 @@ self.detect_element('videotestsrc', _('Video test'), '%s is-live=true') # Auto src - self.detect_element('autovideosrc', _('Autodetect'), - '%s ! videoscale ! ffmpegcolorspace') + self.detect_element('autovideosrc', _('Autodetect')) # V4L2 src ; TODO: Figure out why it doesn't work - self.detect_element('v4l2src', _('V4L2: %s'), - '%s ! videoscale ! ffmpegcolorspace') + self.detect_element('v4l2src', _('V4L2: %s')) # Funny things, just to test... # self.devices['GOOM'] = 'audiotestsrc ! goom' # self.devices['screen'] = 'ximagesrc'

1 0

gajim: Small cleanups for avatar save. Also fixes #5461.
by Stephan Erb 29 Nov '09

29 Nov '09

changeset 5295eaad5f00 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5295eaad5f00 description: Small cleanups for avatar save. Also fixes #5461. * set default file type for avatars centrally * remove client side decision logic determing if a avatar loookup shall happen for a groupchat contact or for a normal contact * remove unused method (this one was triggering the traceback in #5461) diffstat: src/chat_control.py | 40 +++++++++++----------------------------- src/common/contacts.py | 8 -------- src/groupchat_control.py | 6 +++--- src/gtkgui_helpers.py | 45 +++++++++++++++++++++++---------------------- src/profile_window.py | 6 +++--- src/roster_window.py | 5 ++--- src/vcard.py | 6 ++---- 7 files changed, 44 insertions(+), 72 deletions(-) diffs (297 lines): diff -r cf87e39bc43c -r 5295eaad5f00 src/chat_control.py --- a/src/chat_control.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/chat_control.py Sun Nov 29 23:06:49 2009 +0100 @@ -1351,7 +1351,7 @@ # per jid self.show_bigger_avatar_timeout_id = None self.bigger_avatar_window = None - self.show_avatar(self.contact.resource) + self.show_avatar() # chatstate timers and state self.reset_kbd_mouse_timeout_vars() @@ -1601,11 +1601,7 @@ bigger avatar after 0.5 sec """ jid = self.contact.jid - is_fake = False - if self.type_id == message_control.TYPE_PM: - is_fake = True - avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid, - is_fake) + avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid) if avatar_pixbuf in ('ask', None): return avatar_w = avatar_pixbuf.get_width() @@ -1638,8 +1634,7 @@ menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) id_ = menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.jid, self.account, self.contact.get_shown_name() + \ - '.jpeg') + self.contact.jid, self.account, self.contact.get_shown_name()) self.handlers[id_] = menuitem menu.append(menuitem) menu.show_all() @@ -2403,24 +2398,12 @@ # Re-show the small avatar self.show_avatar() - def show_avatar(self, resource = None): + def show_avatar(self): if not gajim.config.get('show_avatar_in_chat'): return - - is_fake = False - if self.TYPE_ID == message_control.TYPE_PM: - is_fake = True - jid_with_resource = self.contact.jid # fake jid - else: - jid_with_resource = self.contact.jid - if resource: - jid_with_resource += '/' + resource - - # we assume contact has no avatar - scaled_pixbuf = None - - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid_with_resource, - is_fake) + + jid_with_resource = self.contact.get_full_jid() + pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid_with_resource) if pixbuf == 'ask': # we don't have the vcard if self.TYPE_ID == message_control.TYPE_PM: @@ -2436,8 +2419,10 @@ else: gajim.connections[self.account].request_vcard(jid_with_resource) return - if pixbuf is not None: + elif pixbuf: scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'chat') + else: + scaled_pixbuf = None image = self.xml.get_widget('avatar_image') image.set_from_pixbuf(scaled_pixbuf) @@ -2629,11 +2614,8 @@ if not small_avatar.window: # Tab has been closed since we hovered the avatar return - is_fake = False - if self.type_id == message_control.TYPE_PM: - is_fake = True avatar_pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache( - self.contact.jid, is_fake) + self.contact.jid) if avatar_pixbuf in ('ask', None): return # Hide the small avatar diff -r cf87e39bc43c -r 5295eaad5f00 src/common/contacts.py --- a/src/common/contacts.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/common/contacts.py Sun Nov 29 23:06:49 2009 +0100 @@ -373,14 +373,6 @@ nbr_total += 1 return nbr_online, nbr_total - def is_pm_from_jid(self, account, jid): - """ - Return True if the given jid is a private message jid - """ - if jid in self._contacts[account]: - return False - return True - def __getattr__(self, attr_name): # Only called if self has no attr_name if hasattr(self._metacontact_manager, attr_name): diff -r cf87e39bc43c -r 5295eaad5f00 src/groupchat_control.py --- a/src/groupchat_control.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/groupchat_control.py Sun Nov 29 23:06:49 2009 +0100 @@ -1171,8 +1171,8 @@ iter_ = self.get_contact_iter(nick) if not iter_: return - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \ - '/' + nick, True) + fake_jid = self.room_jid + '/' + nick + pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid) if pixbuf in ('ask', None): scaled_pixbuf = None else: @@ -1514,7 +1514,7 @@ if gajim.config.get('ask_avatars_on_startup') and \ not server.startswith('irc'): fake_jid = self.room_jid + '/' + nick - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid, True) + pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid) if pixbuf == 'ask': if j: fjid = j diff -r cf87e39bc43c -r 5295eaad5f00 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/gtkgui_helpers.py Sun Nov 29 23:06:49 2009 +0100 @@ -30,6 +30,7 @@ import xml.sax.saxutils import gtk import gtk.glade +import glib import gobject import pango import os @@ -593,7 +594,7 @@ scaled_buf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_HYPER) return scaled_buf -def get_avatar_pixbuf_from_cache(fjid, is_fake_jid = False, use_local = True): +def get_avatar_pixbuf_from_cache(fjid, use_local=True): """ Check if jid has cached avatar and if that avatar is valid image (can be shown) @@ -607,9 +608,15 @@ gajim.jid_is_transport(jid): # don't show avatar for the transport itself return None + + room, nick = gajim.get_room_and_nick_from_fjid(jid) + if any(room in gajim.contacts.get_gc_list(acc) for acc in gajim.connections): + is_groupchat_contact = True + else: + is_groupchat_contact = False puny_jid = helpers.sanitize_filename(jid) - if is_fake_jid: + if is_groupchat_contact: puny_nick = helpers.sanitize_filename(nick) path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_nick) local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid, @@ -631,7 +638,7 @@ return 'ask' vcard_dict = gajim.connections.values()[0].get_cached_vcard(fjid, - is_fake_jid) + is_groupchat_contact) if not vcard_dict: # This can happen if cached vcard is too old return 'ask' if 'PHOTO' not in vcard_dict: @@ -831,39 +838,33 @@ def destroy_widget(widget): widget.destroy() -def on_avatar_save_as_menuitem_activate(widget, jid, account, -default_name = ''): +def on_avatar_save_as_menuitem_activate(widget, jid, account, default_name=''): def on_continue(response, file_path): if response < 0: return - # Get pixbuf - pixbuf = None - is_fake = False - if account and gajim.contacts.is_pm_from_jid(account, jid): - is_fake = True - pixbuf = get_avatar_pixbuf_from_cache(jid, is_fake, False) - ext = file_path.split('.')[-1] - type_ = '' - if not ext: + pixbuf = get_avatar_pixbuf_from_cache(jid) + path, extension = os.path.splitext(file_path) + if not extension: # Silently save as Jpeg image + image_format = 'jpeg' file_path += '.jpeg' - type_ = 'jpeg' - elif ext == 'jpg': - type_ = 'jpeg' + elif extension == 'jpg': + image_format = 'jpeg' else: - type_ = ext + image_format = extension[1:] # remove leading dot # Save image try: - pixbuf.save(file_path, type_) - except Exception: + pixbuf.save(file_path, image_format) + except glib.GError: if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg' def on_ok(file_path, pixbuf): pixbuf.save(file_path, 'jpeg') dialogs.ConfirmationDialog(_('Extension not supported'), - _('Image cannot be saved in %(type)s format. Save as %(new_filename)s?') % {'type': type_, 'new_filename': new_file_path}, + _('Image cannot be saved in %(type)s format. Save as %(new_filename)s?' + ) % {'type': image_format, 'new_filename': new_file_path}, on_response_ok = (on_ok, new_file_path, pixbuf)) else: dialog.destroy() @@ -905,7 +906,7 @@ current_folder=gajim.config.get('last_save_dir'), on_response_ok=on_ok, on_response_cancel=on_cancel) - dialog.set_current_name(default_name) + dialog.set_current_name(default_name + '.jpeg') dialog.connect('delete-event', lambda widget, event: on_cancel(widget)) diff -r cf87e39bc43c -r 5295eaad5f00 src/profile_window.py --- a/src/profile_window.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/profile_window.py Sun Nov 29 23:06:49 2009 +0100 @@ -183,14 +183,14 @@ # Try to get pixbuf pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.jid, - use_local = False) + use_local=False) - if pixbuf: + if pixbuf not in (None, 'ask'): nick = gajim.config.get_per('accounts', self.account, 'name') menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.jid, None, nick + '.jpeg') + self.jid, self.account, nick) menu.append(menuitem) # show clear menuitem = gtk.ImageMenuItem(gtk.STOCK_CLEAR) diff -r cf87e39bc43c -r 5295eaad5f00 src/roster_window.py --- a/src/roster_window.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/roster_window.py Sun Nov 29 23:06:49 2009 +0100 @@ -1295,10 +1295,9 @@ iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_avatars_in_roster'): return - jid = self.model[iters[0]][C_JID] - jid = jid.decode('utf-8') + jid = self.model[iters[0]][C_JID].decode('utf-8') pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid) - if pixbuf is None or pixbuf == 'ask': + if pixbuf in (None, 'ask'): scaled_pixbuf = None else: scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') diff -r cf87e39bc43c -r 5295eaad5f00 src/vcard.py --- a/src/vcard.py Sun Nov 29 21:06:26 2009 +0100 +++ b/src/vcard.py Sun Nov 29 23:06:49 2009 +0100 @@ -164,8 +164,7 @@ menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.jid, self.account, self.contact.get_shown_name() + - '.jpeg') + self.contact.jid, self.account, self.contact.get_shown_name()) menu.append(menuitem) menu.connect('selection-done', lambda w:w.destroy()) # show the menu @@ -480,8 +479,7 @@ menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS) menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.jid, self.account, self.contact.get_shown_name() + - '.jpeg') + self.contact.jid, self.account, self.contact.get_shown_name()) menu.append(menuitem) menu.connect('selection-done', lambda w:w.destroy()) # show the menu

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 November 2009