Commits January 2017

commits@gajim.org

1 participants
111 discussions

Start a nNew thread

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.5.5
by Yann Leboulanger 30 Jan '17

30 Jan '17

Yann Leboulanger pushed new tag nbxmpp-0.5.5 at gajim / python-nbxmpp

1 0

[Git][gajim/python-nbxmpp][master] Prepare 0.5.5 release
by Yann Leboulanger 30 Jan '17

30 Jan '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: ace6e018 by Yann Leboulanger at 2017-01-30T22:41:33+01:00 Prepare 0.5.5 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +python-nbxmpp 0.5.5 (30 January 2017) + + * Some cleanup + * Add some namespaces + python-nbxmpp 0.5.4 (04 September 2016) * Fix SCRAM authentication ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5.4" +__version__ = "0.5.5" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5.4', + version='0.5.5', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ace6e018bb386132245743673a…

1 0

[Git][gajim/gajim][gajim_0.16] Update ChangeLog
by Philipp Hörist 30 Jan '17

30 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 272c26e7 by Philipp Hörist at 2017-01-30T22:35:27+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,16 @@ +Gajim 0.16.7 (30 January 2017) + + * Better compatibility with XEP-0191: Blocking Command + * Windows Credential Vault is used for password storage on Windows + * Gajim now depends on python-gnupg for PGP encryption + * Add portable installer for Windows + * Remove usage of demandimport + * Many minor bugfixes + Gajim 0.16.6 (02 October 2016) * Fix using gpg2 - * Improve message receips usage + * Improve message receipts usage * Improve roster filtering * several minor bugs View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/272c26e75fcc9dcf8cef1473357d8f7bd0…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: update copyright
by Yann Leboulanger 30 Jan '17

30 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 6396329e by Yann Leboulanger at 2017-01-30T22:21:37+01:00 update copyright - - - - - c0bff279 by Yann Leboulanger at 2017-01-30T22:23:04+01:00 Update version number to 0.16.7 - - - - - 30 changed files: - appveyor.yml - autogen.sh - gajim.nsi - plugins/dbus_plugin/plugin.py - scripts/gajim.in - setup_win32.py - src/adhoc_commands.py - src/advanced_configuration_window.py - src/atom_window.py - src/cell_renderer_image.py - src/chat_control.py - src/common/atom.py - src/common/caps_cache.py - src/common/check_paths.py - src/common/commands.py - src/common/config.py - src/common/configpaths.py - src/common/connection.py - src/common/connection_handlers.py - src/common/contacts.py - src/common/dataforms.py - src/common/dbus_support.py - src/common/defs.py - src/common/dh.py - src/common/events.py - src/common/exceptions.py - src/common/fuzzyclock.py - src/common/gajim.py - src/common/gpg.py - src/common/helpers.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e217d2ec5b9555205e1b0ce5c52083e0e…

1 0

[Git][gajim/gajim][gajim_0.16] 8 commits: Dont block contacts only partially
by Philipp Hörist 29 Jan '17

29 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 2175aff6 by Philipp Hörist at 2017-01-28T02:03:22+01:00 Dont block contacts only partially This is needed for better interop with XEP-0191. The Server doesnt deliver a partial blocked contact as blocked to a XEP-0191 Client. - - - - - a7b8744c by Philipp Hörist at 2017-01-28T02:03:28+01:00 Add blocked contacts always to the default list - - - - - 1e86f016 by Philipp Hörist at 2017-01-28T02:03:29+01:00 Use push event to query privacy list after edit - - - - - 0f0c3b7d by Philipp Hörist at 2017-01-28T02:03:29+01:00 Dont try to set empty privacy default list This will result in a conflict stanza because an active default list cant be deleted Decline the use of default list first, then delete the list - - - - - de775106 by Philipp Hörist at 2017-01-28T18:35:46+01:00 Dont set default list active on block There could be another list active (eg. invisible) If we block someone while invisible, setting the default list active would make us visible again - - - - - 2595631a by Philipp Hörist at 2017-01-28T18:44:26+01:00 Remove redundant method - - - - - a02ae05a by Philipp Hörist at 2017-01-28T18:46:17+01:00 Decline active list when going visible Declining the active list will switch us to the default list - - - - - e217d2ec by Philipp Hörist at 2017-01-30T00:21:43+01:00 Merge branch 'privacy' into 'gajim_0.16' Fix Privacy Lists See merge request !48 - - - - - 3 changed files: - src/common/connection.py - src/common/connection_handlers.py - src/groupchat_control.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1719,16 +1719,6 @@ class Connection(CommonConnection, ConnectionHandlers): iq = self.build_invisible_rule() self.connection.send(iq) - def activate_privacy_rule(self, name): - """ - Activate a privacy rule - """ - if not gajim.account_is_connected(self.name): - return - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='') - iq.setQuery().setTag('active', {'name': name}) - self.connection.send(iq) - def get_max_blocked_list_order(self): max_order = 0 for rule in self.blocked_list: @@ -1738,6 +1728,8 @@ class Connection(CommonConnection, ConnectionHandlers): return max_order def block_contacts(self, contact_list, message): + if self.privacy_default_list is None: + self.privacy_default_list = 'block' if not self.privacy_rules_supported: if self.blocking_supported: #XEP-0191 iq = nbxmpp.Iq('set', xmlns='') @@ -1750,16 +1742,15 @@ class Connection(CommonConnection, ConnectionHandlers): for contact in contact_list: self.send_custom_status('offline', message, contact.jid) max_order = self.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': 'jid', 'action': 'deny', - 'value' : contact.jid, 'child': ['message', 'iq', - 'presence-out']} + new_rule = {'order': str(max_order + 1), + 'type': 'jid', + 'action': 'deny', + 'value': contact.jid} self.blocked_list.append(new_rule) self.blocked_contacts.append(contact.jid) - self.set_privacy_list('block', self.blocked_list) + self.set_privacy_list(self.privacy_default_list, self.blocked_list) if len(self.blocked_list) == 1: - self.set_active_list('block') - self.set_default_list('block') - self.get_privacy_list('block') + self.set_default_list(self.privacy_default_list) def unblock_contacts(self, contact_list): if not self.privacy_rules_supported: @@ -1781,15 +1772,14 @@ class Connection(CommonConnection, ConnectionHandlers): if rule['action'] != 'deny' or rule['type'] != 'jid' \ or rule['value'] not in self.to_unblock: self.new_blocked_list.append(rule) - self.set_privacy_list('block', self.new_blocked_list) - self.get_privacy_list('block') if len(self.new_blocked_list) == 0: self.blocked_list = [] self.blocked_contacts = [] self.blocked_groups = [] self.set_default_list('') - self.set_active_list('') - self.del_privacy_list('block') + self.del_privacy_list(self.privacy_default_list) + else: + self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) if not gajim.interface.roster.regroup: show = gajim.SHOW_LIST[self.connected] else: # accounts merged @@ -1806,14 +1796,14 @@ class Connection(CommonConnection, ConnectionHandlers): for contact in contact_list: self.send_custom_status('offline', message, contact.jid) max_order = self.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': 'group', 'action': 'deny', - 'value' : group, 'child': ['message', 'iq', 'presence-out']} + new_rule = {'order': str(max_order + 1), + 'type': 'group', + 'action': 'deny', + 'value': group} self.blocked_list.append(new_rule) - self.set_privacy_list('block', self.blocked_list) + self.set_privacy_list(self.privacy_default_list, self.blocked_list) if len(self.blocked_list) == 1: - self.set_active_list('block') - self.set_default_list('block') - self.get_privacy_list('block') + self.set_default_list(self.privacy_default_list) def unblock_group(self, group, contact_list): if not self.privacy_rules_supported: @@ -1825,15 +1815,14 @@ class Connection(CommonConnection, ConnectionHandlers): if rule['action'] != 'deny' or rule['type'] != 'group' or \ rule['value'] != group: self.new_blocked_list.append(rule) - self.set_privacy_list('block', self.new_blocked_list) - self.get_privacy_list('block') if len(self.new_blocked_list) == 0: self.blocked_list = [] self.blocked_contacts = [] self.blocked_groups = [] self.set_default_list('') - self.set_active_list('') - self.del_privacy_list('block') + self.del_privacy_list(self.privacy_default_list) + else: + self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) if not gajim.interface.roster.regroup: show = gajim.SHOW_LIST[self.connected] else: # accounts merged @@ -1874,7 +1863,7 @@ class Connection(CommonConnection, ConnectionHandlers): if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.activate_privacy_rule('invisible') + self.set_active_list('invisible') self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg priority = unicode(gajim.get_priority(self.name, 'invisible')) @@ -2106,12 +2095,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _change_from_invisible(self): if self.privacy_rules_supported: - if self.blocked_list: - self.activate_privacy_rule('block') - else: - iq = self.build_privacy_rule('visible', 'allow') - self.connection.send(iq) - self.activate_privacy_rule('visible') + self.set_active_list('') def _update_status(self, show, msg): xmpp_show = helpers.get_xmpp_show(show) @@ -2427,9 +2411,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(iq) def _nec_privacy_list_received(self, obj): + roster = gajim.interface.roster if obj.conn.name != self.name: return - if obj.list_name != 'block': + if obj.list_name != self.privacy_default_list: return self.blocked_contacts = [] self.blocked_groups = [] @@ -2456,6 +2441,11 @@ class Connection(CommonConnection, ConnectionHandlers): self.blocked_groups.append(rule['value']) self.blocked_list.append(rule) + if rule['type'] == 'jid': + roster.draw_contact(rule['value'], self.name) + if rule['type'] == 'group': + roster.draw_group(rule['value'], self.name) + def _request_bookmarks_xml(self): if not gajim.account_is_connected(self.name): return ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -590,7 +590,11 @@ class ConnectionVcard: elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() != 'error': - self.get_privacy_list('block') + for list_ in iq_obj.getQueryPayload(): + if list_.getName() == 'default': + self.privacy_default_list = list_.getAttr('name') + self.get_privacy_list(self.privacy_default_list) + break # Ask metacontacts before roster self.get_metacontacts() else: @@ -1465,6 +1469,8 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.awaiting_xmpp_ping_id = None self.continue_connect_info = None + self.privacy_default_list = None + try: self.sleeper = common.sleepy.Sleepy() HAS_IDLE = True @@ -2076,6 +2082,11 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): if q: result.delChild(q) self.connection.send(result) + + for list_ in iq_obj.getQueryPayload(): + if list_.getName() == 'list': + self.get_privacy_list(list_.getAttr('name')) + raise nbxmpp.NodeProcessed def _getRoster(self): ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -2863,6 +2863,7 @@ class GroupchatControl(ChatControlBase): def on_block(self, widget, nick): fjid = self.room_jid + '/' + nick connection = gajim.connections[self.account] + default = connection.privacy_default_list if fjid in connection.blocked_contacts: return max_order = connection.get_max_blocked_list_order() @@ -2871,15 +2872,14 @@ class GroupchatControl(ChatControlBase): connection.blocked_list.append(new_rule) connection.blocked_contacts.append(fjid) self.draw_contact(nick) - connection.set_privacy_list('block', connection.blocked_list) + connection.set_privacy_list(default, connection.blocked_list) if len(connection.blocked_list) == 1: - connection.set_active_list('block') - connection.set_default_list('block') - connection.get_privacy_list('block') + connection.set_default_list(default) def on_unblock(self, widget, nick): fjid = self.room_jid + '/' + nick connection = gajim.connections[self.account] + default = connection.privacy_default_list connection.new_blocked_list = [] # needed for draw_contact: if fjid in connection.blocked_contacts: @@ -2890,18 +2890,17 @@ class GroupchatControl(ChatControlBase): or rule['value'] != fjid: connection.new_blocked_list.append(rule) - connection.set_privacy_list('block', connection.new_blocked_list) - connection.get_privacy_list('block') if len(connection.new_blocked_list) == 0: connection.blocked_list = [] connection.blocked_contacts = [] connection.blocked_groups = [] connection.set_default_list('') - connection.set_active_list('') - connection.del_privacy_list('block') + connection.del_privacy_list(default) if 'privay_list_block' in gajim.interface.instances[self.account]: del gajim.interface.instances[self.account]\ ['privay_list_block'] + else: + connection.set_privacy_list(default, connection.new_blocked_list) def on_voice_checkmenuitem_activate(self, widget, nick): if widget.get_active(): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6429ba2601752895e4543918eca9eafef…

1 0

[Git][gajim/gajim][gajim_0.16] fix nb_NO.po
by Yann Leboulanger 29 Jan '17

29 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 6429ba26 by Yann Leboulanger at 2017-01-29T16:30:57+01:00 fix nb_NO.po - - - - - 9 changed files: - po/bg.po - po/de.po - po/el.po - po/es.po - po/fr.po - po/nb_NO.po - po/pl.po - po/pt.po - po/ru.po Changes: ===================================== po/bg.po ===================================== --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Gajim 0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: 2009-08-19 23:43+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -1439,7 +1439,7 @@ msgstr "Стаи" msgid "All Chat Histories" msgstr "Всички състояния" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "История на разговорите" @@ -5495,7 +5495,7 @@ msgstr "%(nick)s промени състоянието си" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s вече е %(status)s" @@ -7050,7 +7050,7 @@ msgstr "текст на съобщението за състояние" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Име" @@ -7623,7 +7623,7 @@ msgstr[0] "Вчера" msgstr[1] "Вчера" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Тема: %s\n" @@ -10346,7 +10346,7 @@ msgstr "Неуспех при откриването на базата от да #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Дата" @@ -10357,7 +10357,7 @@ msgstr "Псевдоним" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Съобщение" @@ -10427,36 +10427,36 @@ msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "Наистина ли искате да изтриете избраното съобщение?" msgstr[1] "Наистина ли искате да изтриете избраните съобщения?" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "История на разговорите с %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 msgid "Disk Error" msgstr "Грешка при запис/четене от диска" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s вече е %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, fuzzy, python-format msgid "Error: %s" msgstr "Грешка: %s" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 #, fuzzy msgid "Error" msgstr "Грешка." -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Сегашното състояние е: %(status)s: %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "Сегашното състояние е: %(status)s" ===================================== po/de.po ===================================== --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: 2016-11-27 12:58+0100\n" "Last-Translator: Dominik George <nik(a)naturalnet.de>\n" "Language-Team: German <translators(a)gajim.org>\n" @@ -1418,7 +1418,7 @@ msgstr "Gruppenchatverläufe" msgid "All Chat Histories" msgstr "Alle Chatverläufe" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "Unterhaltungsverlauf" @@ -5492,7 +5492,7 @@ msgstr "%(nick)s änderte seinen Status" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s ist jetzt %(status)s" @@ -7040,7 +7040,7 @@ msgstr "Statusnachricht" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Name" @@ -7617,7 +7617,7 @@ msgstr[0] "Gestern" msgstr[1] "vor %(nb_days)i Tagen" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Thema: %s\n" @@ -10360,7 +10360,7 @@ msgstr "Kann Verlaufs-Datenkbank nicht finden" #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Datum" @@ -10371,7 +10371,7 @@ msgstr "Spitzname" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Nachricht" @@ -10438,35 +10438,35 @@ msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?" msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "Unterhaltungs-Verlauf mit %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 msgid "Disk Error" msgstr "Festplattenfehler" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, python-format msgid "Error: %s" msgstr "Fehler: %s" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 msgid "Error" msgstr "Fehler" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "Der Status ist jetzt: %(status)s" ===================================== po/el.po ===================================== --- a/po/el.po +++ b/po/el.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gajim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: 2009-08-19 23:46+0200\n" "Last-Translator: Stavros Giannouris <stavrosg(a)hellug.gr>\n" "Language-Team: <>\n" @@ -1502,7 +1502,7 @@ msgstr "Ομαδικές συζητήσεις" msgid "All Chat Histories" msgstr "Παλιό όνομα - Κείμενο - Αριθμός" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "Ιστορικό συζητήσεων" @@ -5529,7 +5529,7 @@ msgstr "Ο %(nick)s άλλαξε κατάσταση" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "Ο %(nick)s είναι τώρα %(status)s" @@ -7163,7 +7163,7 @@ msgstr "κείμενο μηνύματος κατάστασης" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Όνομα" @@ -7750,7 +7750,7 @@ msgstr[0] "Χθες" msgstr[1] "Χθες" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Θέμα: %s\n" @@ -10466,7 +10466,7 @@ msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδο #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Ημερομηνία" @@ -10477,7 +10477,7 @@ msgstr "Όνομα χρήστη" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Μήνυμα" @@ -10547,37 +10547,37 @@ msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;" msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "Ιστορικό κουβέντας με τον %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 #, fuzzy msgid "Disk Error" msgstr "Σφάλμα:" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, fuzzy, python-format msgid "Error: %s" msgstr "Μήνυμα σφάλματος: %s" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 #, fuzzy msgid "Error" msgstr "Σφάλμα:" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "Η κατάσταση είναι τώρα: %(status)s" ===================================== po/es.po ===================================== --- a/po/es.po +++ b/po/es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -1398,7 +1398,7 @@ msgstr "Históricos de grupos de charla" msgid "All Chat Histories" msgstr "Todos los históricos de las conversaciones" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "Histórico de conversaciones" @@ -5405,7 +5405,7 @@ msgstr "%(nick)s cambió su estado" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s está ahora %(status)s" @@ -6952,7 +6952,7 @@ msgstr "texto del mensaje de estado" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Nombre" @@ -7518,7 +7518,7 @@ msgstr[0] "Ayer" msgstr[1] "hace %(nb_days)i días" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Tema: %s\n" @@ -10192,7 +10192,7 @@ msgstr "No se puede encontrar la base de datos del historial" #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Fecha" @@ -10203,7 +10203,7 @@ msgstr "Alias" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Mensaje" @@ -10270,35 +10270,35 @@ msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "¿Realmente quieres eliminar el mensaje seleccionado?" msgstr[1] "¿Realmente quieres eliminar los mensajes seleccionados?" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "Histórico de conversaciones con %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 msgid "Disk Error" msgstr "Error de disco" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s está ahora %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, python-format msgid "Error: %s" msgstr "" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 msgid "Error" msgstr "" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "El estado es ahora: %(status)s: %(status_msg)s " -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "El estado es ahora: %(status)s" ===================================== po/fr.po ===================================== --- a/po/fr.po +++ b/po/fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -1404,7 +1404,7 @@ msgstr "Historique de salons de discussion" msgid "All Chat Histories" msgstr "Tous les historiques" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "Historique de conversation" @@ -5460,7 +5460,7 @@ msgstr "%(nick)s a changé d'état" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s est maintenant %(status)s" @@ -7011,7 +7011,7 @@ msgstr "texte du message d'état :" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Nom" @@ -7573,7 +7573,7 @@ msgstr[0] "Hier" msgstr[1] "il y a %(nb_days)i jours" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Sujet : %s\n" @@ -10275,7 +10275,7 @@ msgstr "Impossible de trouver la base de données de l'historique" #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Date" @@ -10286,7 +10286,7 @@ msgstr "Pseudonyme" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Message" @@ -10353,35 +10353,35 @@ msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?" msgstr[1] "Voulez-vous vraiment supprimer les messages sélectionnés ?" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "Historique de conversation avec %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 msgid "Disk Error" msgstr "Erreur du disque" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, python-format msgid "Error: %s" msgstr "Erreur : %s" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 msgid "Error" msgstr "Erreur" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "L'état est maintenant : %(status)s : %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "L'état est maintenant : %(status)s" ===================================== po/nb_NO.po ===================================== The diff for this file was not included because it is too large. ===================================== po/pl.po ===================================== --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: 2013-09-02 10:44+0100\n" "Last-Translator: Michał Olber <michal.olber(a)osworld.pl>\n" "Language-Team: Polish <dominik(a)kozaczko.info, translation-team-pl@lists." @@ -1424,7 +1424,7 @@ msgstr "Pokoje" msgid "All Chat Histories" msgstr "Stare historie" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "Historia rozmowy" @@ -5454,7 +5454,7 @@ msgstr "%(nick)s zmienił status" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s ma teraz status %(status)s" @@ -7022,7 +7022,7 @@ msgstr "treść informacji o statusie" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Nazwa" @@ -7587,7 +7587,7 @@ msgstr[1] "%i dni temu" msgstr[2] "%i dni temu" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Temat: %s\n" @@ -10286,7 +10286,7 @@ msgstr "Nie można odnaleźć bazy danych z historią rozmów" #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Data" @@ -10297,7 +10297,7 @@ msgstr "Pseudonim" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Wiadomość" @@ -10369,35 +10369,35 @@ msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?" msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?" msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "Historia rozmowy z %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 msgid "Disk Error" msgstr "Błąd zapisu lub odczytu na dysku" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, python-format msgid "Error: %s" msgstr "Błąd: %s" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 msgid "Error" msgstr "Błąd" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Obecny status: %(status)s: %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "Obecny status: %(status)s" ===================================== po/pt.po ===================================== --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Gajim 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: 2005-08-18 18:21-0300\n" "Last-Translator: Miguel Fonseca <miguelcsf(a)gmail.com>\n" "Language-Team: none\n" @@ -1494,7 +1494,7 @@ msgstr "Chat" msgid "All Chat Histories" msgstr "Estado: " -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "Histórico das Conversas" @@ -5508,7 +5508,7 @@ msgstr "%(nick)s está agora %(status)s" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s está agora %(status)s" @@ -7138,7 +7138,7 @@ msgstr "texto da mensagem de estado" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Nome" @@ -7709,7 +7709,7 @@ msgstr[0] "Ontem" msgstr[1] "Ontem" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Assunto: %s\n" @@ -10400,7 +10400,7 @@ msgstr "a criar base de dados dos logs" #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Data:" @@ -10412,7 +10412,7 @@ msgstr "Alcunha:" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Mensagem" @@ -10476,37 +10476,37 @@ msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "" msgstr[1] "" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "Histórico de Conversas com %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 #, fuzzy msgid "Disk Error" msgstr "Erro:" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s está agora %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, fuzzy, python-format msgid "Error: %s" msgstr "Introduza a sua mensagem :" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 #, fuzzy msgid "Error" msgstr "Erro:" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "O estado é agora: %(status)s: %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "Estado é agora: %(status)s" ===================================== po/ru.po ===================================== --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-25 03:05+0000\n" +"POT-Creation-Date: 2017-01-27 03:05+0000\n" "PO-Revision-Date: 2013-09-21 13:55+0300\n" "Last-Translator: Fomin Denis <fominde(a)gmail.com>\n" "Language-Team: Linux Support LLC\n" @@ -1418,7 +1418,7 @@ msgstr "История конференций" msgid "All Chat Histories" msgstr "Вся история" -#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:339 +#: ../data/gui/history_window.ui.h:4 ../src/history_window.py:341 msgid "Conversation History" msgstr "История" @@ -5419,7 +5419,7 @@ msgstr "%(nick)s меняет статус" #: ../src/common/connection_handlers_events.py:2609 #: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1905 -#: ../src/history_window.py:474 +#: ../src/history_window.py:476 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s теперь %(status)s" @@ -6972,7 +6972,7 @@ msgstr "текст сообщения о статусе" #. Name column #: ../src/config.py:1552 ../src/dialogs.py:2688 ../src/dialogs.py:2755 #: ../src/dialogs.py:3553 ../src/disco.py:897 ../src/disco.py:1794 -#: ../src/disco.py:2098 ../src/history_window.py:94 +#: ../src/disco.py:2098 ../src/history_window.py:96 msgid "Name" msgstr "Имя" @@ -7537,7 +7537,7 @@ msgstr[1] "%(nb_days)i дня назад" msgstr[2] "%(nb_days)i дней назад" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1456 ../src/history_window.py:507 +#: ../src/conversation_textview.py:1456 ../src/history_window.py:509 #, python-format msgid "Subject: %s\n" msgstr "Тема: %s\n" @@ -10196,7 +10196,7 @@ msgstr "Не могу найти базу данных истории" #. holds time #: ../src/history_manager.py:178 ../src/history_manager.py:222 -#: ../src/history_window.py:102 +#: ../src/history_window.py:104 msgid "Date" msgstr "Дата" @@ -10207,7 +10207,7 @@ msgstr "Ник" #. holds message #: ../src/history_manager.py:194 ../src/history_manager.py:229 -#: ../src/history_window.py:110 +#: ../src/history_window.py:112 msgid "Message" msgstr "Сообщение" @@ -10274,35 +10274,35 @@ msgstr[0] "Вы точно хотите удалить выделенное со msgstr[1] "Вы точно хотите удалить выделенные сообщения?" msgstr[2] "Вы точно хотите удалить выделенные сообщения?" -#: ../src/history_window.py:321 +#: ../src/history_window.py:323 #, python-format msgid "Conversation History with %s" msgstr "История %s" -#: ../src/history_window.py:371 +#: ../src/history_window.py:373 msgid "Disk Error" msgstr "Ошибка записи на диск" -#: ../src/history_window.py:470 +#: ../src/history_window.py:472 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s теперь %(status)s: %(status_msg)s" -#: ../src/history_window.py:481 +#: ../src/history_window.py:483 #, python-format msgid "Error: %s" msgstr "Ошибка: %s" -#: ../src/history_window.py:483 +#: ../src/history_window.py:485 msgid "Error" msgstr "Ошибка" -#: ../src/history_window.py:485 +#: ../src/history_window.py:487 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Статус установлен в: %(status)s: %(status_msg)s" -#: ../src/history_window.py:488 +#: ../src/history_window.py:490 #, python-format msgid "Status is now: %(status)s" msgstr "Статус установлен в: %(status)s" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6429ba2601752895e4543918eca9eafefd…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: tests: Don't mock received_message_hashes
by Philipp Hörist 27 Jan '17

27 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 46a19733 by aszlig at 2017-01-27T20:43:45+01:00 tests: Don't mock received_message_hashes This fixes the following two test cases from TestChatControlSession in test/unit/test_sessions.py: * test_receive_1nocontrol * test_receive_2already_has_control The MockConnection object already defines various attributes from the real Connection object to their corresponding types so that calling code is able to for example iterate on dicts or lists. Since 40a3f80aa1afc0cde885d23da28e5c2330f3583c, there exists a new received_message_hashes attribute, which is expected to be a list but the default Mock object doesn't define an __iter__ method. So this leads to the following exception: Traceback (most recent call last): File ".../share/gajim/src/common/ged.py", line 93, in raise_event if handler(*args, **kwargs): File ".../share/gajim/src/common/connection_handlers.py", line 1137, in _nec_message_received conn=self, msg_obj=obj)) File ".../share/gajim/src/common/nec.py", line 74, in push_incoming_event if event_object.generate(): File ".../share/gajim/src/common/connection_handlers_events.py", line 1468, in generate if self.msghash in self.conn.received_message_hashes: TypeError: argument of type 'instance' is not iterable Defining received_message_hashes to be a list fixes this. Signed-off-by: aszlig <aszlig(a)redmoonstudios.org> - - - - - ab3b363e by Philipp Hörist at 2017-01-27T20:55:21+01:00 Merge branch 'fix-connection-mock' into 'gajim_0.16' tests: Don't mock received_message_hashes See merge request !47 - - - - - 1 changed file: - test/lib/gajim_mocks.py Changes: ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -24,6 +24,7 @@ class MockConnection(Mock, ConnectionHandlers): self.blocked_groups = {} self.sessions = {} self.nested_group_delimiter = '::' + self.received_message_hashes = [] gajim.interface.instances[account] = {'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, 'sub_request': {}} View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27618b2dbe668cc81a41e381d44462a98…

1 0

[Git][gajim/gajim][master] 6 commits: Fix inserting a newline on shift-enter.
by Philipp Hörist 26 Jan '17

26 Jan '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18a3258c by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Fix inserting a newline on shift-enter. Return false from key-press-event to propagate event to a default handler that will insert a newline into the entry widget. - - - - - ffeeb8f9 by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Simplify send or insert newline logic. - - - - - 2e133d25 by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Fix tab switching with ctrl+page up and ctrl+page down. - - - - - 0b7d6cc1 by Tomasz Miąsko at 2017-01-25T17:05:49+01:00 Fix moving between lines with up and down arrows. - - - - - b678165d by Tomasz Miąsko at 2017-01-25T18:04:12+01:00 Use the same code path for shift-enter as for ctrl-enter. - - - - - b1940459 by Philipp Hörist at 2017-01-26T19:17:32+01:00 Merge branch 'fix-gtk3-shortcuts' into 'master' Fix keyboard shortcuts in GTK3 See merge request !41 - - - - - 2 changed files: - src/chat_control_base.py - src/message_window.py Changes: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -668,49 +668,37 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.scroll_messages('up', message_buffer, 'received') else: # Ctrl+UP self.scroll_messages('up', message_buffer, 'sent') - return True + return True elif event.keyval == Gdk.KEY_Down: if event_state & Gdk.ModifierType.CONTROL_MASK: if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down self.scroll_messages('down', message_buffer, 'received') else: # Ctrl+Down self.scroll_messages('down', message_buffer, 'sent') - return True - + return True elif event.keyval == Gdk.KEY_Return or \ event.keyval == Gdk.KEY_KP_Enter: # ENTER - if event_state & Gdk.ModifierType.SHIFT_MASK: - return True message_textview = widget message_buffer = message_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds() message = message_buffer.get_text(start_iter, end_iter, False) xhtml = self.msg_textview.get_xhtml() - if gajim.config.get('send_on_ctrl_enter'): - if event_state & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER - send_message = True - else: - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - - else: # send on Enter, do newline on Ctrl Enter - if event_state & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - else: # ENTER - send_message = True - - if gajim.connections[self.account].connected < 2 and send_message: + if event_state & Gdk.ModifierType.SHIFT_MASK: + send_message = False + else: + is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK) + send_message = is_ctrl_enter == gajim.config.get('send_on_ctrl_enter') + + if send_message and gajim.connections[self.account].connected < 2: # we are not connected dialogs.ErrorDialog(_('A connection is not available'), - _('Your message can not be sent until you are connected.')) - send_message = False + _('Your message can not be sent until you are connected.')) + elif send_message: + self.send_message(message, xhtml=xhtml) + else: + message_buffer.insert_at_cursor('\n') - if send_message: - self.send_message(message, xhtml=xhtml) # send the message return True elif event.keyval == Gdk.KEY_z: # CTRL+z if event_state & Gdk.ModifierType.CONTROL_MASK: ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -401,7 +401,7 @@ class MessageWindow(object): elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down): # CTRL + PageUp | PageDown # Create event and send it to notebook - event = Gdk.Event(Gdk.EventType.KEY_PRESS) + event = Gdk.Event.new(Gdk.EventType.KEY_PRESS) event.window = self.window.get_window() event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/179777239e17ae9917051e8ab218c4d48…

1 0

[Git][gajim/gajim][gajim_0.16] 3 commits: Highlight all paragraphs of a search result in the history window
by Philipp Hörist 26 Jan '17

26 Jan '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 7d39b384 by Markus Böhme at 2017-01-25T10:46:31+01:00 Highlight all paragraphs of a search result in the history window A single message may span multiple paragraphs. Highlight all lines belonging to the paragraph containing the search keyword. When filling the history textbuffer, tag each newline character that is ending a message with an invisible tag. Then at search time highlight all lines up to that tag. - - - - - b2e41e93 by Markus Böhme at 2017-01-25T10:48:33+01:00 Remove unnecessary code in message highlighting in the history window The message to be highlighted is searched via an already formatted timestamp, and the match contains the whole timestamp with any preceding characters (like "["). Therefore, calling backward_char on the start iterator of the match just goes back to the previous line and is not needed. - - - - - 27618b2d by Philipp Hörist at 2017-01-26T19:17:06+01:00 Merge branch 'gajim_0.16' into 'gajim_0.16' History window: Highlight all paragraphs of a search result See merge request !31 - - - - - 1 changed file: - src/history_window.py Changes: ===================================== src/history_window.py ===================================== --- a/src/history_window.py +++ b/src/history_window.py @@ -75,6 +75,8 @@ class HistoryWindow: self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background = 'yellow') self.history_buffer.create_tag('invisible', invisible=True) + self.eom_tag = self.history_buffer.create_tag('endofmessage', + invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) @@ -515,7 +517,7 @@ class HistoryWindow: else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml) - self.history_textview.print_real_text('\n') + self.history_textview.print_real_text('\n', ['endofmessage']) def on_query_entry_activate(self, widget): text = self.query_entry.get_text() @@ -624,13 +626,10 @@ class HistoryWindow: self.calendar.select_day(day) unix_time = model[path][C_TIME] self._scroll_to_result(unix_time) - #FIXME: one day do not search just for unix_time but the whole and user - # specific format of the textbuffer line [time] nick: message - # and highlight all that def _scroll_to_result(self, unix_time): """ - Scroll to the result using unix_time and highlight line + Scroll to the result using unix_time and highlight message """ start_iter = self.history_buffer.get_start_iter() local_time = time.localtime(float(unix_time)) @@ -641,9 +640,9 @@ class HistoryWindow: None) if result is not None: match_start_iter, match_end_iter = result - # include '[' or other character before time - match_start_iter.backward_char() - match_end_iter.forward_line() # highlight all message not just time + while not match_end_iter.has_tag(self.eom_tag): + if not match_end_iter.forward_to_line_end(): + break self.history_buffer.apply_tag_by_name('highlight', match_start_iter, match_end_iter) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/32085e8bd7b92d37b5cab52d59b77e54f…

1 0

[Git][gajim/gajim][gajim_0.16] update po files
by Yann Leboulanger 25 Jan '17

25 Jan '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 32085e8b by Yann Leboulanger at 2017-01-25T14:07:14+00:00 update po files - - - - - 4 changed files: - po/bg.po - po/da.po - po/de.po - po/el.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/32085e8bd7b92d37b5cab52d59b77e54f4…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2017