Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Add option to disable ascii emoticons
by Philipp Hörist 15 Sep '17

15 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 41b977b9 by Philipp Hörist at 2017-09-15T23:22:47+02:00 Add option to disable ascii emoticons - - - - - 3 changed files: - gajim/common/config.py - gajim/emoticons.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -124,6 +124,7 @@ class Config: 'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is \'sometimes\'.') ], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True ], + 'ascii_emoticons': [opt_bool, True, _('Enable ASCII emoticons'), True], 'ascii_formatting': [ opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], 'show_ascii_formatting_chars': [ opt_bool, True, _('If True, do not ' ===================================== gajim/emoticons.py ===================================== --- a/gajim/emoticons.py +++ b/gajim/emoticons.py @@ -59,7 +59,7 @@ class SubPixbuf: return subpixbuf -def load(path): +def load(path, ascii_emoticons): module_name = 'emoticons_theme.py' theme_path = os.path.join(path, module_name) if sys.platform == 'win32' and not os.path.exists(theme_path): @@ -87,6 +87,12 @@ def load(path): def add_emoticon(codepoint_, sub, mod_list=None): pix = sub.get_pixbuf() for alternate in codepoint_: + if not ascii_emoticons: + try: + alternate.encode('ascii') + continue + except UnicodeEncodeError: + pass codepoints[alternate] = pix if pix not in pixbufs: pixbufs[pix] = alternate ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1925,6 +1925,7 @@ class Interface: def init_emoticons(self): emot_theme = app.config.get('emoticons_theme') + ascii_emoticons = app.config.get('ascii_emoticons') if not emot_theme: return @@ -1944,7 +1945,7 @@ class Interface: transient_for=transient_for) app.config.set('emoticons_theme', '') return - if not emoticons.load(path): + if not emoticons.load(path, ascii_emoticons): dialogs.WarningDialog( _('Emoticons disabled'), _('Your configured emoticons theme could not be loaded.' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/41b977b91491b9acdb672cebc81081aa4b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/41b977b91491b9acdb672cebc81081aa4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix running make test
by Yann Leboulanger 15 Sep '17

15 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 5c0538a2 by Yann Leboulanger at 2017-09-15T15:11:55+02:00 Fix running make test - - - - - 7 changed files: - plugins/roster_buttons/plugin.py - test/integration/test_roster.py - test/lib/__init__.py - test/lib/gajim_mocks.py - test/runtests.py - test/unit/test_gui_interface.py - test/unit/test_sessions.py Changes: ===================================== plugins/roster_buttons/plugin.py ===================================== --- a/plugins/roster_buttons/plugin.py +++ b/plugins/roster_buttons/plugin.py @@ -38,13 +38,13 @@ class RosterButtonsPlugin(GajimPlugin): def init(self): self.description = _('Adds quick action buttons to roster window.') self.GTK_BUILDER_FILE_PATH = self.local_file_path('roster_buttons.ui') - self.roster_vbox = app.interface.roster.xml.get_object('roster_vbox2') - self.show_offline_contacts_menuitem = app.interface.roster.xml.get_object('show_offline_contacts_menuitem') self.config_dialog = None @log_calls('RosterButtonsPlugin') def activate(self): + self.roster_vbox = app.interface.roster.xml.get_object('roster_vbox2') + self.show_offline_contacts_menuitem = app.interface.roster.xml.get_object('show_offline_contacts_menuitem') self.xml = gtk.Builder() self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ===================================== test/integration/test_roster.py ===================================== --- a/test/integration/test_roster.py +++ b/test/integration/test_roster.py @@ -35,6 +35,14 @@ class TestRosterWindow(unittest.TestCase): app.connections[acc] = MockConnection(acc) app.contacts.add_account(acc) + def tearDown(self): + self.roster.window.destroy() + # Clean main loop + from gi.repository import GLib + mc = GLib.main_context_default() + while mc.pending(): + mc.iteration() + ### Custom assertions def assert_all_contacts_are_in_roster(self, acc): for jid in contacts[acc]: ===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -26,6 +26,8 @@ pluginsconfigdir = configdir + '/pluginsconfig' import builtins builtins._ = lambda x: x +from gajim.common.contacts import LegacyContactsAPI + def setup_env(): # wipe config directory if os.path.isdir(configdir): @@ -46,6 +48,8 @@ def setup_env(): app.DATA_DIR = gajim_root + '/data' app.use_x = use_x + app.contacts = LegacyContactsAPI() + app.connections = {} if use_x: from gajim import gtkgui_helpers ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -107,7 +107,7 @@ class MockInterface(Mock): self.msg_win_mgr = Mock() self.roster = Mock() app.ged = ged.GlobalEventsDispatcher() - import plugins + from gajim import plugins app.plugin_manager = plugins.PluginManager() self.remote_ctrl = None @@ -119,7 +119,7 @@ class MockInterface(Mock): self.jabber_state_images = {'16': {}, '24': {}, '32': {}, 'opened': {}, 'closed': {}} - import gtkgui_helpers + from gajim import gtkgui_helpers gtkgui_helpers.make_jabber_state_images() else: self.jabber_state_images = {'16': Mock(), '24': Mock(), ===================================== test/runtests.py ===================================== --- a/test/runtests.py +++ b/test/runtests.py @@ -53,8 +53,18 @@ nb_errors = 0 nb_failures = 0 for mod in modules: + print("Now running: %s" % mod) suite = unittest.defaultTestLoader.loadTestsFromName(mod) result = unittest.TextTestRunner(verbosity=verbose).run(suite) + if use_x: + # Wait 1s to be sure all timeout_add will be called before we cleanup main loop + import time + time.sleep(0.5) + # Clean main loop + from gi.repository import GLib + mc = GLib.main_context_default() + while mc.pending(): + mc.iteration() nb_errors += len(result.errors) nb_failures += len(result.failures) ===================================== test/unit/test_gui_interface.py ===================================== --- a/test/unit/test_gui_interface.py +++ b/test/unit/test_gui_interface.py @@ -16,10 +16,15 @@ app.logger = MockLogger() from gajim.gui_interface import Interface +from gi.repository import GLib + class TestInterface(unittest.TestCase): def test_instantiation(self): ''' Test that we can proper initialize and do not fail on globals ''' + def close_app(): + app.app.quit() + GLib.idle_add(close_app) app.app.run() def test_links_regexp_entire(self): ===================================== test/unit/test_sessions.py ===================================== --- a/test/unit/test_sessions.py +++ b/test/unit/test_sessions.py @@ -22,12 +22,13 @@ from gajim.roster_window import RosterWindow from mock import Mock, expectParams from gajim_mocks import * +from data import account1 app.interface = MockInterface() # name to use for the test account -account_name = 'test' +account_name = account1 class TestStanzaSession(unittest.TestCase): ''' Testclass for common/stanzasession.py ''' @@ -171,7 +172,7 @@ class TestChatControlSession(unittest.TestCase): jid = 'bct(a)necronomicorp.com' fjid = 'bct(a)necronomicorp.com/Gajim' msgtxt = 'testing two' - roster = RosterWindow(app.app) + app.interface.roster = RosterWindow(app.app) sess = self.conn.sessions[jid]['123'] sess.control = MockChatControl(fjid, account_name) @@ -190,6 +191,7 @@ class TestChatControlSession(unittest.TestCase): # message was printed to the control calls = sess.control.mockGetNamedCalls('print_conversation') self.assertEqual(1, len(calls)) + app.interface.roster.window.destroy() #def test_received_3orphaned_control(self): #'''test receiving a message when a control that doesn't have a session View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5c0538a202d3750686bd50d8d66c84637c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5c0538a202d3750686bd50d8d66c84637c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change License in AboutDialog
by Philipp Hörist 13 Sep '17

13 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef75e93c by Philipp Hörist at 2017-09-13T21:52:18+02:00 Change License in AboutDialog - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1294,7 +1294,7 @@ class AboutDialog(Gtk.AboutDialog): self.set_name('Gajim') self.set_version(app.version) self.set_copyright('Copyright © 2003-2017 Gajim Team') - self.set_license_type(Gtk.License.GPL_3_0) + self.set_license_type(Gtk.License.GPL_3_0_ONLY) self.set_website('https://gajim.org/') gtk_ver = '%i.%i.%i' % ( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef75e93c707609997d757d96ad79db0bfd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ef75e93c707609997d757d96ad79db0bfd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Differentiate upper/lower case string emojis
by Philipp Hörist 13 Sep '17

13 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6e75472 by Philipp Hörist at 2017-09-13T21:20:59+02:00 Differentiate upper/lower case string emojis - - - - - 9ac03824 by Philipp Hörist at 2017-09-13T21:20:59+02:00 Update string emojis - - - - - 3 changed files: - data/emoticons/noto-emoticons/emoticons_theme.py - gajim/conversation_textview.py - gajim/emoticons.py Changes: ===================================== data/emoticons/noto-emoticons/emoticons_theme.py ===================================== --- a/data/emoticons/noto-emoticons/emoticons_theme.py +++ b/data/emoticons/noto-emoticons/emoticons_theme.py @@ -10,7 +10,7 @@ emoticons = OrderedDict([ ('u263a.png', None), # Category image # subgroup: face-positive - ('u1f600.png', [u'\U0001f600']), + ('u1f600.png', [u'\U0001f600', ':>']), ('u1f601.png', [u'\U0001f601']), ('u1f602.png', [u'\U0001f602', ':\'-)', ':\')']), ('u1f923.png', [u'\U0001f923']), @@ -40,9 +40,9 @@ emoticons = OrderedDict([ ('u1f60f.png', [u'\U0001f60f']), ('u1f623.png', [u'\U0001f623']), ('u1f625.png', [u'\U0001f625']), - ('u1f62e.png', [u'\U0001f62e']), + ('u1f62e.png', [u'\U0001f62e', '=-O', ':-O', ':O']), ('u1f910.png', [u'\U0001f910']), - ('u1f62f.png', [u'\U0001f62f']), + ('u1f62f.png', [u'\U0001f62f', ':o']), ('u1f62a.png', [u'\U0001f62a']), ('u1f62b.png', [u'\U0001f62b']), ('u1f634.png', [u'\U0001f634']), @@ -57,7 +57,7 @@ emoticons = OrderedDict([ ('u1f615.png', [u'\U0001f615']), ('u1f643.png', [u'\U0001f643']), ('u1f911.png', [u'\U0001f911']), - ('u1f632.png', [u'\U0001f632', '=-O', ':-O', ':O']), + ('u1f632.png', [u'\U0001f632']), # subgroup: face-negative ('u2639.png', [u'\u2639', ':-/', ':/', ':-\\', ':\\', ':-S', ':S', ':-[', ':[']), ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -918,13 +918,12 @@ class ConversationTextview(GObject.GObject): if special_text.startswith(scheme): text_is_valid_uri = True - possible_emot_ascii_caps = special_text.upper() # emoticons keys are CAPS if iter_: end_iter = iter_ else: end_iter = buffer_.get_end_iter() - pixbuf = emoticons.get_pixbuf(possible_emot_ascii_caps) + pixbuf = emoticons.get_pixbuf(special_text) if app.config.get('emoticons_theme') and pixbuf and graphics: # it's an emoticon anchor = buffer_.create_child_anchor(end_iter) ===================================== gajim/emoticons.py ===================================== --- a/gajim/emoticons.py +++ b/gajim/emoticons.py @@ -87,9 +87,9 @@ def load(path): def add_emoticon(codepoint_, sub, mod_list=None): pix = sub.get_pixbuf() for alternate in codepoint_: - codepoints[alternate.upper()] = pix + codepoints[alternate] = pix if pix not in pixbufs: - pixbufs[pix] = alternate.upper() + pixbufs[pix] = alternate if mod_list is not None: mod_list.append(pix) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b4e856d80aa00c20cc043ec825dd4601… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b4e856d80aa00c20cc043ec825dd4601… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix reading secrets file
by Yann Leboulanger 13 Sep '17

13 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 1b4e856d by Yann Leboulanger at 2017-09-13T14:25:36+02:00 fix reading secrets file - - - - - 1 changed file: - gajim/secrets.py Changes: ===================================== gajim/secrets.py ===================================== --- a/gajim/secrets.py +++ b/gajim/secrets.py @@ -106,7 +106,7 @@ def load_secrets(filename): if type(secret) is str: secrets.srs[acct][jid].remove((secret, verified)) secrets.srs[acct][jid].append((secret.encode('latin1'), verified)) - except (KeyError, EOFError): + except (KeyError, EOFError, ImportError): f.close() secrets = Secrets(filename) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b4e856d80aa00c20cc043ec825dd46010… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b4e856d80aa00c20cc043ec825dd46010… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix plugins_translate script
by Yann Leboulanger 11 Sep '17

11 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: eca11d24 by Yann Leboulanger at 2017-09-11T12:18:56+02:00 fix plugins_translate script - - - - - 1 changed file: - scripts/dev/plugins_translate Changes: ===================================== scripts/dev/plugins_translate ===================================== --- a/scripts/dev/plugins_translate +++ b/scripts/dev/plugins_translate @@ -58,7 +58,7 @@ make_mo() install_mo() { if [ -L community_plugins ]; then - cp $1.mo community_plugins/plugins_translate/ + cp $1.mo community_plugins/plugins_translations/ fi mkdir -p ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/ cp $1.mo ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/gajim_plugins.mo @@ -77,7 +77,7 @@ case "$1" in make_mo $2 ;; install_mo) - install_mo + install_mo $2 ;; all) check_args $@ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eca11d2498b6c6af8b63d5b3d5b32d5bc1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eca11d2498b6c6af8b63d5b3d5b32d5bc1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Unittest: replace deprecated functions
by Yann Leboulanger 11 Sep '17

11 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 3c31574c by André Apitzsch at 2017-09-10T12:21:10+02:00 Unittest: replace deprecated functions - - - - - 40770843 by André Apitzsch at 2017-09-10T12:22:49+02:00 test_pluginmanager: fix imports - - - - - 64cfc5ea by Yann Leboulanger at 2017-09-11T10:01:16+02:00 Merge branch 'tests' into 'master' Test: fix some warnings and errors See merge request !131 - - - - - 7 changed files: - test/integration/test_gui_event_integration.py - test/integration/test_roster.py - test/test_pluginmanager.py - test/unit/test_account.py - test/unit/test_caps_cache.py - test/unit/test_sessions.py - test/unit/test_socks5.py Changes: ===================================== test/integration/test_gui_event_integration.py ===================================== --- a/test/integration/test_gui_event_integration.py +++ b/test/integration/test_gui_event_integration.py @@ -101,7 +101,7 @@ class TestStatusChange(unittest.TestCase): break if not still_exists: - self.assert_(contact is None) + self.assertTrue(contact is None) return self.assertEqual('offline', contact.show) ===================================== test/integration/test_roster.py ===================================== --- a/test/integration/test_roster.py +++ b/test/integration/test_roster.py @@ -74,13 +74,13 @@ class TestRosterWindow(unittest.TestCase): c_model = self.roster.model[titerC] # name can be stricked if contact or group is blocked -# self.assertEquals(contact.get_shown_name(), c_model[self.C_NAME], +# self.assertEqual(contact.get_shown_name(), c_model[self.C_NAME], # msg='Contact name missmatch') - self.assertEquals(contact.jid, c_model[self.C_JID], + self.assertEqual(contact.jid, c_model[self.C_JID], msg='Jid missmatch') if not self.roster.regroup: - self.assertEquals(account, c_model[self.C_ACCOUNT], + self.assertEqual(account, c_model[self.C_ACCOUNT], msg='Account missmatch') # Check for correct nesting @@ -111,15 +111,15 @@ class TestRosterWindow(unittest.TestCase): msg='Account iter is invalid') acc_model = self.roster.model[titerA] - self.assertEquals(acc_model[self.C_TYPE], 'account', + self.assertEqual(acc_model[self.C_TYPE], 'account', msg='No account found') if not self.roster.regroup: - self.assertEquals(acc_model[self.C_ACCOUNT], acc, + self.assertEqual(acc_model[self.C_ACCOUNT], acc, msg='Account not found') self_jid = app.get_jid_from_account(acc) - self.assertEquals(acc_model[self.C_JID], self_jid, + self.assertEqual(acc_model[self.C_JID], self_jid, msg='Account JID not found in account row') def assert_model_is_in_sync(self): @@ -139,7 +139,7 @@ class TestRosterWindow(unittest.TestCase): # Contacts kept their info contact = instances[0] - self.assertEquals(sorted(contact.groups), sorted(contacts[acc][jid]['groups']), + self.assertEqual(sorted(contact.groups), sorted(contacts[acc][jid]['groups']), msg='Group Missmatch') groups = contacts[acc][jid]['groups'] or ['General',] ===================================== test/test_pluginmanager.py ===================================== --- a/test/test_pluginmanager.py +++ b/test/test_pluginmanager.py @@ -38,8 +38,8 @@ configdir = gajim_root + '/test/tmp' import time # define _ for i18n -import __builtin__ -__builtin__._ = lambda x: x +import builtins +builtins._ = lambda x: x # wipe config directory import os @@ -54,7 +54,6 @@ gajim.common.configpaths.gajimpaths.init(configdir) # for some reason common.app needs to be imported before xmpppy? from gajim.common import app -from gajim.common import xmpp app.DATA_DIR = gajim_root + '/data' @@ -77,10 +76,10 @@ class PluginManagerTestCase(unittest.TestCase): self.pluginmanager.test_arg = 1 secondPluginManager = PluginManager() - self.failUnlessEqual(id(secondPluginManager), id(self.pluginmanager), - 'Different IDs in references to PluginManager objects (not a singleton)') - self.failUnlessEqual(secondPluginManager.test_arg, 1, - 'References point to different PluginManager objects (not a singleton') + self.assertEqual(id(secondPluginManager), id(self.pluginmanager), + 'Different IDs in references to PluginManager objects (not a singleton)') + self.assertEqual(secondPluginManager.test_arg, 1, + 'References point to different PluginManager objects (not a singleton') def suite(): suite = unittest.TestLoader().loadTestsFromTestCase(PluginManagerTestCase) ===================================== test/unit/test_account.py ===================================== --- a/test/unit/test_account.py +++ b/test/unit/test_account.py @@ -13,7 +13,7 @@ class Test(unittest.TestCase): def testInstantiate(self): account = Account(name='MyAcc', contacts=None, gc_contacts=None) - self.assertEquals('MyAcc', account.name) + self.assertEqual('MyAcc', account.name) self.assertTrue(account.gc_contacts is None) self.assertTrue(account.contacts is None) ===================================== test/unit/test_caps_cache.py ===================================== --- a/test/unit/test_caps_cache.py +++ b/test/unit/test_caps_cache.py @@ -44,8 +44,8 @@ class TestCapsCache(CommonCapsTest): self.cc[self.client_caps].identities = self.identities self.cc[self.client_caps].features = self.features - self.assert_(NS_MUC in self.cc[self.client_caps].features) - self.assert_(NS_PING not in self.cc[self.client_caps].features) + self.assertTrue(NS_MUC in self.cc[self.client_caps].features) + self.assertTrue(NS_PING not in self.cc[self.client_caps].features) identities = self.cc[self.client_caps].identities ===================================== test/unit/test_sessions.py ===================================== --- a/test/unit/test_sessions.py +++ b/test/unit/test_sessions.py @@ -39,15 +39,15 @@ class TestStanzaSession(unittest.TestCase): def test_generate_thread_id(self): # thread_id is a string - self.assert_(isinstance(self.sess.thread_id, str)) + self.assertTrue(isinstance(self.sess.thread_id, str)) # it should be somewhat long, to avoid clashes - self.assert_(len(self.sess.thread_id) >= 32) + self.assertTrue(len(self.sess.thread_id) >= 32) def test_is_loggable(self): # by default a session should be loggable # (unless the no_log_for setting says otherwise) - self.assert_(self.sess.is_loggable()) + self.assertTrue(self.sess.is_loggable()) def test_terminate(self): # termination is sent by default @@ -127,7 +127,7 @@ class TestChatControlSession(unittest.TestCase): self.assert_new_message_notification() notif = notify.notifications[-1] first = notif.first_unread - self.assert_(first, + self.assertTrue(first, 'message should have been treated as a first message') def assert_not_first_message_notification(self): @@ -135,7 +135,7 @@ class TestChatControlSession(unittest.TestCase): self.assert_new_message_notification() notif = notify.notifications[-1] first = notif.first_unread - self.assert_(not first, + self.assertTrue(not first, 'message was unexpectedly treated as a first message') # ----- tests ----- @@ -148,7 +148,7 @@ class TestChatControlSession(unittest.TestCase): self.receive_chat_msg(fjid, msgtxt) # session is created - self.assert_((jid in self.conn.sessions) and ( + self.assertTrue((jid in self.conn.sessions) and ( '123' in self.conn.sessions[jid]), 'session is not created') sess = self.conn.sessions[jid]['123'] ===================================== test/unit/test_socks5.py ===================================== --- a/test/unit/test_socks5.py +++ b/test/unit/test_socks5.py @@ -114,10 +114,10 @@ class TestSocks5(unittest.TestCase): s.connect(server) s.send(mocksock.outgoing.pop(0)) - self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) s.send(mocksock.outgoing.pop(0)) - self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) def test_connection_client(self): @@ -138,12 +138,12 @@ class TestSocks5(unittest.TestCase): (s, address) = s.accept() - self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) s.send(mocksock.outgoing.pop(0)) buff = s.recv(64) inco = mocksock.incoming.pop(0) - #self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + #self.assertEqual(s.recv(64), mocksock.incoming.pop(0)) s.send(mocksock.outgoing.pop(0)) def test_client_negoc(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f569084b2da324b928720ba40029e187a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f569084b2da324b928720ba40029e187a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix XDG path in man pages. Fixes #8507
by Yann Leboulanger 07 Sep '17

07 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: f569084b by Yann Leboulanger at 2017-09-07T18:03:20+02:00 fix XDG path in man pages. Fixes #8507 - - - - - 2 changed files: - data/gajim-history-manager.1 - data/gajim.1 Changes: ===================================== data/gajim-history-manager.1 ===================================== --- a/data/gajim-history-manager.1 +++ b/data/gajim-history-manager.1 @@ -27,7 +27,7 @@ Where to look for logs file .El .Sh FILES .Bl -tag -width Ds -.It $XDG_DATA_DIR/gajim/logs.db +.It $XDG_DATA_HOME/gajim/logs.db The history database log file used when .Op Fl c is not specified. ===================================== data/gajim.1 ===================================== --- a/data/gajim.1 +++ b/data/gajim.1 @@ -66,19 +66,19 @@ Where to look for configuration files .El .Sh FILES .Bl -tag -width Ds -.It $XDG_CACHE_DIR/gajim/cache.db +.It $XDG_CACHE_HOME/gajim/cache.db Cache database file of transports, caps, roster entry, and roster group. -.It $XDG_CACHE_DIR/gajim/avatars/ +.It $XDG_CACHE_HOME/gajim/avatars/ Cache directory of avatars. -.It $XDG_CACHE_DIR/gajim/vcards/ +.It $XDG_CACHE_HOME/gajim/vcards/ Cache directory of vCards (virtual cards). -.It $XDG_CONFIG_DIR/gajim/ +.It $XDG_CONFIG_HOME/gajim/ The config-path used when .Op Fl c is not specified. -.It $XDG_DATA_DIR/gajim/certs/ +.It $XDG_DATA_HOME/gajim/certs/ Directory where certificates are stored. -.It $XDG_DATA_DIR/gajim/logs.db +.It $XDG_DATA_HOME/gajim/logs.db The history database log file. For more information on database logs see <https://dev.gajim.org/gajim/gajim/wikis/development/LogsDatabase>. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f569084b2da324b928720ba40029e187ad… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f569084b2da324b928720ba40029e187ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Only log for GC Message for one account
by Philipp Hörist 07 Sep '17

07 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 995ade8a by Philipp Hörist at 2017-09-07T16:42:51+02:00 Only log for GC Message for one account - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1155,6 +1155,8 @@ class ConnectionHandlersBase: return True def _nec_gc_message_received(self, obj): + if obj.conn.name != self.name: + return if app.config.should_log(obj.conn.name, obj.jid) and not \ obj.timestamp < obj.conn.last_history_time[obj.jid] and obj.msgtxt and \ obj.nick: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/995ade8a1145d53d7ce279cc46db517f0c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/995ade8a1145d53d7ce279cc46db517f0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont lose own JID from bind
by Philipp Hörist 06 Sep '17

06 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a0b7ee1 by Philipp Hörist at 2017-09-06T21:26:40+02:00 Dont lose own JID from bind _registered_name is None on a smacks resume. Gajim creates on every connection attempt a new nbxmpp.NonBlockingClient instance. This is why _registered_name is None when we go through a smacks resume, because there is no bind event, and the new NonBlockingClient instance has no knowledge of the previous successful bind. - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1451,7 +1451,9 @@ class Connection(CommonConnection, ConnectionHandlers): return if hasattr(con, 'Resource'): self.server_resource = con.Resource - self.registered_name = con._registered_name + if con._registered_name is not None: + log.info('Bound JID: %s', con._registered_name) + self.registered_name = con._registered_name if app.config.get_per('accounts', self.name, 'anonymous_auth'): # Get jid given by server old_jid = app.get_jid_from_account(self.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a0b7ee163f00e7742dc54f6c2a0eefce6… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a0b7ee163f00e7742dc54f6c2a0eefce6… You're receiving this email because of your account on dev.gajim.org.

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