Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: don't commit SQL request too fast to improve performences...
by Yann Leboulanger 03 Apr '12

03 Apr '12

changeset 8513eb020fa8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8513eb020fa8 description: don't commit SQL request too fast to improve performences. Fixes #6905 diffstat: src/common/logger.py | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diffs (121 lines): diff -r b509d1435857 -r 8513eb020fa8 src/common/logger.py --- a/src/common/logger.py Sun Apr 01 20:17:05 2012 +0200 +++ b/src/common/logger.py Tue Apr 03 19:38:15 2012 +0200 @@ -34,6 +34,7 @@ import datetime from gzip import GzipFile from cStringIO import StringIO +import gobject import exceptions import gajim @@ -106,6 +107,7 @@ def __init__(self): self.jids_already_in = [] # holds jids that we already have in DB self.con = None + self.commit_timout_id = None if not os.path.exists(LOG_DB_PATH): # this can happen only the first time (the time we create the db) @@ -163,15 +165,25 @@ self.open_db() self.get_jids_already_in_db() + def _really_commit(self): + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + self.commit_timout_id = None + return False + + def _timeout_commit(self): + if self.commit_timout_id: + return + self.commit_timout_id = gobject.timeout_add(500, self._really_commit) + def simple_commit(self, sql_to_commit): """ Helper to commit """ self.cur.execute(sql_to_commit) - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def get_jids_already_in_db(self): try: @@ -398,12 +410,14 @@ except sqlite.OperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) message_id = None - try: - self.con.commit() - if write_unread: + if write_unread: + try: + self.con.commit() message_id = self.cur.lastrowid - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + else: + self._timeout_commit() if message_id: self.insert_unread_events(message_id, values[0]) return message_id @@ -922,10 +936,7 @@ VALUES (?, ?, ?, ?); ''', (hash_method, hash_, buffer(data), int(time.time()))) # (1) -- note above - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def update_caps_time(self, method, hash_): sql = '''UPDATE caps_cache SET last_seen = %d @@ -963,9 +974,9 @@ # Fill roster tables with the new roster for jid in roster: self.add_or_update_contact(account_jid, jid, roster[jid]['name'], - roster[jid]['subscription'], roster[jid]['ask'], - roster[jid]['groups'], commit=False) - self.con.commit() + roster[jid]['subscription'], roster[jid]['ask'], + roster[jid]['groups'], commit=False) + self._timeout_commit() # At this point, we are sure the replacement works properly so we can # set the new roster_version value. @@ -987,7 +998,7 @@ self.cur.execute( 'DELETE FROM roster_entry WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) - self.con.commit() + self._timeout_commit() def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups, commit=True): @@ -1022,7 +1033,7 @@ self.convert_human_subscription_values_to_db_api_values(sub), bool(ask))) if commit: - self.con.commit() + self._timeout_commit() def get_roster(self, account_jid): """ @@ -1075,7 +1086,7 @@ (account_jid_id,)) self.cur.execute('DELETE FROM roster_group WHERE account_jid_id=?', (account_jid_id,)) - self.con.commit() + self._timeout_commit() def save_if_not_exists(self, with_, direction, tim, msg='', nick=None): if tim:

1 0

gajim: we require PyGTK2.22 for InfoBar
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset b509d1435857 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b509d1435857 description: we require PyGTK2.22 for InfoBar diffstat: README.html | 2 +- debian/control | 2 +- src/gajim.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diffs (46 lines): diff -r dfd58bb1ad06 -r b509d1435857 README.html --- a/README.html Sun Apr 01 19:49:52 2012 +0200 +++ b/README.html Sun Apr 01 20:17:05 2012 +0200 @@ -15,7 +15,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.16 or higher</li> +<li>pygtk2.22 or higher</li> </ul> <h2>Optional Runtime Requirements</h2> diff -r dfd58bb1ad06 -r b509d1435857 debian/control --- a/debian/control Sun Apr 01 19:49:52 2012 +0200 +++ b/debian/control Sun Apr 01 20:17:05 2012 +0200 @@ -10,7 +10,7 @@ Package: gajim Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farstream, gstreamer0.10-plugins-ugly, python-pycurl Description: Jabber client written in PyGTK diff -r dfd58bb1ad06 -r b509d1435857 src/gajim.py --- a/src/gajim.py Sun Apr 01 19:49:52 2012 +0200 +++ b/src/gajim.py Sun Apr 01 20:17:05 2012 +0200 @@ -233,12 +233,12 @@ elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') - if gtk.pygtk_version < (2, 16, 0): - pritext = _('Gajim needs PyGTK 2.16 or above') - sectext = _('Gajim needs PyGTK 2.16 or above to run. Quiting...') - elif gtk.gtk_version < (2, 16, 0): - pritext = _('Gajim needs GTK 2.16 or above') - sectext = _('Gajim needs GTK 2.16 or above to run. Quiting...') + if gtk.pygtk_version < (2, 22, 0): + pritext = _('Gajim needs PyGTK 2.22 or above') + sectext = _('Gajim needs PyGTK 2.22 or above to run. Quiting...') + elif gtk.gtk_version < (2, 22, 0): + pritext = _('Gajim needs GTK 2.22 or above') + sectext = _('Gajim needs GTK 2.22 or above to run. Quiting...') from common import check_paths

1 0

gajim: [Olivier Crete] port Gajim to use Farstream instead of Fa...
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset dfd58bb1ad06 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dfd58bb1ad06 description: [Olivier Crete] port Gajim to use Farstream instead of Farsight2. Fixes #7113 diffstat: debian/README.Debian | 2 +- debian/control | 2 +- src/chat_control.py | 10 ++-- src/common/gajim.py | 10 ++-- src/common/helpers.py | 2 +- src/common/jingle.py | 2 +- src/common/jingle_rtp.py | 79 ++++++++++++++++++++--------------------- src/common/jingle_transport.py | 32 ++++++++-------- src/features_window.py | 8 ++-- 9 files changed, 72 insertions(+), 75 deletions(-) diffs (truncated from 427 to 300 lines): diff -r 0f94fd42abba -r dfd58bb1ad06 debian/README.Debian --- a/debian/README.Debian Sun Apr 01 19:47:11 2012 +0200 +++ b/debian/README.Debian Sun Apr 01 19:49:52 2012 +0200 @@ -1,7 +1,7 @@ gajim for Debian ---------------- -For video chat support, you have to install python-farsight. +For video chat support, you have to install python-farstream. -- Yann Le Boulanger <asterix(a)lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200 -- Julien Valroff <julien(a)debian.org> Sat, 07 May 2011 13:50:27 +0200 diff -r 0f94fd42abba -r dfd58bb1ad06 debian/control --- a/debian/control Sun Apr 01 19:47:11 2012 +0200 +++ b/debian/control Sun Apr 01 19:49:52 2012 +0200 @@ -12,7 +12,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farstream, gstreamer0.10-plugins-ugly, python-pycurl Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, diff -r 0f94fd42abba -r dfd58bb1ad06 src/chat_control.py --- a/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:49:52 2012 +0200 @@ -1649,15 +1649,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1705,7 +1705,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/gajim.py --- a/src/common/gajim.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/gajim.py Sun Apr 01 19:49:52 2012 +0200 @@ -169,21 +169,21 @@ # read. HAVE_LATEX = False -HAVE_FARSIGHT = True +HAVE_FARSTREAM = True try: - farsight = __import__('farsight') + farstream = __import__('farstream') import gst import glib try: conference = gst.element_factory_make('fsrtpconference') - session = conference.new_session(farsight.MEDIA_TYPE_AUDIO) + session = conference.new_session(farstream.MEDIA_TYPE_AUDIO) del session del conference except glib.GError: - HAVE_FARSIGHT = False + HAVE_FARSTREAM = False except ImportError: - HAVE_FARSIGHT = False + HAVE_FARSTREAM = False HAVE_UPNP_IGD = True try: diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/helpers.py --- a/src/common/helpers.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/helpers.py Sun Apr 01 19:49:52 2012 +0200 @@ -1330,7 +1330,7 @@ gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS) - if gajim.HAVE_FARSIGHT: + if gajim.HAVE_FARSTREAM: gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO) diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle.py --- a/src/common/jingle.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/jingle.py Sun Apr 01 19:49:52 2012 +0200 @@ -35,7 +35,7 @@ import gajim from jingle_session import JingleSession, JingleStates -if gajim.HAVE_FARSIGHT: +if gajim.HAVE_FARSTREAM: from jingle_rtp import JingleAudio, JingleVideo diff -r 0f94fd42abba -r dfd58bb1ad06 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/common/jingle_rtp.py Sun Apr 01 19:49:52 2012 +0200 @@ -21,7 +21,7 @@ import socket import xmpp -import farsight, gst +import farstream, gst from glib import GError import gajim @@ -42,8 +42,8 @@ JingleContent.__init__(self, session, transport) self.media = media self._dtmf_running = False - self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO, - 'video': farsight.MEDIA_TYPE_VIDEO}[media] + self.farstream_media = {'audio': farstream.MEDIA_TYPE_AUDIO, + 'video': farstream.MEDIA_TYPE_VIDEO}[media] self.pipeline = None self.src_bin = None @@ -59,7 +59,7 @@ self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] - def setup_stream(self): + def setup_stream(self, on_src_pad_added): # pipeline and bus self.pipeline = gst.Pipeline() bus = self.pipeline.get_bus() @@ -68,13 +68,12 @@ # conference self.conference = gst.element_factory_make('fsrtpconference') - self.conference.set_property('sdes-cname', self.session.ourjid) self.pipeline.add(self.conference) self.funnel = None - self.p2psession = self.conference.new_session(self.farsight_media) + self.p2psession = self.conference.new_session(self.farstream_media) - participant = self.conference.new_participant(self.session.peerjid) + participant = self.conference.new_participant() # FIXME: Consider a workaround, here... # pidgin and telepathy-gabble don't follow the XEP, and it won't work # due to bad controlling-mode @@ -93,7 +92,9 @@ params['stun-ip'] = ip self.p2pstream = self.p2psession.new_stream(participant, - farsight.DIRECTION_RECV, 'nice', params) + farstream.DIRECTION_RECV) + self.p2pstream.connect('src-pad-added', on_src_pad_added) + self.p2pstream.set_transmitter('nice', params) def is_ready(self): return (JingleContent.is_ready(self) and self.candidates_ready) @@ -117,7 +118,7 @@ # FIXME: connectivity should not be etablished yet # Instead, it should be etablished after session-accept! if self.sent: - self.p2pstream.set_remote_candidates(candidates) + self.p2pstream.add_remote_candidates(candidates) def batch_dtmf(self, events): """ @@ -140,15 +141,14 @@ def _start_dtmf(self, event): if event in ('*', '#'): - event = {'*': farsight.DTMF_EVENT_STAR, - '#': farsight.DTMF_EVENT_POUND}[event] + event = {'*': farstream.DTMF_EVENT_STAR, + '#': farstream.DTMF_EVENT_POUND}[event] else: event = int(event) - self.p2psession.start_telephony_event(event, 2, - farsight.DTMF_METHOD_RTP_RFC4733) + self.p2psession.start_telephony_event(event, 2) def _stop_dtmf(self): - self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733) + self.p2psession.stop_telephony_event() def _fill_content(self, content): content.addChild(xmpp.NS_JINGLE_RTP + ' description', @@ -170,34 +170,33 @@ 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': + if name == 'farstream-new-active-candidate-pair': pass - elif name == 'farsight-recv-codecs-changed': + elif name == 'farstream-recv-codecs-changed': pass - elif name == 'farsight-codecs-changed': - if self.sent and self.p2psession.get_property('codecs-ready'): + elif name == 'farstream-codecs-changed': + if self.sent and self.p2psession.get_property('codecs'): self.send_description_info() - elif name == 'farsight-local-candidates-prepared': + elif name == 'farstream-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): self.session.on_session_state_changed(self) - elif name == 'farsight-new-local-candidate': + elif name == 'farstream-new-local-candidate': candidate = message.structure['candidate'] self.transport.candidates.append(candidate) if self.sent: # FIXME: Is this case even possible? self.send_candidate(candidate) - elif name == 'farsight-component-state-changed': + elif name == 'farstream-component-state-changed': state = message.structure['state'] - if state == farsight.STREAM_STATE_FAILED: + if state == farstream.STREAM_STATE_FAILED: reason = xmpp.Node('reason') reason.setTag('failed-transport') self.session.remove_content(self.creator, self.name, reason) - elif name == 'farsight-error': - log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % ( + elif name == 'farstream-error': + log.error('Farstream error #%d!\nMessage: %s' % ( message.structure['error-no'], - message.structure['error-msg'], - message.structure['debug-msg'])) + message.structure['error-msg'])) elif message.type == gst.MESSAGE_ERROR: # TODO: Fix it to fallback to videotestsrc anytime an error occur, # or raise an error, Jingle way @@ -236,10 +235,10 @@ def on_negotiated(self): if self.accepted: if self.transport.remote_candidates: - self.p2pstream.set_remote_candidates(self.transport.remote_candidates) + self.p2pstream.add_remote_candidates(self.transport.remote_candidates) self.transport.remote_candidates = [] - # TODO: farsight.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) + # TODO: farstream.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH) JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action): @@ -252,8 +251,8 @@ if not codec['id'] or not codec['name'] or not codec['clockrate']: # ignore invalid payload-types continue - c = farsight.Codec(int(codec['id']), codec['name'], - self.farsight_media, int(codec['clockrate'])) + c = farstream.Codec(int(codec['id']), codec['name'], + self.farstream_media, int(codec['clockrate'])) if 'channels' in codec: c.channels = int(codec['channels']) else: @@ -318,7 +317,7 @@ self.out_volume.set_property('volume', vol) def setup_stream(self): - JingleRTPContent.setup_stream(self) + JingleRTPContent.setup_stream(self, self._on_src_pad_added) # Configure SPEEX # Workaround for psi (not needed since rev @@ -326,10 +325,10 @@ # place 16kHz before 8kHz, as buggy psi versions will take in # account only the first codec - codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 16000), - farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 8000)] + codecs = [farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX', + farstream.MEDIA_TYPE_AUDIO, 16000), + farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX', + farstream.MEDIA_TYPE_AUDIO, 8000)] self.p2psession.set_codec_preferences(codecs) # the local parts @@ -348,9 +347,8 @@ self.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:

1 0

gajim: revert unwanted change
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset 0f94fd42abba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f94fd42abba description: revert unwanted change diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (32 lines): diff -r ab9d8cefa116 -r 0f94fd42abba src/chat_control.py --- a/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200 @@ -1649,15 +1649,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farstream is + # change tooltip text for audio and video buttons if python-farsight is # not installed - if not gajim.HAVE_FARSTREAM: + if not gajim.HAVE_FARSIGHT: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1705,7 +1705,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSTREAM and self.contact.resource: + gajim.HAVE_FARSIGHT and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else:

1 0

gajim: correctly forward unread printed messages to other resour...
by Yann Leboulanger 01 Apr '12

01 Apr '12

changeset ab9d8cefa116 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab9d8cefa116 description: correctly forward unread printed messages to other resources. Fixes #7094 diffstat: src/chat_control.py | 14 +++++++------- src/common/commands.py | 18 +++++++++++------- src/common/events.py | 2 +- src/common/stanza_session.py | 2 +- src/gui_interface.py | 4 ++-- src/roster_window.py | 4 ++-- 6 files changed, 24 insertions(+), 20 deletions(-) diffs (142 lines): diff -r 371d3f267052 -r ab9d8cefa116 src/chat_control.py --- a/src/chat_control.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 @@ -981,8 +981,8 @@ show_in_systray = notify.get_show_in_systray(event, self.account, self.contact, type_) - event = gajim.events.create_event(type_, (self, msg_id), - show_in_roster=show_in_roster, + event = gajim.events.create_event(type_, (text, subject, self, + msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster @@ -1649,15 +1649,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1705,7 +1705,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 371d3f267052 -r ab9d8cefa116 src/common/commands.py --- a/src/common/commands.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/commands.py Sun Apr 01 19:39:26 2012 +0200 @@ -56,10 +56,10 @@ assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') - cmd = response.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ - 'sessionid': self.sessionid, - 'node': self.commandnode, - 'status': status}) + cmd = response.getTag('command', namespace=xmpp.NS_COMMANDS) + cmd.setAttr('sessionid', self.sessionid) + cmd.setAttr('node', self.commandnode) + cmd.setAttr('status', status) if defaultaction is not None or actions is not None: if defaultaction is not None: assert defaultaction in ('cancel', 'execute', 'prev', 'next', @@ -277,13 +277,17 @@ def execute(self, request): account = self.connection.name # Forward messages - events = gajim.events.get_events(account, types=['chat', 'normal']) + events = gajim.events.get_events(account, types=['chat', 'normal', + 'printed_chat']) j, resource = gajim.get_room_and_nick_from_fjid(self.jid) for jid in events: for event in events[jid]: + ev_typ = event.type_ + if ev_typ == 'printed_chat': + ev_typ = 'chat' self.connection.send_message(j, event.parameters[0], '', - type_=event.type_, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_) + type_=ev_typ, subject=event.parameters[1], + resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') diff -r 371d3f267052 -r ab9d8cefa116 src/common/events.py --- a/src/common/events.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/events.py Sun Apr 01 19:39:26 2012 +0200 @@ -45,7 +45,7 @@ where kind in error, incoming file-*: file_props gc_msg: None - printed_chat: control + printed_chat: [message, subject, control, msg_id] printed_*: None messages that are already printed in chat, but not read gc-invitation: [room_jid, reason, password, is_continued] diff -r 371d3f267052 -r ab9d8cefa116 src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/stanza_session.py Sun Apr 01 19:39:26 2012 +0200 @@ -99,7 +99,7 @@ for event in gajim.events.get_events(self.conn.name, j, types=types): # the event wasn't in this session if (event.type_ == 'chat' and event.parameters[8] != self) or \ - (event.type_ == 'printed_chat' and event.parameters[0].session != \ + (event.type_ == 'printed_chat' and event.parameters[2].session != \ self): continue diff -r 371d3f267052 -r ab9d8cefa116 src/gui_interface.py --- a/src/gui_interface.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/gui_interface.py Sun Apr 01 19:39:26 2012 +0200 @@ -1560,7 +1560,7 @@ return if type_ == 'printed_chat': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'chat': session = event.parameters[8] ctrl = session.control @@ -1598,7 +1598,7 @@ event = gajim.events.get_first_event(account, jid, type_) if type_ == 'printed_pm': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'pm': session = event.parameters[8] diff -r 371d3f267052 -r ab9d8cefa116 src/roster_window.py --- a/src/roster_window.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/roster_window.py Sun Apr 01 19:39:26 2012 +0200 @@ -1871,9 +1871,9 @@ for ev in event_list: if ev.type_ != 'printed_chat': continue - if len(ev.parameters) > 1 and ev.parameters[1]: + if len(ev.parameters) > 3 and ev.parameters[3]: # There is a msg_id - msg_ids.append(ev.parameters[1]) + msg_ids.append(ev.parameters[3]) if msg_ids: gajim.logger.set_read_messages(msg_ids)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012