Commits

commits@gajim.org

17632 discussions

gajim: Do not highlight(mark) contact name in VcardWindow.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 81476f72b194 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=81476f72b194 description: Do not highlight(mark) contact name in VcardWindow. diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 37be0bb91ad9 -r 81476f72b194 src/vcard.py --- a/src/vcard.py Sun Apr 01 19:49:52 2012 +0200 +++ b/src/vcard.py Mon Jun 25 23:27:23 2012 +0400 @@ -142,8 +142,8 @@ buffer_.set_text(annotations[self.contact.jid]) self.xml.connect_signals(self) + self.xml.get_object('close_button').grab_focus() self.window.show_all() - self.xml.get_object('close_button').grab_focus() def update_progressbar(self): self.progressbar.pulse()

1 0

gajim: Set focus on close button in the AccountsWindow.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 0e2cb8d5ec7d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e2cb8d5ec7d description: Set focus on close button in the AccountsWindow. diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 81476f72b194 -r 0e2cb8d5ec7d src/config.py --- a/src/config.py Mon Jun 25 23:27:23 2012 +0400 +++ b/src/config.py Mon Jun 25 23:49:20 2012 +0400 @@ -1559,6 +1559,7 @@ self.update_proxy_list() self.xml.connect_signals(self) self.init_accounts() + self.xml.get_object('close_button').grab_focus() self.window.show_all() # Merge accounts

1 0

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

14 Aug '12

changeset 37be0bb91ad9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37be0bb91ad9 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 41acee25913c -r 37be0bb91ad9 debian/README.Debian --- a/debian/README.Debian Tue Jun 19 22:45:19 2012 +0400 +++ 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 41acee25913c -r 37be0bb91ad9 debian/control --- a/debian/control Tue Jun 19 22:45:19 2012 +0400 +++ 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.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-farsight, gstreamer0.10-plugins-ugly, python-pycurl, python-gupnp-igd +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, python-gupnp-igd 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 41acee25913c -r 37be0bb91ad9 src/chat_control.py --- a/src/chat_control.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/chat_control.py Sun Apr 01 19:49:52 2012 +0200 @@ -1648,15 +1648,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) @@ -1704,7 +1704,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 41acee25913c -r 37be0bb91ad9 src/common/gajim.py --- a/src/common/gajim.py Tue Jun 19 22:45:19 2012 +0400 +++ 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 41acee25913c -r 37be0bb91ad9 src/common/helpers.py --- a/src/common/helpers.py Tue Jun 19 22:45:19 2012 +0400 +++ 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 41acee25913c -r 37be0bb91ad9 src/common/jingle.py --- a/src/common/jingle.py Tue Jun 19 22:45:19 2012 +0400 +++ 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 41acee25913c -r 37be0bb91ad9 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Jun 19 22:45:19 2012 +0400 +++ 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: Fix russian translation
by Fomin Denis 12 Aug '12

12 Aug '12

changeset d0cfa7938e57 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d0cfa7938e57 description: Fix russian translation diffstat: po/ru.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (32 lines): diff -r cc2dc83d1597 -r d0cfa7938e57 po/ru.po --- a/po/ru.po Sun Aug 12 11:24:22 2012 +0400 +++ b/po/ru.po Sun Aug 12 22:04:20 2012 +0400 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-01 11:01+0400\n" -"PO-Revision-Date: 2012-03-01 11:08+0300\n" +"PO-Revision-Date: 2012-08-12 21:54+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -3430,9 +3430,8 @@ #: ../src/command_system/implementation/standard.py:184 #: ../src/command_system/implementation/standard.py:261 -#, fuzzy msgid "Clear the text window" -msgstr "Использование: /%s, очищает текстовое окно." +msgstr "Очистить текстовое окно" #: ../src/command_system/implementation/standard.py:189 #, fuzzy @@ -9602,7 +9601,7 @@ #: ../src/plugins/gui.py:162 msgid "Plugin failed" -msgstr "Неудачный модуль" +msgstr "Ошибка в модуле" #: ../src/plugins/gui.py:206 msgid "Unable to properly remove the plugin"

1 0

gajim: remove command_system modules from demandimport.ignore
by Fomin Denis 12 Aug '12

12 Aug '12

changeset cc2dc83d1597 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc2dc83d1597 description: remove command_system modules from demandimport.ignore diffstat: src/chat_control.py | 19 ++++++++++++++----- src/gajim.py | 4 +--- 2 files changed, 15 insertions(+), 8 deletions(-) diffs (64 lines): diff -r 7c10c9d09d85 -r cc2dc83d1597 src/chat_control.py --- a/src/chat_control.py Sun Aug 12 10:33:41 2012 +0400 +++ b/src/chat_control.py Sun Aug 12 11:24:22 2012 +0400 @@ -64,8 +64,8 @@ # Here we load the module with the standard commands, so they are being detected # and dispatched. -import command_system.implementation.standard -import command_system.implementation.execute +from command_system.implementation.standard import StandardChatCommands +from command_system.implementation.execute import Execute, Show try: import gtkspell @@ -83,7 +83,15 @@ ##!/bin/sh #LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) #echo "{_('en'):'en'",$LANG"}" -langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} +langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', + _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', + _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', + _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', + _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', + _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', + _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', + _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', + _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} if gajim.config.get('use_speller') and HAS_GTK_SPELL: # loop removing non-existent dictionaries @@ -2293,7 +2301,7 @@ else: displaymarking = None self.print_conversation(message, self.contact.jid, encrypted=encrypted, - xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) + xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, @@ -2886,7 +2894,8 @@ except exceptions.DatabaseMalformed: import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or \ + remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message diff -r 7c10c9d09d85 -r cc2dc83d1597 src/gajim.py --- a/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 +++ b/src/gajim.py Sun Aug 12 11:24:22 2012 +0400 @@ -65,9 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', - 'logging.NullHandler', 'dbus.service', - 'command_system.implementation.standard', - 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', + 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', 'Crypto.PublicKey']

1 0

gajim: remove dbus.glib from demandimport.ignore
by Fomin Denis 12 Aug '12

12 Aug '12

changeset 7c10c9d09d85 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c10c9d09d85 description: remove dbus.glib from demandimport.ignore diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 10a73406c098 -r 7c10c9d09d85 src/gajim.py --- a/src/gajim.py Sat Aug 11 22:46:39 2012 +0200 +++ b/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 @@ -65,7 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', - 'logging.NullHandler', 'dbus.glib', 'dbus.service', + 'logging.NullHandler', 'dbus.service', 'command_system.implementation.standard', 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',

1 0

gajim: remove imort dbus.glib to remove a warning
by Yann Leboulanger 11 Aug '12

11 Aug '12

changeset 10a73406c098 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=10a73406c098 description: remove imort dbus.glib to remove a warning diffstat: plugins/dbus_plugin/plugin.py | 1 - src/common/dbus_support.py | 3 ++- src/common/location_listener.py | 1 - src/common/zeroconf/zeroconf_avahi.py | 1 - src/music_track_listener.py | 1 - src/network_manager_listener.py | 1 - src/notify.py | 1 - src/remote_control.py | 1 - src/upower_listener.py | 3 +-- 9 files changed, 3 insertions(+), 10 deletions(-) diffs (108 lines): diff -r 7af7ec865838 -r 10a73406c098 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Sat Aug 11 22:34:44 2012 +0200 +++ b/plugins/dbus_plugin/plugin.py Sat Aug 11 22:46:39 2012 +0200 @@ -48,7 +48,6 @@ SERVICE = 'org.gajim.dbusplugin' import dbus.service - import dbus.glib # type mapping # in most cases it is a utf-8 string diff -r 7af7ec865838 -r 10a73406c098 src/common/dbus_support.py --- a/src/common/dbus_support.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/dbus_support.py Sat Aug 11 22:46:39 2012 +0200 @@ -33,7 +33,8 @@ try: import dbus - import dbus.glib + from dbus.mainloop.glib import DBusGMainLoop + DBusGMainLoop(set_as_default=True) except ImportError: supported = False if not os.name == 'nt': # only say that to non Windows users diff -r 7af7ec865838 -r 10a73406c098 src/common/location_listener.py --- a/src/common/location_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/location_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -25,7 +25,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib class LocationListener: _instance = None diff -r 7af7ec865838 -r 10a73406c098 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sat Aug 11 22:46:39 2012 +0200 @@ -21,7 +21,6 @@ log = logging.getLogger('gajim.c.z.zeroconf_avahi') try: - import dbus.glib import dbus.exceptions except ImportError, e: pass diff -r 7af7ec865838 -r 10a73406c098 src/music_track_listener.py --- a/src/music_track_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/music_track_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -31,7 +31,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib class MusicTrackInfo(object): __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', diff -r 7af7ec865838 -r 10a73406c098 src/network_manager_listener.py --- a/src/network_manager_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/network_manager_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -64,7 +64,6 @@ if dbus_support.supported: import dbus - import dbus.glib try: from common.dbus_support import system_bus diff -r 7af7ec865838 -r 10a73406c098 src/notify.py --- a/src/notify.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/notify.py Sat Aug 11 22:46:39 2012 +0200 @@ -41,7 +41,6 @@ from common import dbus_support if dbus_support.supported: import dbus - import dbus.glib USER_HAS_PYNOTIFY = True # user has pynotify module diff -r 7af7ec865838 -r 10a73406c098 src/remote_control.py --- a/src/remote_control.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/remote_control.py Sat Aug 11 22:46:39 2012 +0200 @@ -43,7 +43,6 @@ import dbus if dbus_support: import dbus.service - import dbus.glib INTERFACE = 'org.gajim.dbus.RemoteInterface' OBJ_PATH = '/org/gajim/dbus/RemoteObject' diff -r 7af7ec865838 -r 10a73406c098 src/upower_listener.py --- a/src/upower_listener.py Sat Aug 11 22:34:44 2012 +0200 +++ b/src/upower_listener.py Sat Aug 11 22:46:39 2012 +0200 @@ -34,7 +34,6 @@ if dbus_support.supported: import dbus - import dbus.glib try: from common.dbus_support import system_bus @@ -47,4 +46,4 @@ '/org/freedesktop/UPower') supported = True except Exception: - pass \ No newline at end of file + pass

1 0

gajim: Add 'role' and 'affiliate' command to command system.
by Fomin Denis 11 Aug '12

11 Aug '12

changeset e3941cc6b21a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e3941cc6b21a description: Add 'role' and 'affiliate' command to command system. diffstat: src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 24 ++++++++++++++++++++++++ src/command_system/mapping.py | 8 ++++---- 3 files changed, 29 insertions(+), 5 deletions(-) diffs (85 lines): diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Fri Aug 10 10:43:02 2012 +0200 +++ b/src/command_system/implementation/middleware.py Sat Aug 11 14:59:05 2012 +0400 @@ -71,7 +71,7 @@ except CommandError, error: self.echo_error("%s: %s" % (error.name, error.message)) except Exception: - self.echo_error("Error during command execution!") + self.echo_error(_("Error during command execution!")) print_exc() else: self.command_succeeded = True diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Aug 10 10:43:02 2012 +0200 +++ b/src/command_system/implementation/standard.py Sat Aug 11 14:59:05 2012 +0400 @@ -352,6 +352,30 @@ raise CommandError(_("Nickname not found")) self.connection.gc_set_role(self.room_jid, who, 'none', reason or str()) + @command(raw=True) + @doc(_("""Set occupant role in group chat. + Role can be given as one of the following values: + moderator, participant, visitor, none""")) + def role(self, who, role): + if role not in ('moderator', 'participant', 'visitor', 'none'): + raise CommandError(_("Invalid role given")) + if not who in gajim.contacts.get_nick_list(self.account, self.room_jid): + raise CommandError(_("Nickname not found")) + self.connection.gc_set_role(self.room_jid, who, role) + + @command(raw=True) + @doc(_("""Set occupant affiliation in group chat. + Affiliation can be given as one of the following values: + owner, admin, member, outcast, none""")) + def affiliate(self, who, affiliation): + if affiliation not in ('owner', 'admin', 'member', 'outcast', 'none'): + raise CommandError(_("Invalid affiliation given")) + if not who in gajim.contacts.get_nick_list(self.account, self.room_jid): + raise CommandError(_("Nickname not found")) + contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, who) + self.connection.gc_set_affiliation(self.room_jid, contact.jid, + affiliation) + @command @doc(_("Display names of all group chat occupants")) def names(self, verbose=False): diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/mapping.py --- a/src/command_system/mapping.py Fri Aug 10 10:43:02 2012 +0200 +++ b/src/command_system/mapping.py Sat Aug 11 14:59:05 2012 +0400 @@ -162,7 +162,7 @@ try: stopper, (start, end) = args[spec_len - 2] except IndexError: - raise CommandError("Missing arguments", command) + raise CommandError(_("Missing arguments"), command) # The essential point of the whole play. After # boundaries are being determined (supposingly correct) @@ -172,7 +172,7 @@ raw = raw.strip() or None if not raw and not command.empty: - raise CommandError("Missing arguments", command) + raise CommandError(_("Missing arguments"), command) # Discard residual arguments and all of the options as # raw command does not support options and if an option @@ -192,7 +192,7 @@ if command.empty: args.append((None, (0, 0))) else: - raise CommandError("Missing arguments", command) + raise CommandError(_("Missing arguments"), command) # The first stage of transforming options we have got to a format # that can be used to associate them with declared keyword @@ -259,7 +259,7 @@ for arg, (spec_key, spec_value) in zip(overlapped, spec_kwargs): opts.append((spec_key, arg)) else: - raise CommandError("Excessive arguments", command) + raise CommandError(_("Excessive arguments"), command) # Detect every switch and ensure it will not receive any arguments. # Normally this does not happen unless overlapping is enabled.

1 0

gajim: handle see-other-host at different state of connection (a...
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset 42f7ecdf64a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=42f7ecdf64a2 description: handle see-other-host at different state of connection (after authentication). Fixes #7179 diffstat: src/common/connection.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 64e27acebbdd -r 42f7ecdf64a2 src/common/connection.py --- a/src/common/connection.py Fri Aug 10 10:22:09 2012 +0200 +++ b/src/common/connection.py Fri Aug 10 10:43:02 2012 +0200 @@ -850,7 +850,12 @@ # show error dialog self._connection_lost() else: - self.disconnect() + if self.redirected: + self.disconnect(on_purpose=True) + self.connect() + return + else: + self.disconnect() self.on_purpose = False # END disconnectedReconnCB

1 0

gajim: fix var name
by Yann Leboulanger 10 Aug '12

10 Aug '12

changeset 64e27acebbdd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64e27acebbdd description: fix var name diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 4c87beb0324c -r 64e27acebbdd src/roster_window.py --- a/src/roster_window.py Fri Aug 10 10:21:01 2012 +0200 +++ b/src/roster_window.py Fri Aug 10 10:22:09 2012 +0200 @@ -2620,8 +2620,8 @@ account, jid) gajim.interface.on_open_chat_window(None, contact, account) - gajim.config.set_per('accounts', acct, 'opened_chat_controls', - '') + gajim.config.set_per('accounts', account, + 'opened_chat_controls', '') gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj):

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