Commits January 2018

commits@gajim.org

1 participants
59 discussions

[Git][gajim/gajim][master] Fix shortcuts in chat window
by Philipp Hörist 27 Jan '18

27 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8a62a8b by Philipp Hörist at 2018-01-27T08:44:11+01:00 Fix shortcuts in chat window Fixes #8873 - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/message_window.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -681,6 +681,7 @@ class GroupchatControl(ChatControlBase): app.interface.add_gc_bookmark( self.account, self.name, self.room_jid, '0', '0', password, self.nick) + self.update_actions() def _on_request_voice(self, action, param): """ ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -374,7 +374,9 @@ class MessageWindow(object): if keyval == Gdk.KEY_h: # CTRL + h if Gtk.Settings.get_default().get_property( 'gtk-key-theme-name') != 'Emacs': - control._on_history_menuitem_activate() + arg = GLib.Variant('s', 'none') + self.window.lookup_action( + 'browse-history-%s' % control.control_id).activate(arg) return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == Gdk.KEY_f: # CTRL + f @@ -386,7 +388,8 @@ class MessageWindow(object): app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: app.interface.roster.tree.grab_focus() return False - control._on_send_file_menuitem_activate(None) + self.window.lookup_action( + 'send-file-%s' % control.control_id).activate() return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == Gdk.KEY_g: # CTRL + g @@ -394,7 +397,8 @@ class MessageWindow(object): return True elif control.type_id in (message_control.TYPE_CHAT, message_control.TYPE_PM) and keyval == Gdk.KEY_i: # CTRL + i - control._on_contact_information_menuitem_activate(None) + self.window.lookup_action( + 'information-%s' % control.control_id).activate() return True elif keyval == Gdk.KEY_l or keyval == Gdk.KEY_L: # CTRL + l|L control.conv_textview.clear() @@ -408,7 +412,8 @@ class MessageWindow(object): # theme if not Gtk.Settings.get_default().get_property( 'gtk-key-theme-name') == 'Emacs': - control._on_bookmark_room_menuitem_activate(None) + self.window.lookup_action( + 'bookmark-%s' % control.control_id).activate() return True # Tab switch bindings elif keyval == Gdk.KEY_F4: # CTRL + F4 @@ -436,7 +441,8 @@ class MessageWindow(object): # CTRL + SHIFT if control.type_id == message_control.TYPE_GC and \ keyval == Gdk.KEY_n: # CTRL + SHIFT + n - control._on_change_nick_menuitem_activate(None) + self.window.lookup_action( + 'change-nick-%s' % control.control_id).activate() return True # MOD1 (ALT) mask elif modifier & Gdk.ModifierType.MOD1_MASK: @@ -461,7 +467,8 @@ class MessageWindow(object): return True elif control.type_id == message_control.TYPE_GC and \ keyval == Gdk.KEY_t: # ALT + t - control._on_change_subject_menuitem_activate(None) + self.window.lookup_action( + 'change-subject-%s' % control.control_id).activate() return True # Close tab bindings elif keyval == Gdk.KEY_Escape and \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8a62a8bb22f3577bc4e10442745b49c87… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8a62a8bb22f3577bc4e10442745b49c87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add complex caps test
by Philipp Hörist 26 Jan '18

26 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7dacd51c by Philipp Hörist at 2018-01-26T23:57:32+01:00 Add complex caps test - - - - - 32e23ff5 by Philipp Hörist at 2018-01-26T23:58:24+01:00 Remove unused code in resolver test - - - - - 3 changed files: - gajim/common/connection_handlers_events.py - test/integration/test_resolver.py - test/unit/test_caps_cache.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -2318,18 +2318,31 @@ class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if self.id_ in self.conn.disco_info_ids: self.conn.disco_info_ids.remove(self.id_) if self.id_ is None: - log.warning('Invalid IQ received without an ID. Ignoring it: %s' % \ - self.stanza) + log.warning('Invalid IQ received without an ID. ' + 'Ignoring it: %s', self.stanza) return # According to XEP-0030: # For identity: category, type is mandatory, name is optional. # For feature: var is mandatory - self.identities, self.features, self.data = [], [], [] - q = self.stanza.getTag('query') - self.node = q.getAttr('node') - if not self.node: - self.node = '' - qc = self.stanza.getQueryChildren() + self.identities, self.features, self.data, self.node = self.parse_stanza(self.stanza) + + if not self.identities: + # ejabberd doesn't send identities when we browse online users + # see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 + self.identities = [{'category': 'server', 'type': 'im', + 'name': self.node}] + self.get_jid_resource() + return True + + @classmethod + def parse_stanza(cls, stanza): + identities, features, data, node = [], [], [], None + q = stanza.getTag('query') + node = q.getAttr('node') + if not node: + node = '' + + qc = stanza.getQueryChildren() if not qc: qc = [] @@ -2338,21 +2351,15 @@ class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): attr = {} for key in i.getAttrs().keys(): attr[key] = i.getAttr(key) - self.identities.append(attr) + identities.append(attr) elif i.getName() == 'feature': var = i.getAttr('var') if var: - self.features.append(var) + features.append(var) elif i.getName() == 'x' and i.getNamespace() == nbxmpp.NS_DATA: - self.data.append(nbxmpp.DataForm(node=i)) + data.append(nbxmpp.DataForm(node=i)) - if not self.identities: - # ejabberd doesn't send identities when we browse online users - # see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 - self.identities = [{'category': 'server', 'type': 'im', - 'name': self.node}] - self.get_jid_resource() - return True + return identities, features, data, node class AgentInfoErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'agent-info-error-received' ===================================== test/integration/test_resolver.py ===================================== --- a/test/integration/test_resolver.py +++ b/test/integration/test_resolver.py @@ -26,20 +26,14 @@ class TestResolver(unittest.TestCase): network connection. ''' def setUp(self): - self.idlequeue_thread = IdleQueueThread() - self.idlequeue_thread.start() self.main_context = GLib.MainContext() self.main_context.push_thread_default() self.main_loop = GLib.MainLoop(self.main_context) - - self.iq = self.idlequeue_thread.iq self._reset() self.resolver = None def tearDown(self): self.main_context.pop_thread_default() - self.idlequeue_thread.stop_thread() - self.idlequeue_thread.join() def _reset(self): self.expect_results = False ===================================== test/unit/test_caps_cache.py ===================================== --- a/test/unit/test_caps_cache.py +++ b/test/unit/test_caps_cache.py @@ -6,12 +6,46 @@ import unittest import lib lib.setup_env() -from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM +from nbxmpp import NS_MUC, NS_PING, NS_XHTML_IM, Iq from gajim.common import caps_cache as caps from gajim.common.contacts import Contact +from gajim.common.connection_handlers_events import AgentInfoReceivedEvent from mock import Mock +COMPLEX_EXAMPLE = ''' +<iq from='benvolio(a)capulet.lit/230193' id='disco1' to='juliet(a)capulet.lit/chamber' type='result'> +<query xmlns='http://jabber.org/protocol/disco#info' node='http://psi-im.org#q07IKJEyjvHSyhy//CH0CxmKi8w='> +<identity xml:lang='en' category='client' name='Psi 0.11' type='pc'/> +<identity xml:lang='el' category='client' name='Ψ 0.11' type='pc'/> +<feature var='http://jabber.org/protocol/caps'/> +<feature var='http://jabber.org/protocol/disco#info'/> +<feature var='http://jabber.org/protocol/disco#items'/> +<feature var='http://jabber.org/protocol/muc'/> +<x xmlns='jabber:x:data' type='result'> +<field var='FORM_TYPE' type='hidden'> +<value>urn:xmpp:dataforms:softwareinfo</value> +</field> +<field var='ip_version'> +<value>ipv4</value> +<value>ipv6</value> +</field> +<field var='os'> +<value>Mac</value> +</field> +<field var='os_version'> +<value>10.5.1</value> +</field> +<field var='software'> +<value>Psi</value> +</field> +<field var='software_version'> +<value>0.11</value> +</field> +</x> +</query> +</iq>''' + class CommonCapsTest(unittest.TestCase): @@ -93,8 +127,10 @@ class TestCapsCache(CommonCapsTest): def test_hash(self): '''tests the hash computation''' - computed_hash = caps.compute_caps_hash(self.identities, self.features) - self.assertEqual(self.caps_hash, computed_hash) + stanza = Iq(node=COMPLEX_EXAMPLE) + identities, features, data, _ = AgentInfoReceivedEvent.parse_stanza(stanza) + computed_hash = caps.compute_caps_hash(identities, features, data) + self.assertEqual('q07IKJEyjvHSyhy//CH0CxmKi8w=', computed_hash) class TestClientCaps(CommonCapsTest): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/737b5ae04ae623f3481b3dbd367aba0bb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/737b5ae04ae623f3481b3dbd367aba0bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.3
by Philipp Hörist 26 Jan '18

26 Jan '18

Philipp Hörist pushed new tag nbxmpp-0.6.3 at gajim / python-nbxmpp --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.3 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Deleted tag nbxmpp-0.6.3
by Philipp Hörist 26 Jan '18

26 Jan '18

Philipp Hörist deleted tag nbxmpp-0.6.3 at gajim / python-nbxmpp --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Deleted tag nbxmpp-0.6.3
by Philipp Hörist 26 Jan '18

26 Jan '18

Philipp Hörist deleted tag nbxmpp-0.6.3 at gajim / python-nbxmpp --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.3
by Philipp Hörist 26 Jan '18

26 Jan '18

1 0

[Git][gajim/python-nbxmpp][master] prepare 0.6.3 release
by Philipp Hörist 26 Jan '18

26 Jan '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0f3e1ba0 by Philipp Hörist at 2018-01-26T18:58:04+01:00 prepare 0.6.3 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -python-nbxmpp 0.6.3 (TBA) +python-nbxmpp 0.6.3 (26 January 2018) * Add ALPN and SNI support for when using DirectTLS * Bugfixes ===================================== 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.6.2" +__version__ = "0.6.3" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.2', + version='0.6.3', 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/0f3e1ba0e442091667c57ca5f6… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0f3e1ba0e442091667c57ca5f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Windows build
by Philipp Hörist 25 Jan '18

25 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 737b5ae0 by Philipp Hörist at 2018-01-25T23:17:18+01:00 Fix Windows build - - - - - 3 changed files: - appveyor.yml - win/_base.sh - win/build.sh Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,6 @@ environment: - matrix: - - MSYS: "C:\\msys64\\mingw32.exe" + - MSYS: C:/msys64/mingw32 branches: only: @@ -15,24 +14,20 @@ clone_depth: 1 install: - ps: | - function bash($command) { - Write-Host $command -NoNewline - cmd /c start /wait C:\msys64\usr\bin\sh.exe --login -c $command - Write-Host " - OK" -ForegroundColor Green - } - - bash 'pacman -Sy --noconfirm git' - bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim' - - - cmd: '%MSYS% C:/msys64/home/appveyor/gajim/win/build.sh' - # Ugly workaround, because i found no way to tell when mingw32.exe returns - - cmd: timeout 1100 - - # Push Installer Exe - - ps: $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() - - ps: $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" - - ps: Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe" - - ps: Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe" + $env:MSYSTEM="MINGW32" + $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() + $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" + + function bash($command) { + Write-Host $command -NoNewline + C:\msys64\usr\bin\sh.exe --login -c $command + } + + bash 'pacman -Sy --noconfirm git' + bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim' + bash 'C:/msys64/home/appveyor/gajim/win/build.sh' + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe" build: off ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -164,9 +164,7 @@ function cleanup_install { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gnome-common || true build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gsl || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-libvpx || true #delete translations we don't support for d in "${MINGW_ROOT}"/share/locale/*/LC_MESSAGES; do ===================================== win/build.sh ===================================== --- a/win/build.sh +++ b/win/build.sh @@ -12,14 +12,6 @@ source "$DIR"/_base.sh function main { local GIT_TAG=${1:-"master"} - [[ -d "${BUILD_ROOT}" ]] && (echo "${BUILD_ROOT} already exists"; exit 1) - - # started from the wrong env -> switch - if [ $(echo "$MSYSTEM" | tr '[A-Z]' '[a-z]') != "$MINGW" ]; then - "/${MINGW}.exe" "$0" - exit $? - fi - install_pre_deps create_root install_deps View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/737b5ae04ae623f3481b3dbd367aba0bb2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/737b5ae04ae623f3481b3dbd367aba0bb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Inlcude account for message deduplication
by Philipp Hörist 24 Jan '18

24 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4c545be7 by Philipp Hörist at 2018-01-25T00:47:00+01:00 Inlcude account for message deduplication It was not possible to write with 2 different accounts into the same MUC - - - - - 3 changed files: - gajim/common/connection_handlers_events.py - gajim/common/logger.py - gajim/common/message_archiving.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1061,6 +1061,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.nick = None def generate(self): + account = self.conn.name archive_jid = self.stanza.getFrom() own_jid = self.conn.get_own_jid() if archive_jid and not archive_jid.bareMatch(own_jid): @@ -1076,7 +1077,8 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.unique_id, origin_id = self.get_unique_id() # Check for duplicates - if app.logger.find_stanza_id(own_jid.getStripped(), + if app.logger.find_stanza_id(account, + own_jid.getStripped(), self.unique_id, origin_id): return @@ -1151,6 +1153,7 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.kind = KindConstant.GC_MSG def generate(self): + account = self.conn.name self.msg_ = self.forwarded.getTag('message', protocol=True) if self.msg_.getType() != 'groupchat': @@ -1161,7 +1164,9 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.unique_id = self.get_stanza_id(self.result, query=True) # Check for duplicates - if app.logger.find_stanza_id(self.room_jid, self.unique_id, + if app.logger.find_stanza_id(account, + self.room_jid, + self.unique_id, groupchat=True): return @@ -1285,7 +1290,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): # Check groupchat messages for duplicates, # We do this because of MUC History messages if self.stanza.getType() == 'groupchat': - if app.logger.find_stanza_id(self.stanza.getFrom().getStripped(), + if app.logger.find_stanza_id(account, + self.stanza.getFrom().getStripped(), self.unique_id, groupchat=True): return ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1057,10 +1057,12 @@ class Logger: self.con.executescript(sql) self._timeout_commit() - def search_for_duplicate(self, jid, timestamp, msg): + def search_for_duplicate(self, account, jid, timestamp, msg): """ Check if a message is already in the `logs` table + :param account: The account + :param jid: The jid as string :param timestamp: The timestamp in UTC epoch @@ -1072,27 +1074,31 @@ class Logger: start_time = timestamp - 10 end_time = timestamp + 10 + account_id = self.get_account_id(account) log.debug('start: %s, end: %s, jid: %s, message: %s', start_time, end_time, jid, msg) sql = ''' SELECT * FROM logs - NATURAL JOIN jids WHERE jid = ? AND message = ? + NATURAL JOIN jids WHERE jid = ? AND message = ? AND account_id = ? AND time BETWEEN ? AND ? ''' - result = self.con.execute(sql, (jid, msg, start_time, end_time)).fetchone() + result = self.con.execute( + sql, (jid, msg, account_id, start_time, end_time)).fetchone() if result is not None: log.debug('Message already in DB') return True return False - def find_stanza_id(self, archive_jid, stanza_id, origin_id=None, + def find_stanza_id(self, account, archive_jid, stanza_id, origin_id=None, groupchat=False): """ Checks if a stanza-id is already in the `logs` table + :param account: The account + :param archive_jid: The jid of the archive the stanza-id belongs to :param stanza_id: The stanza-id @@ -1113,22 +1119,30 @@ class Logger: return False archive_id = self.get_jid_id(archive_jid) + account_id = self.get_account_id(account) + if groupchat: - column = 'jid_id' + # Stanza ID is only unique within a specific archive. + # So a Stanza ID could be repeated in different MUCs, so we + # filter also for the archive JID + sql = ''' + SELECT stanza_id FROM logs + WHERE stanza_id IN ({values}) + AND jid_id = ? AND account_id = ? LIMIT 1 + '''.format(values=', '.join('?' * len(ids))) + result = self.con.execute( + sql, tuple(ids) + (archive_id, account_id)).fetchone() else: - column = 'account_id' - - sql = ''' - SELECT stanza_id FROM logs - WHERE stanza_id IN ({values}) AND {archive} = ? LIMIT 1 - '''.format(values=', '.join('?' * len(ids)), - archive=column) - - result = self.con.execute(sql, tuple(ids) + (archive_id,)).fetchone() + sql = ''' + SELECT stanza_id FROM logs + WHERE stanza_id IN ({values}) AND account_id = ? LIMIT 1 + '''.format(values=', '.join('?' * len(ids))) + result = self.con.execute( + sql, tuple(ids) + (account_id,)).fetchone() if result is not None: - log.info('Found duplicated message, stanza-id: %s, origin-id: %s', - stanza_id, origin_id) + log.info('Found duplicated message, stanza-id: %s, origin-id: %s, ' + 'archive-jid: %s, account: %s', stanza_id, origin_id, archive_id, account_id) return True return False ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -203,7 +203,7 @@ class ConnectionArchive313: # if self.archiving_namespace != nbxmpp.NS_MAM_2: # Fallback duplicate search without stanza-id duplicate = app.logger.search_for_duplicate( - obj.with_, obj.timestamp, obj.msgtxt) + self.name, obj.with_, obj.timestamp, obj.msgtxt) if duplicate: # dont propagate the event further return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c545be737b66f5074592ad5f2f197643e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c545be737b66f5074592ad5f2f197643e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: MusicTrackListener: add support for clementine
by Yann Leboulanger 24 Jan '18

24 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7d2bbf92 by André Apitzsch at 2018-01-24T23:28:24+01:00 MusicTrackListener: add support for clementine - - - - - 137b69c0 by André Apitzsch at 2018-01-24T23:28:56+01:00 MusicTrackListener: remove unused code - - - - - 90bc646b by Yann Leboulanger at 2018-01-24T23:35:20+01:00 Merge branch 'musiclistener' into 'master' MusicTrackListener: add support for clementine See merge request gajim/gajim!199 - - - - - 1 changed file: - gajim/music_track_listener.py Changes: ===================================== gajim/music_track_listener.py ===================================== --- a/gajim/music_track_listener.py +++ b/gajim/music_track_listener.py @@ -35,6 +35,7 @@ def _get_music_players(): players = [ 'org.mpris.MediaPlayer2.audacious', 'org.mpris.MediaPlayer2.bmp', + 'org.mpris.MediaPlayer2.clementine', 'org.mpris.MediaPlayer2.GnomeMusic', 'org.mpris.MediaPlayer2.quodlibet', 'org.mpris.MediaPlayer2.rhythmbox', @@ -65,7 +66,6 @@ class MusicTrackListener(GObject.GObject): def __init__(self): super(MusicTrackListener, self).__init__() - self._last_playing_music = None self.con = {} players = _get_music_players() @@ -92,7 +92,6 @@ class MusicTrackListener(GObject.GObject): info = self.get_playing_track(name) if info is not None: - self._last_playing_music = info self.emit('music-track-changed', info) def _vanished(self, connection, name, *user_data): @@ -114,7 +113,6 @@ class MusicTrackListener(GObject.GObject): log.info('Signal received: %s - %s', interface_name, parameters) info = self.get_playing_track(user_data[0]) - self._last_playing_music = info self.emit('music-track-changed', info) @@ -166,7 +164,6 @@ class MusicTrackListener(GObject.GObject): raise else: info = self._properties_extract(result[0]) - self._last_playing_music = info return info View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8cdad276bfc6f957b0039bb63f0687b2d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8cdad276bfc6f957b0039bb63f0687b2d… You're receiving this email because of your account on dev.gajim.org.

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 2018