Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] MAM: Keep date filter on subsequent page requests
by Philipp Hörist 11 Apr '20

11 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 07a8c98d by lovetox at 2020-04-11T10:13:37+02:00 MAM: Keep date filter on subsequent page requests - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -399,9 +399,10 @@ class MAM(BaseModule): self._nbxmpp('MAM').make_query(result.jid, queryid, after=result.rsm.last, + start=start_date, callback=self._result_finished, user_data={'queryid': queryid, - 'start': None, + 'start': start_date, 'groupchat': groupchat}) def request_archive_interval(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07a8c98d6dc4050b4a3e1870ca9860e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07a8c98d6dc4050b4a3e1870ca9860e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Presence: Change default for priority to 0
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ecfd7c0 by lovetox at 2020-04-10T22:33:33+02:00 Presence: Change default for priority to 0 - - - - - 083d8520 by lovetox at 2020-04-10T23:19:53+02:00 Client: Add priority property - - - - - 82a18e6f by lovetox at 2020-04-10T23:20:44+02:00 MUC: Don't add caps when sending unavailable presence - - - - - 3 changed files: - gajim/common/client.py - gajim/common/config.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/client.py ===================================== @@ -56,7 +56,7 @@ class Client(ConnectionHandlers): self._user = app.config.get_per('accounts', self._account, 'name') self.password = None - self.priority = 0 + self._priority = 0 self.handlers_registered = False self._connect_machine_calls = 0 self.avatar_conversion = False @@ -102,6 +102,10 @@ class Client(ConnectionHandlers): def status_message(self): return self._status_message + @property + def priority(self): + return self._priority + @property def certificate(self): return self._client.peer_certificate[0] @@ -356,16 +360,14 @@ class Client(ConnectionHandlers): destroy_client=True) return - priority = app.get_priority(self._account, show) + self._priority = app.get_priority(self._account, show) self.get_module('Presence').send_presence( - priority=priority, + priority=self._priority, show=show, status=msg, idle_time=auto) - self.priority = priority - self.get_module('MUC').update_presence(auto=auto) app.nec.push_incoming_event( @@ -397,15 +399,13 @@ class Client(ConnectionHandlers): self._send_first_presence() def _send_first_presence(self): - priority = app.get_priority(self._account, self._status) + self._priority = app.get_priority(self._account, self._status) self.get_module('Presence').send_presence( - priority=priority, + priority=self._priority, show=self._status, status=self._status_message) - self.priority = priority - self._set_client_available() if not self.avatar_conversion: ===================================== gajim/common/config.py ===================================== @@ -287,8 +287,8 @@ class Config: 'savepass': [opt_bool, False], 'password': [opt_str, ''], 'resource': [opt_str, 'gajim.$rand', '', True], - 'priority': [opt_int, 5, '', True], - 'adjust_priority_with_status': [opt_bool, True, _('Priority will change automatically according to your status. Priorities are defined in \'autopriority_*\' options.')], + 'priority': [opt_int, 0, '', True], + 'adjust_priority_with_status': [opt_bool, False, _('Priority will change automatically according to your status. Priorities are defined in \'autopriority_*\' options.')], 'autopriority_online': [opt_int, 50], 'autopriority_chat': [opt_int, 50], 'autopriority_away': [opt_int, 40], ===================================== gajim/common/modules/muc.py ===================================== @@ -215,7 +215,8 @@ class MUC(BaseModule): self._con.get_module('Presence').send_presence( muc_data.occupant_jid, typ='unavailable', - status=reason) + status=reason, + caps=False) # We leave a group chat, disable bookmark autojoin self._con.get_module('Bookmarks').modify(room_jid, autojoin=False) @@ -303,7 +304,6 @@ class MUC(BaseModule): muc_data.occupant_jid, show=self._con.status, status=self._con.status_message, - caps=True, idle_time=auto) def change_nick(self, room_jid, new_nick): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/482a79e5136986777a346f1ad33bca5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/482a79e5136986777a346f1ad33bca5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Remove ping timer when peer closes connection
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d8b35aca by lovetox at 2020-04-10T22:22:29+02:00 Client: Remove ping timer when peer closes connection - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -417,6 +417,8 @@ class Client(Observable): def _on_disconnected(self, _connection, _signal_name): self.state = StreamState.DISCONNECTED + self._remove_ping_timer() + self._dispatcher.remove_ping_callback(self._ping_id) self._reset_stream() self.notify('disconnected') @@ -449,6 +451,7 @@ class Client(Observable): if not self._stream_close_initiated: self.state = StreamState.DISCONNECTING self._remove_ping_timer() + self._dispatcher.remove_ping_callback(self._ping_id) self._smacks.close_session() self._end_stream() self._con.shutdown_output() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d8b35aca9095e7a3d6b43c09… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d8b35aca9095e7a3d6b43c09… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManager: Require GTK 3.0
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 482a79e5 by lovetox at 2020-04-10T19:05:28+02:00 HistoryManager: Require GTK 3.0 - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== @@ -32,6 +32,14 @@ import getopt import sqlite3 from enum import IntEnum, unique +import gi + +try: + gi.require_versions({'Gtk': '3.0'}) +except ValueError as error: + sys.exit('Missing dependency: %s' % error) + +# pylint: disable=C0413 from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib @@ -80,7 +88,6 @@ if is_standalone(): configpaths.init() app.load_css_config() -# pylint: disable=C0413 from gajim.common import helpers from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import NewConfirmationDialog View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/482a79e5136986777a346f1ad33bca5a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/482a79e5136986777a346f1ad33bca5a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Replace deprecated test command
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 324b695c by André Apitzsch at 2020-04-10T15:17:27+02:00 Replace deprecated test command - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -18,7 +18,7 @@ run-tests: - mypy -V - mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim - - python3 setup.py test -s test.no_gui + - python3 -m unittest discover -s test/no_gui -v - deactivate - rm -rf civenv-master View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/324b695c7c7e2c99bf32ab671df4c27d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/324b695c7c7e2c99bf32ab671df4c27d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Test: Fix htmltextview test
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4786d0ba by lovetox at 2020-04-10T14:57:48+02:00 Test: Fix htmltextview test - - - - - 1 changed file: - test/gtk/htmltextview.py Changes: ===================================== test/gtk/htmltextview.py ===================================== @@ -8,6 +8,7 @@ from gajim.common import app from gajim.common import configpaths configpaths.init() from gajim.common import caps_cache +from gajim.common.helpers import AdditionalDataDict from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface @@ -15,6 +16,7 @@ from gajim.gui_interface import Interface caps_cache.capscache = MagicMock() app.plugin_manager = MagicMock() app.logger = MagicMock() +app.cert_store = MagicMock() app.interface = Interface() @@ -204,7 +206,10 @@ class TextviewWindow(Gtk.Window): def _print_xhtml(self): for xhtml in XHTML: - self._textview.print_real_text(None, xhtml=xhtml) + additional_data = AdditionalDataDict() + additional_data.set_value('gajim', 'xhtml', xhtml) + self._textview.print_real_text(None, additional_data=additional_data) + self._textview.print_real_text('\n') win = TextviewWindow() win.connect("destroy", Gtk.main_quit) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4786d0ba201240bfe27412b2c8fb9ddd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4786d0ba201240bfe27412b2c8fb9ddd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Appdata: Remove provides id
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f5087c03 by André Apitzsch at 2020-04-10T13:48:56+02:00 Appdata: Remove provides id gajim.desktop isn't provided since 1.0.0. The change might fix detection of Gajim nightly in GNOME software. - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -2,9 +2,6 @@  <component type="desktop-application"> <id>org.gajim.Gajim</id> - <provides> - <id>gajim.desktop</id> - </provides> <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-3.0</project_license> <name>Gajim</name> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5087c03a4ca7611606f7289ec4244dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5087c03a4ca7611606f7289ec4244dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Use devel icon instead of file name prefix
by André 10 Apr '20

10 Apr '20

André pushed to branch master at gajim / gajim Commits: a0e24a43 by André Apitzsch at 2020-04-10T12:08:29+02:00 Flatpak: Use devel icon instead of file name prefix - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -7,7 +7,6 @@ tags: - devel - development - nightly -desktop-file-name-prefix: '(Nightly) ' rename-icon: org.gajim.Gajim rename-desktop-file: org.gajim.Gajim.desktop rename-appdata-file: org.gajim.Gajim.appdata.xml @@ -221,5 +220,6 @@ modules: commands: - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in + - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg post-install: - install -d /app/plugins View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a0e24a43a16fd947d12ab73ba7c1a8c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a0e24a43a16fd947d12ab73ba7c1a8c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Presence: Refactor sending presence
by Philipp Hörist 10 Apr '20

10 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6eff7aaa by lovetox at 2020-04-10T10:18:48+02:00 Presence: Refactor sending presence - - - - - 3 changed files: - gajim/common/client.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py Changes: ===================================== gajim/common/client.py ===================================== @@ -13,7 +13,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging -import time import nbxmpp from nbxmpp.client import Client as NBXMPPClient @@ -27,7 +26,6 @@ from gajim.common.nec import NetworkEvent from gajim.common import app from gajim.common import helpers -from gajim.common import idle from gajim.common import modules from gajim.common.const import ClientState from gajim.common.helpers import get_encryption_method @@ -358,15 +356,20 @@ class Client(ConnectionHandlers): destroy_client=True) return - idle_time = None - if auto: - if app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = idle.Monitor.get_idle_sec() - idle_time = time.strftime( - '%Y-%m-%dT%H:%M:%SZ', - time.gmtime(time.time() - idle_sec)) + priority = app.get_priority(self._account, show) + + self.get_module('Presence').send_presence( + priority=priority, + show=show, + status=msg, + idle_time=auto) - self._update_status(show, msg, idle_time=idle_time) + self.priority = priority + + self.get_module('MUC').update_presence(auto=auto) + + app.nec.push_incoming_event( + OurShowEvent(None, conn=self, show=show)) def _register_new_handlers(self): for handler in modules.get_handlers(self): @@ -418,22 +421,6 @@ class Client(ConnectionHandlers): app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self)) modules.send_stored_publish(self._account) - def _update_status(self, show, msg, idle_time=None): - priority = app.get_priority(self._account, show) - - self.get_module('Presence').send_presence( - priority=priority, - show=show, - status=msg, - idle_time=idle_time) - - self.priority = priority - - self.get_module('MUC').update_presence() - - app.nec.push_incoming_event( - OurShowEvent(None, conn=self, show=show)) - def send_stanza(self, stanza): """ Send a stanza untouched ===================================== gajim/common/modules/muc.py ===================================== @@ -15,7 +15,6 @@ # XEP-0045: Multi-User Chat # XEP-0249: Direct MUC Invitations -import time import logging import nbxmpp @@ -36,7 +35,6 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import to_user_string from gajim.common.helpers import event_filter -from gajim.common import idle from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data from gajim.common.modules.base import BaseModule @@ -301,28 +299,12 @@ class MUC(BaseModule): mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, MUCJoinedState.JOINING]) for muc_data in mucs: - self._send_presence(muc_data, auto) - - def _send_presence(self, muc_data, auto): - message = self._con.status_message - - idle_time = None - if auto and app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = idle.Monitor.get_idle_sec() - idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', - time.gmtime(time.time() - idle_sec)) - - self._log.info('Send presence: %s, show: %s, ' - 'message: %s, idle_time: %s', - muc_data.occupant_jid, self._con.status, - message, idle_time) - - self._con.get_module('Presence').send_presence( - muc_data.occupant_jid, - show=self._con.status, - status=self._con.status_message, - caps=True, - idle_time=idle_time) + self._con.get_module('Presence').send_presence( + muc_data.occupant_jid, + show=self._con.status, + status=self._con.status_message, + caps=True, + idle_time=auto) def change_nick(self, room_jid, new_nick): self._con.get_module('Presence').send_presence( ===================================== gajim/common/modules/presence.py ===================================== @@ -21,6 +21,7 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.const import PresenceType from gajim.common import app +from gajim.common import idle from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant @@ -353,7 +354,7 @@ class Presence(BaseModule): def get_presence(self, to=None, typ=None, priority=None, show=None, status=None, nick=None, caps=True, - idle_time=None): + idle_time=False): if show not in ('chat', 'away', 'xa', 'dnd'): # Gajim sometimes passes invalid show values here # until this is fixed this is a workaround @@ -363,15 +364,21 @@ class Presence(BaseModule): nick_tag = presence.setTag('nick', namespace=nbxmpp.NS_NICK) nick_tag.setData(nick) - if idle_time is not None: - idle_node = presence.setTag('idle', namespace=nbxmpp.NS_IDLE) - idle_node.setAttr('since', idle_time) - if not self._con.avatar_conversion: # XEP-0398 not supported by server so # we add the avatar sha to our presence self._con.get_module('VCardAvatars').add_update_node(presence) + if (idle_time and + app.is_installed('IDLE') and + app.config.get('autoaway')): + idle_sec = idle.Monitor.get_idle_sec() + time_ = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) + + idle_node = presence.setTag('idle', namespace=nbxmpp.NS_IDLE) + idle_node.setAttr('since', time_) + caps = self._con.get_module('Caps').caps if caps is not None and typ != 'unavailable': presence.setTag('c', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6eff7aaafe613b404b17380528e8fb67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6eff7aaafe613b404b17380528e8fb67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatRoster: Update avatar on draw_contact()
by Philipp Hörist 09 Apr '20

09 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8407a387 by lovetox at 2020-04-09T23:53:00+02:00 GroupchatRoster: Update avatar on draw_contact() - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -385,6 +385,8 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): gc_contact = app.contacts.get_gc_contact( self._account, self.room_jid, nick) + self.draw_avatar(gc_contact) + if app.events.get_events(self._account, self.room_jid + '/' + nick): self._store[iter_][Column.EVENT] = True else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8407a387c9389016dfa5965727e89162… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8407a387c9389016dfa5965727e89162… 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