Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: Fix Send Custom Status menuitem (roster contact menu)
by Denis Fomin 11 Aug '13

11 Aug '13

changeset fee8629b33a3 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=fee8629b33a3 description: Fix Send Custom Status menuitem (roster contact menu) diffstat: src/gui_menu_builder.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 612b05c8ccf0 -r fee8629b33a3 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Aug 08 01:07:10 2013 +0400 +++ b/src/gui_menu_builder.py Thu Aug 08 23:53:21 2013 +0400 @@ -367,7 +367,8 @@ if helpers.group_is_blocked(account, group): blocked = True break - if gajim.get_transport_name_from_jid(jid, use_config_setting=False): + transport = gajim.get_transport_name_from_jid(jid, use_config_setting=False) + if transport and transport != 'jabber': # Transport contact, send custom status unavailable send_custom_status_menuitem.set_sensitive(False) elif blocked:

1 0

gajim: [Darlan] Present JID LTR in tooltip. Fixes #7402
by Denis Fomin 11 Aug '13

11 Aug '13

changeset eed8e16e085d in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=eed8e16e085d description: [Darlan] Present JID LTR in tooltip. Fixes #7402 diffstat: src/tooltips.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (23 lines): diff -r fee8629b33a3 -r eed8e16e085d src/tooltips.py --- a/src/tooltips.py Thu Aug 08 23:53:21 2013 +0400 +++ b/src/tooltips.py Fri Aug 09 22:24:58 2013 +0400 @@ -374,7 +374,8 @@ properties.append((show, None)) if contact.jid.strip(): - properties.append((_('Jabber ID: '), "%s" % contact.jid)) + properties.append((_('Jabber ID: '), u'\u200E' + "%s" % \ + contact.jid)) if hasattr(contact, 'resource') and contact.resource.strip(): properties.append((_('Resource: '), GLib.markup_escape_text( @@ -591,7 +592,8 @@ self._append_pep_info(contact, properties) - properties.append((_('Jabber ID: '), "%s" % prim_contact.jid)) + properties.append((_('Jabber ID: '), u'\u200E' + "%s" % \ + prim_contact.jid)) # contact has only one ressource if num_resources == 1 and contact.resource:

1 0

gajim: u'' -> ''
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset 4b2cb3af5651 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4b2cb3af5651 description: u'' -> '' diffstat: src/tooltips.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r eed8e16e085d -r 4b2cb3af5651 src/tooltips.py --- a/src/tooltips.py Fri Aug 09 22:24:58 2013 +0400 +++ b/src/tooltips.py Sun Aug 11 14:51:25 2013 +0200 @@ -374,7 +374,7 @@ properties.append((show, None)) if contact.jid.strip(): - properties.append((_('Jabber ID: '), u'\u200E' + "%s" % \ + properties.append((_('Jabber ID: '), '\u200E' + "%s" % \ contact.jid)) if hasattr(contact, 'resource') and contact.resource.strip(): @@ -592,7 +592,7 @@ self._append_pep_info(contact, properties) - properties.append((_('Jabber ID: '), u'\u200E' + "%s" % \ + properties.append((_('Jabber ID: '), '\u200E' + "%s" % \ prim_contact.jid)) # contact has only one ressource

1 0

gajim: Set title for InvitationReceivedDialog. Fixes #7383
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 5e18096e6ec4 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5e18096e6ec4 description: Set title for InvitationReceivedDialog. Fixes #7383 diffstat: src/dialogs.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 4b2cb3af5651 -r 5e18096e6ec4 src/dialogs.py --- a/src/dialogs.py Sun Aug 11 14:51:25 2013 +0200 +++ b/src/dialogs.py Sat Aug 10 23:39:35 2013 +0400 @@ -4635,8 +4635,10 @@ gajim.connections[account].decline_invitation(self.room_jid, self.contact_fjid, text) - YesNoDialog(pritext, sectext, text_label=_('Reason (if you decline):'), - on_response_yes=on_yes, on_response_no=on_no) + dlg = YesNoDialog(pritext, sectext, + text_label=_('Reason (if you decline):'), on_response_yes=on_yes, + on_response_no=on_no) + dlg.set_title(_('Groupchat Invitation')) class ProgressDialog: def __init__(self, title_text, during_text, messages_queue):

1 0

gajim: [Darlan]distinguish console-printed strings in translatio...
by Denis Fomin 11 Aug '13

11 Aug '13

changeset c7cdcf00413c in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c7cdcf00413c description: [Darlan]distinguish console-printed strings in translation files. Fixes #7267 diffstat: src/gajim-remote.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5e18096e6ec4 -r c7cdcf00413c src/gajim-remote.py --- a/src/gajim-remote.py Sat Aug 10 23:39:35 2013 +0400 +++ b/src/gajim-remote.py Sun Aug 11 14:09:47 2013 +0400 @@ -277,7 +277,7 @@ 'handle_uri': [ _('Handle a xmpp:/ uri'), [ - (_('uri'), _('URI to handle'), True), + (Q_('?CLI:uri'), _('URI to handle'), True), (Q_('?CLI:account'), _('Account in which you want to handle it'), False), (Q_('?CLI:message'), _('Message content'), False)

1 0

gajim: don't try to get xid of a non-existing window
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset 97a7ab5b200f in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=97a7ab5b200f description: don't try to get xid of a non-existing window diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 79d286009241 -r 97a7ab5b200f src/dialogs.py --- a/src/dialogs.py Thu Aug 01 15:54:07 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200 @@ -5361,11 +5361,11 @@ video_hbox.show_all() in_xid = ctrl.xml.get_object('incoming_drawingarea').\ get_window().xid - out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ - get_window().xid content = session.get_content('video') # move outgoing stream to chat window if gajim.config.get('video_see_self'): + out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ + get_window().xid b = content.pipeline.get_by_name('bin2') c = b.get_by_name('autovideosink0') d = c.get_by_name('autovideosink0-actual-sink-xvimage')

1 0

gajim: better way to set outgoing video in chat window
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset 5dee103853a7 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5dee103853a7 description: better way to set outgoing video in chat window diffstat: src/chat_control.py | 8 ++++++-- src/dialogs.py | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diffs (46 lines): diff -r 97a7ab5b200f -r 5dee103853a7 src/chat_control.py --- a/src/chat_control.py Wed Jul 31 18:22:55 2013 +0200 +++ b/src/chat_control.py Wed Jul 31 19:15:42 2013 +0200 @@ -2271,9 +2271,13 @@ if gajim.config.get('video_see_self'): fixed = self.xml.get_object('outgoing_fixed') fixed.set_no_show_all(False) + video_hbox.show_all() + out_xid = self.xml.get_object( + 'outgoing_drawingarea').get_window().xid + else: + out_xid = None video_hbox.show_all() - in_xid = self.xml.get_object('incoming_drawingarea').window.xid - out_xid = self.xml.get_object('outgoing_drawingarea').window.xid + in_xid = self.xml.get_object('incoming_drawingarea').get_window().xid sid = gajim.connections[self.account].start_video( self.contact.get_full_jid(), in_xid, out_xid) else: diff -r 97a7ab5b200f -r 5dee103853a7 src/dialogs.py --- a/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 19:15:42 2013 +0200 @@ -5366,11 +5366,18 @@ if gajim.config.get('video_see_self'): out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ get_window().xid - b = content.pipeline.get_by_name('bin2') - c = b.get_by_name('autovideosink0') - d = c.get_by_name('autovideosink0-actual-sink-xvimage') - d.set_xwindow_id(out_xid) - content.out_xid = out_xid + b = content.src_bin + found = False + for e in b.elements(): + if e.get_name().startswith('autovideosink'): + found = True + break + if found: + found = False + for f in e.elements(): + if f.get_name().startswith('autovideosink'): + f.set_xwindow_id(out_xid) + content.out_xid = out_xid content.in_xid = in_xid ctrl.set_video_state('connecting', self.sid) # Now, accept the content/sessions.

1 0

gajim: always present room JID LTR. Fixes #7402
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset 655f0501f323 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=655f0501f323 description: always present room JID LTR. Fixes #7402 diffstat: src/common/i18n.py | 2 +- src/groupchat_control.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diffs (47 lines): diff -r 5dee103853a7 -r 655f0501f323 src/common/i18n.py --- a/src/common/i18n.py Wed Jul 31 19:15:42 2013 +0200 +++ b/src/common/i18n.py Thu Aug 01 19:05:00 2013 +0200 @@ -28,7 +28,7 @@ import unicodedata # May be changed after GTK is imported -direction_mark = '\u200F' +direction_mark = '\u200E' def paragraph_direction_mark(text): """ diff -r 5dee103853a7 -r 655f0501f323 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jul 31 19:15:42 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 01 19:05:00 2013 +0200 @@ -242,7 +242,8 @@ _('Sending private message failed'), #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' - '"%(nick)s" has left.') % {'room': room, 'nick': nick}) + '"%(nick)s" has left.') % {'room': u'\u200E' + room, + 'nick': nick}) return ChatControl.send_message(self, message, xhtml=xhtml, @@ -790,7 +791,7 @@ name = self.get_continued_conversation_name() else: name = self.room_jid - text = '%s' % (font_attrs, name) + text = '%s' % (font_attrs, u'\u200E' + name) self.name_label.set_markup(text) if self.subject: @@ -2198,9 +2199,9 @@ reason, jid) # Ask for a reason - dialogs.DoubleInputDialog(_('Destroying %s') % self.room_jid, - _('You are going to definitively destroy this room.\n' - 'You may specify a reason below:'), + dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ + self.room_jid, _('You are going to definitively destroy this \ + room.\nYou may specify a reason below:'), _('You may also enter an alternate venue:'), ok_handler=on_ok) def _on_bookmark_room_menuitem_activate(self, widget):

1 0

gajim: u'' -> ''
by Yann Leboulanger 11 Aug '13

11 Aug '13

changeset c54f6c54987b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c54f6c54987b description: u'' -> '' diffstat: src/groupchat_control.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 655f0501f323 -r c54f6c54987b src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 01 19:05:00 2013 +0200 +++ b/src/groupchat_control.py Sun Aug 11 14:44:46 2013 +0200 @@ -242,7 +242,7 @@ _('Sending private message failed'), #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' - '"%(nick)s" has left.') % {'room': u'\u200E' + room, + '"%(nick)s" has left.') % {'room': '\u200E' + room, 'nick': nick}) return @@ -791,7 +791,7 @@ name = self.get_continued_conversation_name() else: name = self.room_jid - text = '%s' % (font_attrs, u'\u200E' + name) + text = '%s' % (font_attrs, '\u200E' + name) self.name_label.set_markup(text) if self.subject: @@ -2199,7 +2199,7 @@ reason, jid) # Ask for a reason - dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ + dialogs.DoubleInputDialog(_('Destroying %s') % '\u200E' + \ self.room_jid, _('You are going to definitively destroy this \ room.\nYou may specify a reason below:'), _('You may also enter an alternate venue:'), ok_handler=on_ok)

1 0

gajim: [Darlan]distinguish console-printed strings in translatio...
by Denis Fomin 11 Aug '13

11 Aug '13

changeset 545ee062fdcf in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=545ee062fdcf description: [Darlan]distinguish console-printed strings in translation files. Fixes #7267 diffstat: src/gajim-remote.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 9bdec43e6c95 -r 545ee062fdcf src/gajim-remote.py --- a/src/gajim-remote.py Sat Aug 10 23:39:35 2013 +0400 +++ b/src/gajim-remote.py Sun Aug 11 14:09:47 2013 +0400 @@ -277,7 +277,7 @@ 'handle_uri': [ _('Handle a xmpp:/ uri'), [ - (_('uri'), _('URI to handle'), True), + (Q_('?CLI:uri'), _('URI to handle'), True), (Q_('?CLI:account'), _('Account in which you want to handle it'), False), (Q_('?CLI:message'), _('Message content'), False)

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 August 2013