Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 2 commits: Protocol: Always return string
by Philipp Hörist 12 Feb '21

12 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3a279b51 by lovetox at 2021-02-11T22:37:11+01:00 Protocol: Always return string - - - - - ce28d895 by lovetox at 2021-02-12T20:31:03+01:00 Client: Remove GSSAPI from default mechanisms - - - - - 2 changed files: - nbxmpp/client.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -280,9 +280,6 @@ class Client(Observable): def mechs(self): return set(self._allowed_mechs or set(['SCRAM-SHA-256', 'SCRAM-SHA-1', - 'GSSAPI', - # 'SCRAM-SHA-256-PLUS', - # 'SCRAM-SHA-1-PLUS', 'PLAIN'])) def set_mechs(self, mechs): ===================================== nbxmpp/protocol.py ===================================== @@ -1344,7 +1344,7 @@ class Presence(Protocol): """ Return the status string of the message """ - return self.getTagData('status') + return self.getTagData('status') or '' def setPriority(self, val): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/9124cfca492beffa8eb53bb… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/9124cfca492beffa8eb53bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set account window stack as non-vhomogeneous
by Daniel Brötzmann 11 Feb '21

11 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c6fd3959 by mimi89999 at 2021-02-11T22:37:24+01:00 Set account window stack as non-vhomogeneous Closes #10438 - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -182,7 +182,7 @@ def __init__(self): self.set_hexpand(True) self.set_vexpand(True) self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - self._stack = Gtk.Stack() + self._stack = Gtk.Stack(vhomogeneous=False) self._stack.set_transition_type(Gtk.StackTransitionType.CROSSFADE) self._stack.add_named(AddNewAccountPage(), 'add-account') self.get_style_context().add_class('accounts-settings') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6fd3959f81de8f412e49ba49076ba10… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6fd3959f81de8f412e49ba49076ba10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Errors: Add get_text() for base class
by Philipp Hörist 11 Feb '21

11 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9124cfca by lovetox at 2021-02-11T20:39:10+01:00 Errors: Add get_text() for base class - - - - - 1 changed file: - nbxmpp/errors.py Changes: ===================================== nbxmpp/errors.py ===================================== @@ -32,6 +32,9 @@ class BaseError(Exception): def __str__(self): return self.text + def get_text(self): + return self.text + class StanzaError(BaseError): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9124cfca492beffa8eb53bb5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9124cfca492beffa8eb53bb5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Show indicator for group chats
by Daniel Brötzmann 09 Feb '21

09 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f3e924e8 by Daniel Brötzmann at 2021-02-09T19:40:21+01:00 ChatList: Show indicator for group chats - - - - - 3 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -52,13 +52,41 @@ <property name="can-focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="name_label"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="group_chat_indicator"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">system-users-symbolic</property> + <property name="icon_size">1</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -153,6 +153,9 @@ .chatlist-row:selected button:hover { border-color: @insensitive_fg_color; } +.chatlist-row:selected image { + color: @theme_fg_color; +} .chatlist-row overlay > box { padding: 6px; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -202,6 +202,9 @@ def __init__(self, workspace_id, account, jid, type_): if len(app.get_enabled_accounts_with_labels()) > 1: self._ui.account_identifier.show() + if self.type == 'groupchat': + self._ui.group_chat_indicator.show() + self.update_avatar() self.update_name() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f3e924e8c58529e6dbf04046afad0e73… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f3e924e8c58529e6dbf04046afad0e73… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Add avatar and name for PMs
by Daniel Brötzmann 09 Feb '21

09 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 88d8b3e5 by Daniel Brötzmann at 2021-02-09T19:21:09+01:00 ChatList: Add avatar and name for PMs - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -233,9 +233,19 @@ def __init__(self, workspace_id, account, jid, type_): self.show_all() def update_avatar(self): - contact = app.contacts.get_contact(self.account, self.jid) - scale = self.get_scale_factor() + + if self.type == 'pm': + jid, resource = app.get_room_and_nick_from_fjid(self.jid) + contact = app.contacts.get_gc_contact( + self.account, jid, resource) + avatar = contact.get_avatar(AvatarSize.ROSTER, + scale, + contact.show.value) + self._ui.avatar_image.set_from_surface(avatar) + return + + contact = app.contacts.get_contact(self.account, self.jid) if contact: if contact.is_groupchat: avatar = app.contacts.get_avatar(self.account, @@ -257,6 +267,16 @@ def update_avatar(self): self._ui.avatar_image.set_from_surface(avatar) def update_name(self): + if self.type == 'pm': + jid, resource = app.get_room_and_nick_from_fjid(self.jid) + contact = app.contacts.get_gc_contact( + self.account, jid, resource) + client = app.get_client(self.account) + muc_name = get_groupchat_name(client, jid) + self._ui.name_label.set_text( + f'{contact.get_shown_name()} ({muc_name})') + return + contact = app.contacts.get_contact(self.account, self.jid) if contact is None: self._ui.name_label.set_text(self.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88d8b3e58fb45dd415a42220511c931e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88d8b3e58fb45dd415a42220511c931e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ChatControl: Remove shortcut from tooltip
by Daniel Brötzmann 09 Feb '21

09 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1692f3ed by Daniel Brötzmann at 2021-02-09T17:28:00+01:00 ChatControl: Remove shortcut from tooltip - - - - - 76501abf by Daniel Brötzmann at 2021-02-09T18:04:57+01:00 Preferences: Check for pipeline before removing elements Fixes #10430 - - - - - 3 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/video_preview.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -664,7 +664,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -426,7 +426,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== gajim/gtk/video_preview.py ===================================== @@ -98,12 +98,14 @@ def _enable_preview(self): def _disable_preview(self): if self._av_pipeline is not None: self._av_pipeline.set_state(Gst.State.NULL) - if self._av_src is not None: - self._av_pipeline.remove(self._av_src) - self._av_src = None - if self._av_sink is not None: - self._av_pipeline.remove(self._av_sink) - self._av_sink = None + if self._av_src is not None: + self._av_pipeline.remove(self._av_src) + if self._av_sink is not None: + self._av_pipeline.remove(self._av_sink) + + self._av_src = None + self._av_sink = None + if self._av_widget is not None: self._ui.video_preview_box.remove(self._av_widget) self._ui.video_preview_placeholder.set_visible(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c93d1170232fd53909408b973e9fbf6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c93d1170232fd53909408b973e9fbf6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dispatcher: Enable roster module
by Philipp Hörist 08 Feb '21

08 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 58456bde by lovetox at 2021-02-08T23:03:48+01:00 Dispatcher: Enable roster module - - - - - 2 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/roster.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -81,6 +81,7 @@ from nbxmpp.modules.vcard_temp import VCardTemp from nbxmpp.modules.vcard4 import VCard4 from nbxmpp.modules.ping import Ping from nbxmpp.modules.delimiter import Delimiter +from nbxmpp.modules.roster import Roster from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -191,6 +192,7 @@ class StanzaDispatcher(Observable): self._modules['VCard4'] = VCard4(self._client) self._modules['Ping'] = Ping(self._client) self._modules['Delimiter'] = Delimiter(self._client) + self._modules['Roster'] = Roster(self._client) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/roster.py ===================================== @@ -23,7 +23,7 @@ from nbxmpp.protocol import JID from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import RosterData from nbxmpp.structs import RosterItem -from nbxmpp.structs import StanzaHandler +# from nbxmpp.structs import StanzaHandler from nbxmpp.errors import StanzaError from nbxmpp.task import iq_request_task from nbxmpp.modules.base import BaseModule View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/58456bde9c454510b9003846… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/58456bde9c454510b9003846… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Presence: Add methods for sending presence
by Philipp Hörist 08 Feb '21

08 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b5f7007a by lovetox at 2021-02-08T22:51:02+01:00 Presence: Add methods for sending presence - - - - - 4aa0825d by lovetox at 2021-02-08T23:02:14+01:00 Add Roster module - - - - - 3 changed files: - nbxmpp/modules/presence.py - + nbxmpp/modules/roster.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/presence.py ===================================== @@ -18,6 +18,8 @@ from nbxmpp.protocol import Error as ErrorStanza from nbxmpp.protocol import ERR_BAD_REQUEST from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Presence +from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler from nbxmpp.util import error_factory from nbxmpp.const import PresenceType @@ -90,3 +92,62 @@ class BasePresence(BaseModule): self._log.warning('Presence with invalid show') self._log.warning(stanza) return PresenceShow.ONLINE + + def unsubscribe(self, jid): + self.send(jid=jid, typ='unsubscribe') + + def unsubscribed(self, jid): + self.send(jid=jid, typ='unsubscribed') + + def subscribed(self, jid): + self.send(jid=jid, typ='subscribed') + + def subscribe(self, jid, status=None, nick=None): + self.send(jid=jid, typ='subscribe', status=status, nick=nick) + + def send(self, + jid=None, + typ=None, + priority=None, + show=None, + status=None, + nick=None, + caps=None, + idle_time=None, + signed=None, + muc=False, + muc_history=None, + muc_password=None, + extend=None): + + if show is not None and show not in ('chat', 'away', 'xa', 'dnd'): + raise ValueError('Invalid show value: %s' % show) + + presence = Presence(jid, typ, priority, show, status) + if nick is not None: + nick_tag = presence.setTag('nick', namespace=Namespace.NICK) + nick_tag.setData(nick) + + if idle_time is not None: + idle_node = presence.setTag('idle', namespace=Namespace.IDLE) + idle_node.setAttr('since', idle_time) + + if caps is not None and typ != 'unavailable': + presence.setTag('c', namespace=Namespace.CAPS, attrs=caps) + + if signed is not None: + presence.setTag(Namespace.SIGNED + ' x').setData(signed) + + if muc or muc_history is not None or muc_password is not None: + muc_x = presence.setTag(Namespace.MUC + ' x') + if muc_history is not None: + muc_x.setTag('history', muc_history) + + if muc_password is not None: + muc_x.setTagData('password', muc_password) + + if extend is not None: + for node in extend: + presence.addChild(node=node) + + self._con.send_stanza(presence) ===================================== nbxmpp/modules/roster.py ===================================== @@ -0,0 +1,147 @@ +# Copyright (C) 2021 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + + +from nbxmpp.namespaces import Namespace +from nbxmpp.simplexml import Node +from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID +from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import RosterData +from nbxmpp.structs import RosterItem +from nbxmpp.structs import StanzaHandler +from nbxmpp.errors import StanzaError +from nbxmpp.task import iq_request_task +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response + + +class Roster(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [ + # StanzaHandler(name='iq', + # callback=self._process_roster_push, + # typ='set', + # priority=15, + # ns=Namespace.ROSTER), + ] + + @iq_request_task + def request_roster(self, version=None): + _task = yield + + self._log.info('Request Roster, version: %s', version) + response = yield _make_request(version) + if response.isError(): + raise StanzaError(response) + + yield _parse_push(response) + + def _process_roster_push(self, _client, stanza, properties): + from_ = stanza.getFrom() + if from_ is not None: + if not self._con.get_bound_jid().bare == from_: + self._log.warning('Malicious Roster Push from %s', from_) + raise NodeProcessed + + properties.roster = _parse_push(stanza) + + self._log.info('Roster Push, version: %s', properties.roster.version) + for item in properties.roster.items: + self._log.info(item) + + self._ack_roster_push(stanza) + + def _ack_roster_push(self, stanza): + iq = Iq('result', + to=stanza.getFrom(), + frm=stanza.getTo(), + attrs={'id': stanza.getID()}) + self._con.send_stanza(iq) + + @iq_request_task + def delete_item(self, jid): + _task = yield + + response = yield _make_delete(jid) + yield process_response(response) + + @iq_request_task + def set_item(self, jid, name, groups=None): + _task = yield + + response = yield _make_set(jid, name, groups) + yield process_response(response) + + +def _make_delete(jid): + return Iq('set', + Namespace.ROSTER, + payload=[Node('item', {'jid': jid, 'subscription': 'remove'})]) + + +def _make_set(jid, name, groups=None): + if groups is None: + groups = [] + + infos = {'jid': jid} + if name: + infos['name'] = name + iq = Iq('set', Namespace.ROSTER) + query = iq.setQuery() + item = query.addChild('item', attrs=infos) + for group in groups: + item.addChild('group').setData(group) + return iq + + +def _make_request(version): + iq = Iq('get', Namespace.ROSTER) + if version is not None: + iq.setTagAttr('query', 'ver', version) + return iq + + +def _get_item_attrs(item): + default_attrs = {'name': None, + 'ask': None, + 'subscription': None, + 'groups': []} + + attrs = item.getAttrs() + del attrs['jid'] + groups = {group.getData() for group in item.getTags('group')} + attrs['groups'] = list(groups) + + default_attrs.update(attrs) + return default_attrs + + +def _parse_push(stanza): + query = stanza.getTag('query', namespace=Namespace.ROSTER) + version = query.getAttr('ver') + pushed_items = [] + + for item in query.getTags('item'): + jid = JID.from_string(item.getAttr('jid')) + attrs = _get_item_attrs(item) + pushed_items.append(RosterItem(attrs, jid)) + + return RosterData(pushed_items, version) ===================================== nbxmpp/structs.py ===================================== @@ -126,6 +126,9 @@ MAMQueryData = namedtuple('MAMQueryData', 'jid rsm complete') MAMPreferencesData = namedtuple('MAMPreferencesData', 'default always never') +RosterData = namedtuple('RosterData', 'items version') +RosterItem = namedtuple('RosterItem', 'data jid') + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): @@ -833,6 +836,7 @@ class IqProperties: self.http_auth = None self.ibb = None self.blocking = None + self.roster = None @property def is_http_auth(self): @@ -846,6 +850,10 @@ class IqProperties: def is_blocking(self): return self.blocking is not None + @property + def is_roster(self): + return self.roster is not None + class PresenceProperties: def __init__(self, own_jid): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e280f973cb81d5da8b176db… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e280f973cb81d5da8b176db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Make Private Chat work
by Philipp Hörist 08 Feb '21

08 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 0a1e65bb by lovetox at 2021-02-07T23:31:21+01:00 Make Private Chat work - - - - - 7 changed files: - gajim/chat_control.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/gtk/chat_list.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -188,19 +188,19 @@ def __init__(self, parent_win, contact, acct, session, resource=None): self.subscribe_events() - if not session: - # Don't use previous session if we want to a specific resource - # and it's not the same - if not resource: - resource = contact.resource - session = app.connections[self.account].find_controlless_session( - self.contact.jid, resource) + # if not session: + # # Don't use previous session if we want to a specific resource + # # and it's not the same + # if not resource: + # resource = contact.resource + # session = app.connections[self.account].find_controlless_session( + # self.contact.jid, resource) + + # if session: + # session.control = self + # self.session = session self.setup_seclabel() - if session: - session.control = self - self.session = session - self.add_actions() self.update_ui() self.set_lock_image() ===================================== gajim/common/modules/message.py ===================================== @@ -176,7 +176,7 @@ def _message_received(self, _con, stanza, properties): 'account': self._account, 'additional_data': additional_data, 'fjid': fjid, - 'jid': jid, + 'jid': fjid if properties.is_muc_pm else jid, 'resource': resource, 'stanza_id': stanza_id, 'unique_id': stanza_id or message_id, ===================================== gajim/groupchat_control.py ===================================== @@ -679,7 +679,13 @@ def on_groupchat_maximize(self): self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): - self._start_private_message(nick) + gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) + muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') + if not self.is_anonymous and muc_prefer_direct_msg: + jid = app.get_jid_without_resource(gc_c.jid) + app.window.add_chat(self.account, jid, 'contact', select=True) + else: + app.window.add_private_chat(self.account, gc_c.get_full_jid()) def on_msg_textview_populate_popup(self, textview, menu): """ @@ -823,38 +829,6 @@ def _on_gc_message_received(self, event): additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) - def on_private_message(self, nick, sent, msg, tim, session, additional_data, - message_id, msg_log_id=None, displaymarking=None): - # Do we have a queue? - fjid = self.room_jid + '/' + nick - - event = events.PmEvent(msg, - '', - 'incoming', - tim, - '', - msg_log_id, - session=session, - displaymarking=displaymarking, - sent_forwarded=sent, - additional_data=additional_data, - message_id=message_id) - - app.events.add_event(self.account, fjid, event) - - if allow_popup_window(self.account): - self._start_private_message(nick) - else: - self.roster.draw_contact(nick) - if self.parent_win: - self.parent_win.show_title() - self.parent_win.redraw_tab(self) - - contact = app.contacts.get_contact_with_highest_priority( - self.account, self.room_jid) - if contact: - app.interface.roster.draw_contact(self.room_jid, self.account) - def add_message(self, text, contact='', tim=None, displaymarking=None, correct_id=None, message_id=None, stanza_id=None, additional_data=None): @@ -1052,24 +1026,6 @@ def _on_muc_config_changed(self, event): for change in changes: self.add_info_message(change) - def _on_message_received(self, event): - if not event.properties.jid.bare_match(self.room_jid): - return - - if event.properties.is_muc_pm and not event.session.control: - # We got a pm from this room - nick = event.resource - # otherwise pass it off to the control to be queued - self.on_private_message(nick, - event.properties.is_sent_carbon, - event.msgtxt, - event.properties.timestamp, - self.session, - event.additional_data, - event.properties.id, - msg_log_id=event.msg_log_id, - displaymarking=event.displaymarking) - def _on_our_show(self, event): client = app.get_client(event.account) if (event.show == 'offline' and @@ -1111,10 +1067,10 @@ def leave(self, reason=None): def rejoin(self): app.connections[self.account].get_module('MUC').join(self._muc_data) - def send_pm(self, nick, message=None): - ctrl = self._start_private_message(nick) - if message is not None: - ctrl.send_message(message) + # def send_pm(self, nick, message=None): + # ctrl = self._start_private_message(nick) + # if message is not None: + # ctrl.send_message(message) def _on_muc_self_presence(self, event): nick = event.properties.muc_nickname @@ -1758,22 +1714,6 @@ def focus(self): elif page_name == 'destroy': self.xml.destroy_reason_entry.grab_focus_without_selecting() - def _start_private_message(self, nick): - gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) - nick_jid = gc_c.get_full_jid() - - muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') - pm_queue = len(app.events.get_events( - self.account, jid=nick_jid, types=['pm'])) - if not self.is_anonymous and muc_prefer_direct_msg and not pm_queue: - jid = app.get_jid_without_resource(gc_c.jid) - ctrl = app.interface.new_chat_from_jid(self.account, jid) - else: - ctrl = app.interface.new_private_chat(gc_c, self.account) - ctrl.parent_win.set_active_tab(ctrl) - - return ctrl - def append_nick_in_msg_textview(self, _widget, nick): self.msg_textview.remove_placeholder() message_buffer = self.msg_textview.get_buffer() ===================================== gajim/gtk/chat_list.py ===================================== @@ -63,7 +63,7 @@ def _update_timer(self): def _query_tooltip(self, widget, _x_pos, y_pos, _keyboard_mode, tooltip): row = self.get_row_at_y(y_pos) - if row is None: + if row is None or row.type == 'pm': self._tab_tooltip.clear_tooltip() return False ===================================== gajim/gtk/chat_stack.py ===================================== @@ -6,6 +6,7 @@ from gajim.common import app from gajim.chat_control import ChatControl from gajim.groupchat_control import GroupchatControl +from gajim.privatechat_control import PrivateChatControl from gajim.common.i18n import _ @@ -77,6 +78,17 @@ def add_group_chat(self, account, jid): self.add_named(control.widget, f'{account}:{jid}') control.widget.show_all() + def add_private_chat(self, account, jid): + mw = self.get_toplevel() + bare_jid = app.get_jid_without_resource(jid) + nick = app.get_resource_from_jid(jid) + gc_c = app.contacts.get_gc_contact(account, bare_jid, nick) + contact = gc_c.as_contact() + control = PrivateChatControl(mw, gc_c, contact, account, None) + self._controls[(account, str(jid))] = control + self.add_named(control.widget, f'{account}:{jid}') + control.widget.show_all() + def remove_chat(self, account, jid): control = self._controls.pop((account, jid)) self.remove(control.widget) ===================================== gajim/gtk/main.py ===================================== @@ -363,6 +363,14 @@ def add_chat(self, account, jid, type_, select=False): type_, select=select) + def add_private_chat(self, account, jid, select=False): + workspace_id = self._workspace_side_bar.get_active_workspace() + self.add_chat_for_workspace(workspace_id, + account, + jid, + 'pm', + select=select) + def add_chat_for_workspace(self, workspace_id, account, @@ -377,6 +385,12 @@ def add_chat_for_workspace(self, if type_ == 'groupchat': self._chat_stack.add_group_chat(account, jid) + elif type_ == 'pm': + if not self._startup_finished: + # TODO: Currently we cant load private chats at start + # because the Contacts dont exist yet + return + self._chat_stack.add_private_chat(account, jid) else: self._chat_stack.add_chat(account, jid) self._chat_list_stack.add_chat(workspace_id, account, jid, type_) @@ -449,7 +463,10 @@ def _on_event(self, event): if not self.chat_exists(event.account, event.jid): if event.name == 'message-received': - self.add_chat(event.account, event.jid, 'contact') + if event.properties.is_muc_pm: + self.add_private_chat(event.account, event.jid, 'pm') + else: + self.add_chat(event.account, event.jid, 'contact') else: # No chat is open, dont handle any gui events return ===================================== gajim/privatechat_control.py ===================================== @@ -48,26 +48,22 @@ class PrivateChatControl(ChatControl): def __init__(self, parent_win, gc_contact, contact, account, session): room_jid = gc_contact.room_jid - self.room_ctrl = app.interface.msg_win_mgr.get_gc_control( - room_jid, account) - if room_jid in app.interface.minimized_controls[account]: - self.room_ctrl = app.interface.minimized_controls[account][room_jid] - + self.room_ctrl = app.window.get_control(account, room_jid) self.gc_contact = gc_contact ChatControl.__init__(self, parent_win, contact, account, session) # pylint: disable=line-too-long - self.register_events([ - ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), - ('caps-update', ged.GUI1, self._on_caps_update), - ('muc-user-joined', ged.GUI1, self._on_user_joined), - ('muc-user-left', ged.GUI1, self._on_user_left), - ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), - ('muc-self-presence', ged.GUI1, self._on_self_presence), - ('muc-self-kicked', ged.GUI1, self._on_disconnected), - ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), - ('muc-destroyed', ged.GUI1, self._on_disconnected), - ]) + # self.register_events([ + # ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), + # ('caps-update', ged.GUI1, self._on_caps_update), + # ('muc-user-joined', ged.GUI1, self._on_user_joined), + # ('muc-user-left', ged.GUI1, self._on_user_left), + # ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), + # ('muc-self-presence', ged.GUI1, self._on_self_presence), + # ('muc-self-kicked', ged.GUI1, self._on_disconnected), + # ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), + # ('muc-destroyed', ged.GUI1, self._on_disconnected), + # ]) # pylint: enable=line-too-long @property View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a1e65bba760ffb1d0d664f1603f7789… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a1e65bba760ffb1d0d664f1603f7789… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix transients
by Philipp Hörist 07 Feb '21

07 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f1384081 by lovetox at 2021-02-07T21:14:43+01:00 Fix transients - - - - - 4 changed files: - gajim/gtk/about.py - gajim/gtk/features.py - gajim/gtk/pep_config.py - gajim/gtk/status_change.py Changes: ===================================== gajim/gtk/about.py ===================================== @@ -31,7 +31,7 @@ class AboutDialog(Gtk.AboutDialog): def __init__(self): Gtk.AboutDialog.__init__(self) - self.set_transient_for(app.interface.roster.window) + self.set_transient_for(app.window) self.set_name('Gajim') self.set_version(app.version) self.set_copyright('Copyright © 2003-2021 Gajim Team') ===================================== gajim/gtk/features.py ===================================== @@ -39,7 +39,7 @@ def __init__(self): self.set_name('Features') self.set_title(_('Features')) self.set_resizable(False) - self.set_transient_for(app.interface.roster.window) + self.set_transient_for(app.window) grid = Gtk.Grid() grid.set_name('FeaturesInfoGrid') ===================================== gajim/gtk/pep_config.py ===================================== @@ -40,7 +40,7 @@ def __init__(self, account): self.set_name('PEPConfig') self.set_default_size(500, 350) self.set_resizable(True) - self.set_transient_for(app.interface.roster.window) + self.set_transient_for(app.window) self._ui = get_builder('manage_pep_services_window.ui') self.add(self._ui.manage_pep_services) ===================================== gajim/gtk/status_change.py ===================================== @@ -58,7 +58,7 @@ def __init__(self, callback=None, account=None, status=None, show_pep=True): self.set_position(Gtk.WindowPosition.CENTER) self.set_default_size(400, 350) self.set_show_menubar(False) - self.set_transient_for(app.interface.roster.window) + self.set_transient_for(app.window) self.title_text = _('Status Message') # TimeoutWindow self.account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f138408101c9023cba348bfdf8d12ed0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f138408101c9023cba348bfdf8d12ed0… 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