Commits November 2009

commits@gajim.org

9 participants
288 discussions

gajim: Always show the 'add contact to roster' menu entry in tex...
by Stephan Erb 29 Nov '09

29 Nov '09

changeset cf87e39bc43c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cf87e39bc43c description: Always show the 'add contact to roster' menu entry in textviews. Showing it is more consistent than hiding it from the user. (We do the same in the Groupchat roster) diffstat: src/common/contacts.py | 19 ++++++------------- src/conversation_textview.py | 9 --------- 2 files changed, 6 insertions(+), 22 deletions(-) diffs (70 lines): diff -r f07ebe7535c3 -r cf87e39bc43c src/common/contacts.py --- a/src/common/contacts.py Sun Nov 29 15:39:26 2009 +0100 +++ b/src/common/contacts.py Sun Nov 29 21:06:26 2009 +0100 @@ -28,9 +28,10 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import common.gajim -import caps -from account import Account + +from common import caps +from common.account import Account +import common.gajim class XMPPEntity(object): """ @@ -98,7 +99,7 @@ def __init__(self, jid, account, name='', groups=[], show='', status='', sub='', ask='', resource='', priority=0, keyID='', client_caps=None, - our_chatstate=None, chatstate=None, last_status_time=None, msg_id = + our_chatstate=None, chatstate=None, last_status_time=None, msg_id= None, composing_xep=None): CommonContact.__init__(self, jid, account, resource, show, status, name, @@ -256,7 +257,7 @@ account = self._accounts.get(account, account) # Use Account object if available self_contact = self.create_contact(jid=jid, account=account, name=nick, groups=['self_contact'], show=show, status=status, - sub='both', ask='none', priority=priority, keyID=keyID, + sub='both', ask='none', priority=priority, keyID=keyID, resource=resource) self_contact.pep = conn.pep return self_contact @@ -380,14 +381,6 @@ return False return True - def is_pm_from_contact(self, account, contact): - """ - Return True if the given contact is a private message contact - """ - if isinstance(contact, Contact): - 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 f07ebe7535c3 -r cf87e39bc43c src/conversation_textview.py --- a/src/conversation_textview.py Sun Nov 29 15:39:26 2009 +0100 +++ b/src/conversation_textview.py Sun Nov 29 21:06:26 2009 +0100 @@ -909,16 +909,7 @@ self.on_join_group_chat_menuitem_activate, text) self.handlers[id_] = childs[6] - allow_add = False if self.account: - c = gajim.contacts.get_first_contact_from_jid(self.account, text) - if c and not gajim.contacts.is_pm_from_contact(self.account, c): - if _('Not in Roster') in c.groups: - allow_add = True - else: # he or she's not at all in the account contacts - allow_add = True - - if allow_add: id_ = childs[7].connect('activate', self.on_add_to_roster_activate, text) self.handlers[id_] = childs[7]

1 0

gajim: [Jingle] Handle description-info ; catch only glib.GError...
by Thibaut GIRKA 29 Nov '09

29 Nov '09

changeset 310eb4a0bdb4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=310eb4a0bdb4 description: [Jingle] Handle description-info ; catch only glib.GError when parsing bins diffstat: src/common/jingle_rtp.py | 14 ++++++-------- src/common/jingle_session.py | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diffs (89 lines): diff -r 28870ec787d3 -r 310eb4a0bdb4 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Nov 29 21:39:50 2009 +0100 +++ b/src/common/jingle_rtp.py Sun Nov 29 22:45:34 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') @@ -256,14 +254,14 @@ try: src_bin = gst.parse_bin_from_description('%s ! audioconvert' % gajim.config.get('audio_input_device'), True) - except: + 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: + except GError: self.session.connection.dispatch('ERROR', (_("Audio configuration error"), _("Couldn't setup audio output. Check your audio configuration."))) @@ -296,7 +294,7 @@ try: src_bin = gst.parse_bin_from_description('%s ! videoscale ! ffmpegcolorspace' % gajim.config.get('video_input_device'), True) - except: + 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') @@ -308,7 +306,7 @@ try: self.sink = gst.parse_bin_from_description('videoscale ! ffmpegcolorspace ! %s' % gajim.config.get('video_output_device'), True) - except: + except GError: self.session.connection.dispatch('ERROR', (_("Video configuration error"), _("Couldn't setup video output. Check your video configuration."))) self.pipeline.add(self.sink) diff -r 28870ec787d3 -r 310eb4a0bdb4 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Nov 29 21:39:50 2009 +0100 +++ b/src/common/jingle_session.py Sun Nov 29 22:45:34 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

1 0

gajim: [Jingle] Add converters and simplify pipelines configurat...
by Thibaut GIRKA 29 Nov '09

29 Nov '09

changeset 28870ec787d3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=28870ec787d3 description: [Jingle] Add converters and simplify pipelines configuration-side diffstat: src/common/jingle_rtp.py | 33 +++++++++++++++++++-------------- src/common/multimedia_helpers.py | 6 ++---- 2 files changed, 21 insertions(+), 18 deletions(-) diffs (83 lines): diff -r f07ebe7535c3 -r 28870ec787d3 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Nov 29 15:39:26 2009 +0100 +++ b/src/common/jingle_rtp.py Sun Nov 29 21:39:50 2009 +0100 @@ -252,18 +252,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) + src_bin = gst.parse_bin_from_description('%s ! audioconvert' + % 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."))) + + try: + self.sink = gst.parse_bin_from_description('audioconvert ! %s' + % gajim.config.get('audio_output_device'), True) except: 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 +294,26 @@ # the local parts try: - src_bin = gst.parse_bin_from_description(gajim.config.get('video_input_device'), True) + src_bin = gst.parse_bin_from_description('%s ! videoscale ! ffmpegcolorspace' + % gajim.config.get('video_input_device'), True) except: 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) + self.sink = gst.parse_bin_from_description('videoscale ! ffmpegcolorspace ! %s' + % gajim.config.get('video_output_device'), True) except: 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 f07ebe7535c3 -r 28870ec787d3 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Sun Nov 29 15:39:26 2009 +0100 +++ b/src/common/multimedia_helpers.py Sun Nov 29 21:39:50 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: [Jingle] Audio/video input/output now configurable
by Thibaut GIRKA 29 Nov '09

29 Nov '09

changeset f07ebe7535c3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f07ebe7535c3 description: [Jingle] Audio/video input/output now configurable diffstat: src/common/jingle_rtp.py | 60 +++++++++---------- src/common/multimedia_helpers.py | 103 ++++++++++++++++++++++++++++++++++ src/config.py | 10 ++- 3 files changed, 138 insertions(+), 35 deletions(-) diffs (234 lines): diff -r 14fd0305bce1 -r f07ebe7535c3 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Nov 29 14:17:03 2009 +0100 +++ b/src/common/jingle_rtp.py Sun Nov 29 15:39:26 2009 +0100 @@ -20,19 +20,11 @@ import xmpp import farsight, gst +import gajim + from jingle_transport import JingleTransportICEUDP from jingle_content import contents, JingleContent -# TODO: Will that be even used? -def get_first_gst_element(elements): - """ - Return, if it exists, the first available element of the list - """ - for name in elements: - factory = gst.element_factory_find(name) - if factory: - return factory.create() - class JingleRTPContent(JingleContent): def __init__(self, session, media, transport=None): @@ -260,25 +252,25 @@ self.p2psession.set_codec_preferences(codecs) # the local parts - # TODO: use gconfaudiosink? - # sink = get_first_gst_element(['alsasink', 'osssink', 'autoaudiosink']) - self.sink = gst.element_factory_make('alsasink') - self.sink.set_property('sync', False) - #sink.set_property('latency-time', 20000) - #sink.set_property('buffer-time', 80000) + try: + self.sink = gst.parse_bin_from_description(gajim.config.get('audio_output_device'), True) + except: + self.session.connection.dispatch('ERROR', (_("Audio configuration error"), + _("Couldn't setup audio output. Check your audio configuration."))) - # TODO: use gconfaudiosrc? - src_mic = gst.element_factory_make('alsasrc') - src_mic.set_property('blocksize', 320) + 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 = gst.element_factory_make('volume') + self.mic_volume = src_bin.get_by_name('gajim_vol') self.mic_volume.set_property('volume', 1) # link gst elements - self.pipeline.add(self.sink, src_mic, self.mic_volume) - src_mic.link(self.mic_volume) + self.pipeline.add(self.sink, src_bin) - self.mic_volume.get_pad('src').link(self.p2psession.get_property( + src_bin.get_pad('src').link(self.p2psession.get_property( 'sink-pad')) self.p2pstream.connect('src-pad-added', self._on_src_pad_added) @@ -296,21 +288,27 @@ # sometimes, one window won't show up, # sometimes it'll freeze... JingleRTPContent.setup_stream(self) + # the local parts - src_vid = gst.element_factory_make('videotestsrc') - src_vid.set_property('is-live', True) - videoscale = gst.element_factory_make('videoscale') + try: + src_bin = gst.parse_bin_from_description(gajim.config.get('video_input_device'), True) + except: + 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')) - colorspace = gst.element_factory_make('ffmpegcolorspace') - self.pipeline.add(src_vid, videoscale, caps, colorspace) - gst.element_link_many(src_vid, videoscale, caps, colorspace) + self.pipeline.add(src_bin, caps) + src_bin.link(caps) - self.sink = gst.element_factory_make('xvimagesink') + try: + self.sink = gst.parse_bin_from_description(gajim.config.get('video_output_device'), True) + except: + self.session.connection.dispatch('ERROR', (_("Video configuration error"), + _("Couldn't setup video output. Check your video configuration."))) self.pipeline.add(self.sink) - colorspace.get_pad('src').link(self.p2psession.get_property('sink-pad')) + caps.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 14fd0305bce1 -r f07ebe7535c3 src/common/multimedia_helpers.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/multimedia_helpers.py Sun Nov 29 15:39:26 2009 +0100 @@ -0,0 +1,103 @@ +## +## Copyright (C) 2009 Thibaut GIRKA <thib AT sitedethib.com> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +import gst + + +class DeviceManager(object): + def __init__(self): + self.devices = {} + + def detect(self): + self.devices = {} + + def get_devices(self): + if not self.devices: + self.detect() + return self.devices + + def detect_element(self, name, text, pipe='%s'): + try: + element = gst.element_factory_make(name, '%spresencetest' % name) + if isinstance(element, gst.interfaces.PropertyProbe): + element.set_state(gst.STATE_READY) + devices = element.probe_get_values_name('device') + if devices: + self.devices[text % _(' Default device')] = pipe % name + for device in devices: + element.set_property('device', device) + device_name = element.get_property('device-name') + self.devices[text % device_name] = pipe % '%s device=%s' % (name, device) + element.set_state(gst.STATE_NULL) + else: + self.devices[text] = pipe % name + except gst.ElementNotFoundError: + print 'element \'%s\' not found' % name + + +class AudioInputManager(DeviceManager): + def detect(self): + self.devices = {} + # Test src + self.detect_element('audiotestsrc', _('Audio test'), + '%s is-live=true name=gajim_vol') + # Auto src + self.detect_element('autoaudiosrc', _('Autodetect'), + '%s ! volume name=gajim_vol') + # Alsa src + self.detect_element('alsasrc', _('ALSA: %s'), + '%s ! volume name=gajim_vol') + + +class AudioOutputManager(DeviceManager): + def detect(self): + self.devices = {} + # Fake sink + self.detect_element('fakesink', _('Fake audio output')) + # Auto sink + self.detect_element('autoaudiosink', _('Autodetect')) + # Alsa sink + self.detect_element('alsasink', _('ALSA: %s'), + '%s sync=false') + + +class VideoInputManager(DeviceManager): + def detect(self): + self.devices = {} + # Test src + self.detect_element('videotestsrc', _('Video test'), + '%s is-live=true') + # Auto src + self.detect_element('autovideosrc', _('Autodetect'), + '%s ! videoscale ! ffmpegcolorspace') + # V4L2 src ; TODO: Figure out why it doesn't work + self.detect_element('v4l2src', _('V4L2: %s'), + '%s ! videoscale ! ffmpegcolorspace') + # Funny things, just to test... + # self.devices['GOOM'] = 'audiotestsrc ! goom' + # self.devices['screen'] = 'ximagesrc' + + +class VideoOutputManager(DeviceManager): + def detect(self): + self.devices = {} + # Fake video output + self.detect_element('fakesink', _('Fake audio output')) + # Auto sink + self.detect_element('autovideosink', _('Autodetect')) + # xvimage sink + self.detect_element('xvimagesink', _('X Window System (X11/XShm/Xv): %s')) + # ximagesink + self.detect_element('ximagesink', _('X Window System (without Xv)')) + + diff -r 14fd0305bce1 -r f07ebe7535c3 src/config.py --- a/src/config.py Sun Nov 29 14:17:03 2009 +0100 +++ b/src/config.py Sun Nov 29 15:39:26 2009 +0100 @@ -59,6 +59,8 @@ from common import dataforms from common import GnuPG +from common.multimedia_helpers import AudioInputManager, AudioOutputManager, VideoInputManager, VideoOutputManager + from common.exceptions import GajimGeneralException #---------- PreferencesWindow class -------------# @@ -429,10 +431,10 @@ if gajim.config.get(opt_name + '_device') == value: combobox.set_active(index) - create_av_combobox('audio_input', {'test': 'test'}) - create_av_combobox('audio_output', {'test': 'test'}) - create_av_combobox('video_input', {'test': 'test'}) - create_av_combobox('video_output', {'test': 'test'}) + 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()) ### Advanced tab ### # open links with if os.name == 'nt':

1 0

gajim: fix default audio_input_device
by Yann Leboulanger 29 Nov '09

29 Nov '09

changeset 14fd0305bce1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=14fd0305bce1 description: fix default audio_input_device diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 742e75e73ede -r 14fd0305bce1 src/common/config.py --- a/src/common/config.py Sun Nov 29 14:15:25 2009 +0100 +++ b/src/common/config.py Sun Nov 29 14:17:03 2009 +0100 @@ -272,7 +272,7 @@ 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], - 'audio_input_device': [opt_str, 'autoaudiosrc volume name=gajim_vol'], + 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'], 'video_output_device': [opt_str, 'autovideosink'],

1 0

gajim: set default values to audio/video input/output devices
by Yann Leboulanger 29 Nov '09

29 Nov '09

changeset 742e75e73ede in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=742e75e73ede description: set default values to audio/video input/output devices diffstat: src/common/config.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (18 lines): diff -r e99f0b7e2cf8 -r 742e75e73ede src/common/config.py --- a/src/common/config.py Sat Nov 28 12:54:44 2009 +0100 +++ b/src/common/config.py Sun Nov 29 14:15:25 2009 +0100 @@ -272,10 +272,10 @@ 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], - 'audio_input_device': [opt_str, ''], - 'audio_output_device': [opt_str, ''], - 'video_input_device': [opt_str, ''], - 'video_output_device': [opt_str, ''], + 'audio_input_device': [opt_str, 'autoaudiosrc volume name=gajim_vol'], + 'audio_output_device': [opt_str, 'autoaudiosink'], + 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'], + 'video_output_device': [opt_str, 'autovideosink'], } __options_per_key = {

1 0

gajim: Added tag gajim-0.13.1 for changeset 931c9d87d9bc
by Yann Leboulanger 28 Nov '09

28 Nov '09

changeset 01fe13c2c56d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=01fe13c2c56d description: Added tag gajim-0.13.1 for changeset 931c9d87d9bc diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 931c9d87d9bc -r 01fe13c2c56d .hgtags --- a/.hgtags Sat Nov 28 21:10:15 2009 +0100 +++ b/.hgtags Sat Nov 28 23:12:48 2009 +0100 @@ -4,3 +4,4 @@ 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 22259190dc0f8edb99345e49ef8f0af95693a64c gajim-0.13 +931c9d87d9bc076b1ad940d132b6aaa1f4ba7ee1 gajim-0.13.1

1 0

gajim-website: prepare website for 0.13.1 release
by Yann Leboulanger 28 Nov '09

28 Nov '09

changeset ae997cef8b05 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=ae997cef8b05 description: prepare website for 0.13.1 release diffstat: downloads.php | 6 +- index.php | 54 ++++++++++++++++----------- locale/bg_BG/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/de_DE/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/eo/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/es_ES/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/fr_FR/LC_MESSAGES/msg.po | 73 +++++++++++++++++++++--------------- locale/it_IT/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/pl_PL/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/pt_BR/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ locale/ru_RU/LC_MESSAGES/msg.po | 68 +++++++++++++++++++++------------ msg.pot | 67 +++++++++++++++++++++------------ 12 files changed, 463 insertions(+), 281 deletions(-) diffs (truncated from 1822 to 300 lines): diff -r c526a3b645e0 -r ae997cef8b05 downloads.php --- a/downloads.php Tue Nov 24 22:26:05 2009 +0100 +++ b/downloads.php Sat Nov 28 23:07:42 2009 +0100 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); print (" \n"); -print _(" Latest version of Gajim is")." 0.13 \n"; +print _(" Latest version of Gajim is")." 0.13.1 \n"; #printf(_(" A %s version is in test"), "0.13-rc5"); print (" \n"); print _("If your distribution doesn't have the latest version "); @@ -138,7 +138,7 @@ print _(" Windows installer\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" There is a ")." <a href=\"downloads/0.13/gajim-0.13-1.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/0.13/gajim-0.13.1-1.exe\">"._("Gajim installer")."</a>.\n"; print (" \n"); #print _(" Here is a")." <a href=\"downloads/0.13/gajim-0.13-rc5.exe\">"._("Gajim installer")."</a> "; #printf(_("for %s version "), "0.13-rc5"); @@ -151,7 +151,7 @@ print _(" Source\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" The tarball version of Gajim is ")."<a href=\"downloads/0.13/gajim-0.13.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/1001e93ec906/README.html\">see the <tt>README</tt></a> ("._("in English")."). \n"; +print _(" The tarball version of Gajim is ")."<a href=\"downloads/0.13/gajim-0.13.1.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/1001e93ec906/README.html\">see the <tt>README</tt></a> ("._("in English")."). \n"; #printf(_(" The tarball version of %s is "), "0.13-rc5"); #print "<a href=\"downloads/0.13/gajim-0.13.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n"); diff -r c526a3b645e0 -r ae997cef8b05 index.php --- a/index.php Tue Nov 24 22:26:05 2009 +0100 +++ b/index.php Sat Nov 28 23:07:42 2009 +0100 @@ -48,55 +48,65 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.13"), - 1 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), - 2 => sprintf(_("Release candidate 4 of Gajim %s"), "0.13"), - 3 => sprintf(_("Release candidate 1 of Gajim %s"), "0.13"), - 4 => sprintf(_("Gajim %s is here!"), "0.12.5")); + 0 => sprintf(_("Gajim %s is here!"), "0.13.1"), + 1 => sprintf(_("Gajim %s is here!"), "0.13"), + 2 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), + 3 => sprintf(_("Release candidate 4 of Gajim %s"), "0.13"), + 4 => sprintf(_("Release candidate 1 of Gajim %s"), "0.13"), + 5 => sprintf(_("Gajim %s is here!"), "0.12.5")); // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("23 November 2009"), - 1 => _("7 November 2009"), - 2 => _("4 November 2009"), - 3 => _("3 November 2009"), - 4 => _("08 August 2009")); + 0 => _("28 November 2009"), + 1 => _("23 November 2009"), + 2 => _("7 November 2009"), + 3 => _("4 November 2009"), + 4 => _("3 November 2009"), + 5 => _("08 August 2009")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.13"), - 1 => sprintf(_("Version %s will arrive soon."), "0.13"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.13.1"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.13"), 2 => sprintf(_("Version %s will arrive soon."), "0.13"), 3 => sprintf(_("Version %s will arrive soon."), "0.13"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.12.5")); + 4 => sprintf(_("Version %s will arrive soon."), "0.13"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.12.5")); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.13-rc5"), - 1 => sprintf(_("What's new since %s:"), "0.13-rc4"), - 2 => sprintf(_("What's new since %s:"), "0.13-rc1"), - 3 => sprintf(_("What's new since %s:"), "0.12.5"), - 4 => sprintf(_("What's new since %s:"), "0.12.4")); + 0 => sprintf(_("What's new since %s:"), "0.13"), + 1 => sprintf(_("What's new since %s:"), "0.13-rc5"), + 2 => sprintf(_("What's new since %s:"), "0.13-rc4"), + 3 => sprintf(_("What's new since %s:"), "0.13-rc1"), + 4 => sprintf(_("What's new since %s:"), "0.12.5"), + 5 => sprintf(_("What's new since %s:"), "0.12.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Fix a bug when no account exists and bonjour is not available"), + 1 => _("Fix a bug when opening advanced option in MUC"), + 2 => _("Fix a bug when using non-BOSH proxies"), + ); + +$array_news_items[1] = array( 0 => _("Fix more BOSH bugs"), ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Fix BOSH connection with ejabberd server"), 1 => _("Fix self contact behaviour with anonymous connection"), 2 => _("Fix chatting with invisible contacts"), ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix BOSH URI parsing when port is not provided"), 1 => _("Fix windows version (we were using a function not available under PyGTK 2.12.1)"), ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("BOSH connection support"), 1 => _("Roster versioning support"), 2 => _("Interface to send XHTML messages"), @@ -104,7 +114,7 @@ 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.13\">"._("List of fixed bugs")."</a>", ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Don't depend on GTK 2.14"), ); diff -r c526a3b645e0 -r ae997cef8b05 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Tue Nov 24 22:26:05 2009 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sat Nov 28 23:07:42 2009 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-24 22:17+0100\n" +"POT-Creation-Date: 2009-11-28 23:03+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -735,113 +735,131 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:51 index.php:55 +#: index.php:51 index.php:52 index.php:56 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:52 +#: index.php:53 #, fuzzy, c-format msgid "Release candidate 5 of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:53 +#: index.php:54 #, fuzzy, c-format msgid "Release candidate 4 of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:54 +#: index.php:55 #, fuzzy, c-format msgid "Release candidate 1 of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:60 +#: index.php:61 +#, fuzzy +msgid "28 November 2009" +msgstr "19 декември 2006 г." + +#: index.php:62 #, fuzzy msgid "23 November 2009" msgstr "19 декември 2006 г." -#: index.php:61 +#: index.php:63 #, fuzzy msgid "7 November 2009" msgstr "19 декември 2006 г." -#: index.php:62 +#: index.php:64 #, fuzzy msgid "4 November 2009" msgstr "19 декември 2006 г." -#: index.php:63 +#: index.php:65 #, fuzzy msgid "3 November 2009" msgstr "19 декември 2006 г." -#: index.php:64 +#: index.php:66 msgid "08 August 2009" msgstr "" -#: index.php:67 index.php:71 +#: index.php:69 index.php:70 index.php:74 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:68 index.php:69 index.php:70 +#: index.php:71 index.php:72 index.php:73 #, fuzzy, c-format msgid "Version %s will arrive soon." msgstr "Скоро ще излезе версия 0.11.1." -#: index.php:77 index.php:78 index.php:79 index.php:80 index.php:81 +#: index.php:80 index.php:81 index.php:82 index.php:83 index.php:84 +#: index.php:85 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:85 +#: index.php:89 +msgid "Fix a bug when no account exists and bonjour is not available" +msgstr "" + +#: index.php:90 +msgid "Fix a bug when opening advanced option in MUC" +msgstr "" + +#: index.php:91 +msgid "Fix a bug when using non-BOSH proxies" +msgstr "" + +#: index.php:95 msgid "Fix more BOSH bugs" msgstr "" -#: index.php:89 +#: index.php:99 msgid "Fix BOSH connection with ejabberd server" msgstr "" -#: index.php:90 +#: index.php:100 msgid "Fix self contact behaviour with anonymous connection" msgstr "" -#: index.php:91 +#: index.php:101 msgid "Fix chatting with invisible contacts" msgstr "" -#: index.php:95 +#: index.php:105 msgid "Fix BOSH URI parsing when port is not provided" msgstr "" -#: index.php:96 +#: index.php:106 msgid "" "Fix windows version (we were using a function not available under PyGTK " "2.12.1)" msgstr "" -#: index.php:100 +#: index.php:110 msgid "BOSH connection support" msgstr "" -#: index.php:101 +#: index.php:111 #, fuzzy msgid "Roster versioning support" msgstr "Поддръжка за набори ключове на GNOME" -#: index.php:102 +#: index.php:112 msgid "Interface to send XHTML messages" msgstr "" -#: index.php:103 +#: index.php:113 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:104 +#: index.php:114 msgid "List of fixed bugs" msgstr "" -#: index.php:108 +#: index.php:118 msgid "Don't depend on GTK 2.14" msgstr "" diff -r c526a3b645e0 -r ae997cef8b05 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Tue Nov 24 22:26:05 2009 +0100 +++ b/locale/de_DE/LC_MESSAGES/msg.po Sat Nov 28 23:07:42 2009 +0100

1 0

gajim: prepare 0.13.1 release
by Yann Leboulanger 28 Nov '09

28 Nov '09

changeset 931c9d87d9bc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=931c9d87d9bc description: prepare 0.13.1 release diffstat: ChangeLog | 6 ++++++ configure.ac | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diffs (59 lines): diff -r 779b74ba4bab -r 931c9d87d9bc ChangeLog --- a/ChangeLog Thu Nov 26 23:00:57 2009 +0100 +++ b/ChangeLog Sat Nov 28 21:10:15 2009 +0100 @@ -1,3 +1,9 @@ +Gajim 0.13.1 ((28 November 2009) + + * Fix a bug when no account exists and bonjour is not available + * Fix a bug when opening advanced option in MUC + * Fix a bug when using non-BOSH proxies + Gajim 0.13 (24 November 2009) * Improve gtkspell (fix memleak) diff -r 779b74ba4bab -r 931c9d87d9bc configure.ac --- a/configure.ac Thu Nov 26 23:00:57 2009 +0100 +++ b/configure.ac Sat Nov 28 21:10:15 2009 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13],[http://trac.gajim.org/],[gajim]) + [0.13.1],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 779b74ba4bab -r 931c9d87d9bc gajim.nsi --- a/gajim.nsi Thu Nov 26 23:00:57 2009 +0100 +++ b/gajim.nsi Sat Nov 28 21:10:15 2009 +0100 @@ -189,7 +189,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.13" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.13.1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 779b74ba4bab -r 931c9d87d9bc setup_win32.py --- a/setup_win32.py Thu Nov 26 23:00:57 2009 +0100 +++ b/setup_win32.py Sat Nov 28 21:10:15 2009 +0100 @@ -72,7 +72,7 @@ setup( name = 'Gajim', - version = '0.13', + version = '0.13.1', description = 'A full featured Jabber client', author = 'Gajim Development Team', url = 'http://www.gajim.org/', diff -r 779b74ba4bab -r 931c9d87d9bc src/common/defs.py --- a/src/common/defs.py Thu Nov 26 23:00:57 2009 +0100 +++ b/src/common/defs.py Sat Nov 28 21:10:15 2009 +0100 @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.13' +version = '0.13.1' import sys, os.path for base in ('.', 'common'):

1 0

gajim: autotools: add --enable-site-packages option
by Bruno Tarquini 28 Nov '09

28 Nov '09

changeset e99f0b7e2cf8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e99f0b7e2cf8 description: autotools: add --enable-site-packages option This option allows the installation of pyfiles in PYTHON/site-packages/gajim instead of DATADIR/gajim/src which is a quality policy for some distributions. diffstat: configure.ac | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diffs (22 lines): diff -r aaf158c0b748 -r e99f0b7e2cf8 configure.ac --- a/configure.ac Sat Nov 28 12:54:41 2009 +0100 +++ b/configure.ac Sat Nov 28 12:54:44 2009 +0100 @@ -56,7 +56,18 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AC_SUBST([PYTHON_INCLUDES]) +dnl **** +dnl enable installation in python-2.x/site-packages/gajim +dnl **** +AC_ARG_ENABLE(site-packages, + [AS_HELP_STRING([--enable-site-packages], + [install gajim sources in PYTHONDIR/site-packages/gajim +instead of DATADIR/gajim/src.])] +, +AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) +, AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +) AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")

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