Commits

commits@gajim.org

17632 discussions

gajim: use correct translation function. Fixes #7267
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset a1e08b3453de in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a1e08b3453de description: use correct translation function. Fixes #7267 diffstat: src/gajim-remote.py | 53 +++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diffs (171 lines): diff -r 574655470339 -r a1e08b3453de src/gajim-remote.py --- a/src/gajim-remote.py Thu Jul 25 08:54:35 2013 +0200 +++ b/src/gajim-remote.py Thu Jul 25 19:03:43 2013 +0200 @@ -34,6 +34,7 @@ from common import exceptions from common import i18n # This installs _() function +from common.i18n import Q_ try: PREFERRED_ENCODING = locale.getpreferredencoding() @@ -93,7 +94,7 @@ _('Prints a list of all contacts in the roster. Each contact ' 'appears on a separate line'), [ - (_('?CLI:account'), _('show only contacts of the given account'), + (Q_('?CLI:account'), _('show only contacts of the given account'), False) ] @@ -106,9 +107,9 @@ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('?CLI:status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), - (_('?CLI:message'), _('status message'), False), - (_('?CLI:account'), _('change status of account "account". ' + (Q_('?CLI:status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), + (Q_('?CLI:message'), _('status message'), False), + (Q_('?CLI:account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' '"sync with global status" option set'), False) ] @@ -116,9 +117,9 @@ 'set_priority': [ _('Changes the priority of account or accounts'), [ - (_('?CLI:priority'), _('priority you want to give to the account'), + (Q_('?CLI:priority'), _('priority you want to give to the account'), True), - (_('?CLI:account'), _('change the priority of the given account. ' + (Q_('?CLI:account'), _('change the priority of the given account. ' 'If not specified, change status of all accounts that have' ' "sync with global status" option set'), False) ] @@ -128,9 +129,9 @@ [ ('jid', _('JID of the contact that you want to chat with'), True), - (_('?CLI:account'), _('if specified, contact is taken from the ' + (Q_('?CLI:account'), _('if specified, contact is taken from the ' 'contact list of this account'), False), - (_('?CLI:message'), + (Q_('?CLI:message'), _('message content. The account must be specified or ""'), False) ] @@ -141,10 +142,10 @@ 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), - (_('?CLI:message'), _('message contents'), True), + (Q_('?CLI:message'), _('message contents'), True), (_('pgp key'), _('if specified, the message will be encrypted ' 'using this public key'), False), - (_('?CLI:account'), _('if specified, the message will be sent ' + (Q_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -155,10 +156,10 @@ [ ('jid', _('JID of the contact that will receive the message'), True), (_('subject'), _('message subject'), True), - (_('?CLI:message'), _('message contents'), True), + (Q_('?CLI:message'), _('message contents'), True), (_('pgp key'), _('if specified, the message will be encrypted ' 'using this public key'), False), - (_('?CLI:account'), _('if specified, the message will be sent ' + (Q_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -166,8 +167,8 @@ _('Sends new message to a groupchat you\'ve joined.'), [ ('room_jid', _('JID of the room that will receive the message'), True), - (_('?CLI:message'), _('message contents'), True), - (_('?CLI:account'), _('if specified, the message will be sent ' + (Q_('?CLI:message'), _('message contents'), True), + (Q_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -188,7 +189,7 @@ [ (_('file'), _('File path'), True), ('jid', _('JID of the contact'), True), - (_('?CLI:account'), _('if specified, file will be sent using this ' + (Q_('?CLI:account'), _('if specified, file will be sent using this ' 'account'), False) ] ], @@ -218,7 +219,7 @@ _('Removes contact from roster'), [ ('jid', _('JID of the contact'), True), - (_('?CLI:account'), _('if specified, contact is taken from the ' + (Q_('?CLI:account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) ] @@ -227,21 +228,21 @@ _('Adds contact to roster'), [ (_('jid'), _('JID of the contact'), True), - (_('?CLI:account'), _('Adds new contact to this account'), False) + (Q_('?CLI:account'), _('Adds new contact to this account'), False) ] ], 'get_status': [ _('Returns current status (the global one unless account is specified)'), [ - (_('?CLI:account'), '', False) + (Q_('?CLI:account'), '', False) ] ], 'get_status_message': [ _('Returns current status message (the global one unless account is specified)'), [ - (_('?CLI:account'), '', False) + (Q_('?CLI:account'), '', False) ] ], @@ -252,7 +253,7 @@ 'start_chat': [ _('Opens \'Start Chat\' dialog'), [ - (_('?CLI:account'), _('Starts chat, using this account'), True) + (Q_('?CLI:account'), _('Starts chat, using this account'), True) ] ], 'send_xml': [ @@ -277,18 +278,18 @@ _('Handle a xmpp:/ uri'), [ (_('uri'), _('URI to handle'), True), - (_('?CLI:account'), _('Account in which you want to handle it'), + (Q_('?CLI:account'), _('Account in which you want to handle it'), False), - (_('?CLI:message'), _('Message content'), False) + (Q_('?CLI:message'), _('Message content'), False) ] ], 'join_room': [ _('Join a MUC room'), [ - (_('?CLI:room'), _('Room JID'), True), - (_('?CLI:nick'), _('Nickname to use'), False), - (_('?CLI:password'), _('Password to enter the room'), False), - (_('?CLI:account'), _('Account from which you want to enter the ' + (Q_('?CLI:room'), _('Room JID'), True), + (Q_('?CLI:nick'), _('Nickname to use'), False), + (Q_('?CLI:password'), _('Password to enter the room'), False), + (Q_('?CLI:account'), _('Account from which you want to enter the ' 'room'), False) ] ],

1 0

gajim: [Darlan & I]Improved BiDi support for banner text, popup ...
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 042588d50ebc in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=042588d50ebc description: [Darlan & I]Improved BiDi support for banner text, popup with presence info and more status messages (kick, ban, change nick) fixes #7284 #7192 diffstat: src/chat_control.py | 23 +++++++++++++---------- src/common/connection_handlers_events.py | 13 ++++++------- src/common/i18n.py | 3 +++ src/conversation_textview.py | 5 +---- src/gajim.py | 2 ++ src/groupchat_control.py | 22 ++++++++++++---------- 6 files changed, 37 insertions(+), 31 deletions(-) diffs (230 lines): diff -r 12dfe168f7fc -r 042588d50ebc src/chat_control.py --- a/src/chat_control.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/chat_control.py Tue Jul 23 17:55:24 2013 +0400 @@ -46,6 +46,7 @@ from common import helpers from common import exceptions from common import ged +from common import i18n from message_control import MessageControl from conversation_textview import ConversationTextview from message_textview import MessageTextView @@ -2154,9 +2155,10 @@ if self.resource: name += '/' + self.resource if self.TYPE_ID == message_control.TYPE_PM: - name = _('%(nickname)s from group chat %(room_name)s') %\ - {'nickname': name, 'room_name': self.room_name} - name = GObject.markup_escape_text(name) + name = i18n.direction_mark + _( + '%(nickname)s from group chat %(room_name)s') % \ + {'nickname': name, 'room_name': self.room_name} + name = i18n.direction_mark + GObject.markup_escape_text(name) # We know our contacts nick, but if another contact has the same nick # in another account we need to also display the account. @@ -2169,10 +2171,11 @@ break for jid in gajim.contacts.get_jid_list(account): other_contact_ = \ - gajim.contacts.get_first_contact_from_jid(account, jid) - if other_contact_.get_shown_name() == self.contact.get_shown_name(): - acct_info = ' (%s)' % \ - GObject.markup_escape_text(self.account) + gajim.contacts.get_first_contact_from_jid(account, jid) + if other_contact_.get_shown_name() == \ + self.contact.get_shown_name(): + acct_info = i18n.direction_mark + ' (%s)' % \ + GObject.markup_escape_text(self.account) break status = contact.status @@ -2196,16 +2199,16 @@ chatstate = '' label_text = '%s%s %s' \ - % (font_attrs, name, font_attrs_small, acct_info, chatstate) + % (font_attrs, name, font_attrs_small, acct_info, chatstate) if acct_info: - acct_info = ' ' + acct_info + acct_info = i18n.direction_mark + ' ' + acct_info label_tooltip = '%s%s %s' % (name, acct_info, chatstate) else: # weight="heavy" size="x-large" label_text = '%s%s' % \ (font_attrs, name, font_attrs_small, acct_info) if acct_info: - acct_info = ' ' + acct_info + acct_info = i18n.direction_mark + ' ' + acct_info label_tooltip = '%s%s' % (name, acct_info) if status_escaped: diff -r 12dfe168f7fc -r 042588d50ebc src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 23 17:55:24 2013 +0400 @@ -29,6 +29,7 @@ from common import nec from common import helpers from common import gajim +from common import i18n import nbxmpp from common import dataforms from common import exceptions @@ -2368,25 +2369,23 @@ self.popup_timeout = gajim.config.get('notification_timeout') + nick = i18n.direction_mark + gajim.get_name_from_jid(account, self.jid) if event == 'status_change': self.popup_title = _('%(nick)s Changed Status') % \ - {'nick': gajim.get_name_from_jid(account, self.jid)} + {'nick': nick} self.popup_text = _('%(nick)s is now %(status)s') % \ - {'nick': gajim.get_name_from_jid(account, self.jid),\ - 'status': helpers.get_uf_show(pres_obj.show)} + {'nick': nick, 'status': helpers.get_uf_show(pres_obj.show)} if pres_obj.status: self.popup_text = self.popup_text + " : " + pres_obj.status self.popup_event_type = _('Contact Changed Status') elif event == 'contact_connected': - self.popup_title = _('%(nickname)s Signed In') % \ - {'nickname': gajim.get_name_from_jid(account, self.jid)} + self.popup_title = _('%(nickname)s Signed In') % {'nickname': nick} self.popup_text = '' if pres_obj.status: self.popup_text = pres_obj.status self.popup_event_type = _('Contact Signed In') elif event == 'contact_disconnected': - self.popup_title = _('%(nickname)s Signed Out') % \ - {'nickname': gajim.get_name_from_jid(account, self.jid)} + self.popup_title = _('%(nickname)s Signed Out') % {'nickname': nick} self.popup_text = '' if pres_obj.status: self.popup_text = pres_obj.status diff -r 12dfe168f7fc -r 042588d50ebc src/common/i18n.py --- a/src/common/i18n.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/common/i18n.py Tue Jul 23 17:55:24 2013 +0400 @@ -27,6 +27,9 @@ from common import defs import unicodedata +# May be changed after GTK is imported +direction_mark = u'\u200F' + def paragraph_direction_mark(text): """ Determine paragraph writing direction according to diff -r 12dfe168f7fc -r 042588d50ebc src/conversation_textview.py --- a/src/conversation_textview.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/conversation_textview.py Tue Jul 23 17:55:24 2013 +0400 @@ -1309,10 +1309,7 @@ direction_mark = i18n.paragraph_direction_mark(text) # don't apply direction mark if it's status message if kind == 'status': - if Gtk.Widget.get_default_direction() == gtk.TextDirectionLTR: - direction_mark = u'\u200E' - else: - direction_mark = u'\u200F' + direction_mark = i18n.direction_mark if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim) diff -r 12dfe168f7fc -r 042588d50ebc src/gajim.py --- a/src/gajim.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/gajim.py Tue Jul 23 17:55:24 2013 +0400 @@ -209,6 +209,8 @@ if os.name == 'nt': warnings.filterwarnings(action='ignore') +if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR: + i18n.direction_mark = u'\u200E' pritext = '' from common import exceptions diff -r 12dfe168f7fc -r 042588d50ebc src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 22 20:36:03 2013 +0200 +++ b/src/groupchat_control.py Tue Jul 23 17:55:24 2013 +0400 @@ -49,6 +49,7 @@ from common import helpers from common import dataforms from common import ged +from common import i18n from chat_control import ChatControl from chat_control import ChatControlBase @@ -1523,7 +1524,8 @@ affiliation = 'none' newly_created = False - nick_jid = obj.nick + nick = i18n.direction_mark + obj.nick + nick_jid = nick # Set to true if role or affiliation have changed right_changed = False @@ -1566,10 +1568,10 @@ if '307' in obj.status_code: if obj.actor is None: # do not print 'kicked by None' s = _('%(nick)s has been kicked: %(reason)s') % { - 'nick': obj.nick, 'reason': obj.reason} + 'nick': nick, 'reason': obj.reason} else: s = _('%(nick)s has been kicked by %(who)s: ' - '%(reason)s') % {'nick': obj.nick, 'who': obj.actor, + '%(reason)s') % {'nick': nick, 'who': obj.actor, 'reason': obj.reason} self.print_conversation(s, 'info', graphics=False) if obj.nick == self.nick and not gajim.config.get( @@ -1578,10 +1580,10 @@ elif '301' in obj.status_code: if obj.actor is None: # do not print 'banned by None' s = _('%(nick)s has been banned: %(reason)s') % { - 'nick': obj.nick, 'reason': obj.reason} + 'nick': nick, 'reason': obj.reason} else: s = _('%(nick)s has been banned by %(who)s: ' - '%(reason)s') % {'nick': obj.nick, 'who': obj.actor, + '%(reason)s') % {'nick': nick, 'who': obj.actor, 'reason': obj.reason} self.print_conversation(s, 'info', graphics=False) if obj.nick == self.nick: @@ -1608,7 +1610,7 @@ ctrl.no_autonegotiation = False else: s = _('%(nick)s is now known as %(new_nick)s') % { - 'nick': obj.nick, 'new_nick': obj.new_nick} + 'nick': nick, 'new_nick': obj.new_nick} tv = self.conv_textview if obj.nick in tv.last_received_message_marks: tv.last_received_message_marks[obj.new_nick] = \ @@ -1662,18 +1664,18 @@ self.print_conversation(s, 'info', graphics=False) elif '321' in obj.status_code: s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % { 'nick': obj.nick, + '(%(reason)s)') % { 'nick': nick, 'reason': _('affiliation changed') } self.print_conversation(s, 'info', graphics=False) elif '322' in obj.status_code: s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % { 'nick': obj.nick, + '(%(reason)s)') % { 'nick': nick, 'reason': _('room configuration changed to ' 'members-only') } self.print_conversation(s, 'info', graphics=False) elif '332' in obj.status_code: s = _('%(nick)s has been removed from the room ' - '(%(reason)s)') % {'nick': obj.nick, + '(%(reason)s)') % {'nick': nick, 'reason': _('system shutdown') } self.print_conversation(s, 'info', graphics=False) # Room has been destroyed. @@ -1707,7 +1709,7 @@ if '210' in obj.status_code: # Server changed our nick self.nick = obj.nick - s = _('You are now known as %s') % obj.nick + s = _('You are now known as %s') % nick self.print_conversation(s, 'info', graphics=False) iter_ = self.add_contact_to_roster(obj.nick, obj.show, role, affiliation, obj.status, obj.real_jid)

1 0

gajim: Add missing tooltips again
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 24319eb0d157 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=24319eb0d157 description: Add missing tooltips again diffstat: data/gui/chat_control.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 042588d50ebc -r 24319eb0d157 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jul 23 17:55:24 2013 +0400 +++ b/data/gui/chat_control.ui Tue Jul 23 19:56:36 2013 +0400 @@ -595,7 +595,7 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property> + <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property>

1 0

gajim: more tooltips in chat control
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset cc60f9107c06 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=cc60f9107c06 description: more tooltips in chat control diffstat: data/gui/chat_control.ui | 3 +-- src/chat_control.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diffs (39 lines): diff -r 24319eb0d157 -r cc60f9107c06 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jul 23 19:56:36 2013 +0400 +++ b/data/gui/chat_control.ui Wed Jul 24 10:06:58 2013 +0200 @@ -449,7 +449,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Toggle audio session</property> <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> @@ -473,7 +472,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Toggle video session</property> <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> @@ -732,6 +730,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Send message</property> <property name="use_action_appearance">False</property> <child> <object class="GtkAlignment" id="alignment102"> diff -r 24319eb0d157 -r cc60f9107c06 src/chat_control.py --- a/src/chat_control.py Tue Jul 23 19:56:36 2013 +0400 +++ b/src/chat_control.py Wed Jul 24 10:06:58 2013 +0200 @@ -1837,7 +1837,7 @@ self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ self.type_id == 'chat' or self.gc_contact.resource: self._send_file_button.set_sensitive(True) - self._send_file_button.set_tooltip_text('') + self._send_file_button.set_tooltip_text(_('Send files')) else: self._send_file_button.set_sensitive(False) if not (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)):

1 0

gajim: correctly find JID column in search result window. Fixes ...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 12dfe168f7fc in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=12dfe168f7fc description: correctly find JID column in search result window. Fixes #7347 diffstat: src/search_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9b008c49238e -r 12dfe168f7fc src/search_window.py --- a/src/search_window.py Sun Jul 28 18:18:22 2013 +0200 +++ b/src/search_window.py Mon Jul 22 20:36:03 2013 +0200 @@ -228,7 +228,7 @@ self.on_result_treeview_cursor_changed) counter = 0 - for field in self.dataform.items[0].fields: + for field in self.dataform.reported.iter_fields(): if field.var == 'jid': self.jid_column = counter break

1 0

gajim: fix showing correct previous sent message. Fixes #7361
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 5cc78e21a713 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5cc78e21a713 description: fix showing correct previous sent message. Fixes #7361 diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 776137a98556 -r 5cc78e21a713 src/chat_control.py --- a/src/chat_control.py Sun Jul 21 20:37:05 2013 +0200 +++ b/src/chat_control.py Sun Jul 21 20:44:36 2013 +0200 @@ -934,7 +934,7 @@ def _cb(msg, cb, *cb_args): self.last_sent_msg = msg - self.last_sent_txt = cb_args[1] + self.last_sent_txt = cb_args[0] if cb: cb(msg, *cb_args)

1 0

gajim: update toolbar when the status has changed
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 89dd26f715aa in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=89dd26f715aa description: update toolbar when the status has changed diffstat: src/chat_control.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 5cc78e21a713 -r 89dd26f715aa src/chat_control.py --- a/src/chat_control.py Sun Jul 21 20:44:36 2013 +0200 +++ b/src/chat_control.py Sun Jul 21 23:26:58 2013 +0400 @@ -1502,6 +1502,7 @@ self.msg_textview.set_sensitive(True) self.msg_textview.set_editable(True) # FIXME: Set sensitivity for toolbar + self.update_toolbar() def got_disconnected(self): self.msg_textview.set_sensitive(False) @@ -1510,6 +1511,7 @@ self.no_autonegotiation = False # FIXME: Set sensitivity for toolbar + self.update_toolbar() ################################################################################

1 0

gajim: [Darlan] Improved BiDi support for status messages
by Denis Fomin 28 Jul '13

28 Jul '13

changeset caeb67194247 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=caeb67194247 description: [Darlan] Improved BiDi support for status messages diffstat: src/conversation_textview.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 89dd26f715aa -r caeb67194247 src/conversation_textview.py --- a/src/conversation_textview.py Sun Jul 21 23:26:58 2013 +0400 +++ b/src/conversation_textview.py Mon Jul 22 21:10:54 2013 +0400 @@ -1309,7 +1309,10 @@ direction_mark = i18n.paragraph_direction_mark(text) # don't apply direction mark if it's status message if kind == 'status': - direction_mark = '' + if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: + direction_mark = u'\u200E' + else: + direction_mark = u'\u200F' if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim)

1 0

gajim: port to PyGi
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 9b008c49238e in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9b008c49238e description: port to PyGi diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r caeb67194247 -r 9b008c49238e src/conversation_textview.py --- a/src/conversation_textview.py Mon Jul 22 21:10:54 2013 +0400 +++ b/src/conversation_textview.py Sun Jul 28 18:18:22 2013 +0200 @@ -1309,7 +1309,7 @@ direction_mark = i18n.paragraph_direction_mark(text) # don't apply direction mark if it's status message if kind == 'status': - if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: + if Gtk.Widget.get_default_direction() == gtk.TextDirectionLTR: direction_mark = u'\u200E' else: direction_mark = u'\u200F'

1 0

gajim: improve error message when we cannot connect to a host vi...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 9455752df4b2 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9455752df4b2 description: improve error message when we cannot connect to a host via a proxy. Fixes #7358 diffstat: src/common/connection.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 69eb6c9d4986 -r 9455752df4b2 src/common/connection.py --- a/src/common/connection.py Fri Jul 19 15:49:47 2013 +0400 +++ b/src/common/connection.py Fri Jul 19 21:12:11 2013 +0200 @@ -1262,7 +1262,12 @@ # we are not retrying, and not conecting if not self.retrycount and self.connected != 0: self.disconnect(on_purpose = True) - pritxt = _('Could not connect to "%s"') % self._hostname + if self._proxy: + pritxt = _('Could not connect to "%(host)s" via proxy "%(proxy)s"') %\ + {'host': self._hostname, 'proxy': self._proxy['host']} + else: + pritxt = _('Could not connect to "%(host)s"') % {'host': \ + self._hostname} sectxt = _('Check your connection or try again later.') if self.streamError: # show error dialog

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