Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Refactor joining group chats
by Philipp Hörist 23 Jul '19

23 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b15436a by Philipp Hörist at 2019-07-23T22:01:40Z Refactor joining group chats - Separate join and create group chat - Simplify code - - - - - 33ee2e4c by Philipp Hörist at 2019-07-23T22:01:40Z Remove old JoinGroupchatWindow - - - - - 86d87495 by Philipp Hörist at 2019-07-23T22:01:40Z Remove obsolete bookmark code - - - - - 18 changed files: - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/modules/bookmarks.py - gajim/common/modules/muc.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_join.py - − gajim/gtk/join_groupchat.py - gajim/gtk/start_chat.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -30,7 +30,6 @@ from gajim.gtk.history_sync import HistorySyncAssistant from gajim.gtk.server_info import ServerInfoDialog from gajim.gtk.mam_preferences import MamPreferences from gajim.gtk.preferences import Preferences -from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.groupchat_creation import CreateGroupchatWindow from gajim.gtk.start_chat import StartChatDialog from gajim.gtk.add_contact import AddNewContactWindow @@ -115,17 +114,6 @@ def on_profile(action, param): interface.edit_own_details(param.get_string()) -def on_activate_bookmark(action, param): - dict_ = param.unpack() - account, jid, nick, password = \ - dict_['account'], dict_['jid'], None, None - if 'nick' in dict_: - nick = dict_['nick'] - if 'password' in dict_: - password = dict_['password'] - interface.join_gc_room(account, jid, nick, password) - - def on_send_server_message(action, param): account = param.get_string() server = app.config.get_per('accounts', account, 'hostname') @@ -146,23 +134,6 @@ def on_service_disco(action, param): except GajimGeneralException: pass - -def on_join_gc(_action, param): - account, jid = None, None - if param is None: - if not app.get_connected_accounts(): - return - else: - account, jid = param.get_strv() - if not jid: - jid = None - window = app.get_app_window(JoinGroupchatWindow) - if window is None: - JoinGroupchatWindow(account, jid) - else: - window.present() - - def on_create_gc(_action, param): window = app.get_app_window(CreateGroupchatWindow) if window is None: ===================================== gajim/application.py ===================================== @@ -415,7 +415,6 @@ class GajimApplication(Gtk.Application): general_actions = [ ('quit', app_actions.on_quit), ('add-account', app_actions.on_add_account), - ('join-groupchat', app_actions.on_join_gc), ('manage-proxies', app_actions.on_manage_proxies), ('bookmarks', app_actions.on_manage_bookmarks), ('history-manager', app_actions.on_history_manager), @@ -493,7 +492,6 @@ class GajimApplication(Gtk.Application): return [ ('-start-single-chat', a.on_single_message, 'online', 's'), ('-start-chat', a.start_chat, 'online', 'as'), - ('-join-groupchat', a.on_join_gc, 'online', 'as'), ('-add-contact', a.on_add_contact, 'online', 'as'), ('-services', a.on_service_disco, 'online', 's'), ('-profile', a.on_profile, 'feature', 's'), @@ -507,7 +505,6 @@ class GajimApplication(Gtk.Application): ('-set-motd', a.on_set_motd, 'online', 's'), ('-update-motd', a.on_update_motd, 'online', 's'), ('-delete-motd', a.on_delete_motd, 'online', 's'), - ('-activate-bookmark', a.on_activate_bookmark, 'online', 'a{sv}'), ('-open-event', a.on_open_event, 'always', 'a{sv}'), ('-import-contacts', a.on_import_contacts, 'online', 's'), ] ===================================== gajim/chat_control.py ===================================== @@ -1550,13 +1550,9 @@ class ChatControl(ChatControlBase): Gtk.MessageType.ERROR) def _on_accept_gc_invitation(self, widget, event): - if event.continued: - app.interface.join_gc_room(self.account, str(event.muc), - app.nicks[self.account], event.password, - is_continued=True) - else: - app.interface.join_gc_minimal(self.account, str(event.muc)) - + app.interface.show_or_join_groupchat(self.account, + str(event.muc), + password=event.password) app.events.remove_events(self.account, self.contact.jid, event=event) def _on_cancel_gc_invitation(self, widget, event): ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -20,6 +20,8 @@ Provides an actual implementation for the standard commands. from time import localtime, strftime from datetime import date +from gi.repository import GLib + from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -303,7 +305,9 @@ class StandardGroupChatCommands(CommandContainer): if '@' not in jid: jid = jid + '@' + app.get_server_from_jid(self.room_jid) - app.interface.join_gc_minimal(self.account, room_jid=jid) + app.app.activate_action( + 'groupchat-join', + GLib.Variant('as', [self.account, jid])) @command('part', 'close', raw=True, empty=True) @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -203,9 +203,9 @@ class Bookmarks(BaseModule): self._log.info('Autojoin Bookmark: %s', bookmark.jid) minimize = app.config.get_per('rooms', bookmark.jid, 'minimize_on_autojoin', True) - app.interface.join_gc_room( - self._account, str(bookmark.jid), bookmark.nick, - bookmark.password, minimize=minimize) + app.interface.join_groupchat(self._account, + str(bookmark.jid), + minimized=minimize) def add_bookmark(self, name: str, ===================================== gajim/common/modules/muc.py ===================================== @@ -33,7 +33,6 @@ from gajim.common import helpers from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState from gajim.common.const import SyncThreshold -from gajim.common.structs import MUCData from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_sync_threshold @@ -134,15 +133,14 @@ class MUC(BaseModule): def get_mucs_with_state(self, states): return [muc for muc in self._muc_data.values() if muc.state in states] - def join(self, room_jid, nick, password, config=None): + def join(self, muc_data): if not app.account_is_connected(self._account): return - muc_data = MUCData(room_jid, nick, password, config) - self._muc_data[room_jid] = muc_data + self._muc_data[muc_data.jid] = muc_data self._con.get_module('Discovery').disco_muc( - room_jid, partial(self._join, muc_data)) + muc_data.jid, partial(self._join, muc_data)) def _join(self, muc_data): show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) ===================================== gajim/dialogs.py ===================================== @@ -988,8 +988,7 @@ class TransformChatToMUC: app.automatic_rooms[self.account][room_jid] = {} app.automatic_rooms[self.account][room_jid]['invities'] = guest_list app.automatic_rooms[self.account][room_jid]['continue_tag'] = True - app.interface.join_gc_room(self.account, room_jid, - app.nicks[self.account], None, is_continued=True) + app.interface.create_groupchat(self.account, room_jid) self.window.destroy() def on_cancel_button_clicked(self, widget): ===================================== gajim/groupchat_control.py ===================================== @@ -107,7 +107,7 @@ class GroupchatControl(ChatControlBase): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, parent_win, contact, nick, acct, is_continued=False): + def __init__(self, parent_win, contact, muc_data, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, 'groupchat_control', contact, acct) @@ -169,7 +169,7 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = widget self.room_jid = self.contact.jid - self.nick = nick + self._muc_data = muc_data bm_module = app.connections[self.account].get_module('Bookmarks') self.name = bm_module.get_name_from_bookmark(self.room_jid) @@ -189,7 +189,7 @@ class GroupchatControl(ChatControlBase): # sorted list of nicks who mentioned us (last at the end) self.attention_list = [] self.nick_hits = [] - self._nick_completion = NickCompletionGenerator(self.nick) + self._nick_completion = NickCompletionGenerator(muc_data.nick) self.last_key_tabs = False self.subject = '' @@ -360,6 +360,10 @@ class GroupchatControl(ChatControlBase): # instance object app.plugin_manager.gui_extension_point('groupchat_control', self) + @property + def nick(self): + return self._muc_data.nick + def add_actions(self): super().add_actions() actions = [ @@ -1409,8 +1413,7 @@ class GroupchatControl(ChatControlBase): def _nec_signed_in(self, obj): if obj.conn.name != self.account: return - password = app.gc_passwords.get(self.room_jid, '') - obj.conn.get_module('MUC').join(self.room_jid, self.nick, password) + obj.conn.get_module('MUC').join(self._muc_data) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1545,9 +1548,7 @@ class GroupchatControl(ChatControlBase): def rejoin(self): if not self.autorejoin: return False - password = app.gc_passwords.get(self.room_jid, '') - app.connections[self.account].get_module('MUC').join( - self.room_jid, self.nick, password) + app.connections[self.account].get_module('MUC').join(self._muc_data) return True def draw_roster(self): @@ -2951,9 +2952,8 @@ class GroupchatControl(ChatControlBase): def _on_password_set_clicked(self, _button): password = self.xml.password_entry.get_text() - app.gc_passwords[self.room_jid] = password - app.connections[self.account].get_module('MUC').join( - self.room_jid, self.nick, password) + self._muc_data.password = password + app.connections[self.account].get_module('MUC').join(self._muc_data) self._show_page('groupchat') def _on_password_changed(self, entry, _param): ===================================== gajim/gtk/dialogs.py ===================================== @@ -791,16 +791,9 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): self._ui.message_expander.set_expanded(True) def on_accept_button_clicked(self, widget): - if self.is_continued: - app.interface.join_gc_room(self.account, - self.room_jid, - app.nicks[self.account], - self.password, - is_continued=True) - else: - app.interface.join_gc_minimal(self.account, - self.room_jid, - password=self.password) + app.interface.show_or_join_groupchat(self.account, + self.jid, + password=self.password) self.destroy() def on_decline_button_clicked(self, widget): ===================================== gajim/gtk/discovery.py ===================================== @@ -1352,8 +1352,7 @@ class ToplevelAgentBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - app.interface.join_gc_minimal(self.account, service, - transient_for=self.window.window) + app.interface.show_or_join_groupchat(self.account, service) def update_actions(self): if self.execute_button: @@ -1719,13 +1718,7 @@ class MucBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - window = app.get_app_window('JoinGroupchatWindow') - if window is None: - app.interface.join_gc_minimal(self.account, service) - else: - window.set_room(service) - window.present() - self.window.window.destroy() + app.interface.show_or_join_groupchat(self.account, service) def update_actions(self): sens = \ ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -223,11 +223,9 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): } # Create new group chat by joining - app.interface.join_gc_room( + app.interface.create_groupchat( self._account, str(room_jid), - app.nicks[self._account], - None, config=config) self.destroy() ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -107,7 +107,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): self._show_error_page(MUC_DISCO_ERRORS[error_code]) def _on_join(self, _button): - app.interface.join_gc_room(self.account, self.jid, None, None) + app.interface.show_or_join_groupchat(self.account, self.jid) self.destroy() def _on_destroy(self, *args): ===================================== gajim/gtk/join_groupchat.py deleted ===================================== @@ -1,312 +0,0 @@ -# This file is part of Gajim. -# -# Gajim 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; version 3 only. -# -# Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>. - - -from gi.repository import Gtk -from gi.repository import Gdk - -import nbxmpp -from nbxmpp.protocol import JID -from nbxmpp.util import is_error_result -from nbxmpp.structs import DiscoIdentity - -from gajim.common import app -from gajim.common import helpers -from gajim.common.i18n import _ -from gajim.common.caps_cache import muc_caps_cache -from gajim.common.exceptions import GajimGeneralException - -from gajim.gtk.discovery import ServiceDiscoveryWindow -from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.util import get_builder - - -class JoinGroupchatWindow(Gtk.ApplicationWindow): - def __init__(self, account, room_jid, password=None, automatic=None, - transient_for=None): - Gtk.ApplicationWindow.__init__(self) - self.set_name('JoinGroupchat') - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Join Group Chat')) - if transient_for: - self.set_transient_for(transient_for) - - self.automatic = automatic - self.password = password - self.requested_jid = None - self.room_jid = room_jid - self.account = account - - if self.room_jid is None: - self.minimal_mode = False - else: - self.minimal_mode = True - - glade_objects = ['main_box', 'account_label', 'account_combo', - 'server_label', 'server_combo', 'room_entry', - 'recently_button', 'recently_popover', - 'recently_treeview', 'search_button', 'password_label', - 'password_entry', 'nick_entry', 'bookmark_switch', - 'autojoin_switch'] - - self.builder = get_builder('join_groupchat_window.ui') - for obj in glade_objects: - setattr(self, obj, self.builder.get_object(obj)) - - self.add(self.main_box) - - # Show widgets depending on the mode the window is in - if not self.minimal_mode: - self.recently_button.show() - self.search_button.show() - - accounts = app.get_enabled_accounts_with_labels() - account_liststore = self.account_combo.get_model() - for acc in accounts: - account_liststore.append(acc) - - if not accounts: - return - - if not self.account: - self.account = accounts[0][0] - - self.builder.connect_signals(self) - self.connect('key-press-event', self._on_key_press_event) - - # Hide account combobox if there is only one account - if len(accounts) == 1: - self.account_combo.hide() - self.account_label.hide() - - self.account_combo.set_active_id(self.account) - - if self.minimal_mode: - if '@' in self.room_jid: - (room, server) = self.room_jid.split('@') - self.room_entry.set_text(room) - if not muc_caps_cache.supports( - self.room_jid, 'muc_passwordprotected'): - self.password_entry.hide() - self.password_label.hide() - self.nick_entry.grab_focus() - else: - self.password_entry.grab_focus() - else: - server = self.room_jid - self.room_entry.grab_focus() - - self.server_combo.insert_text(0, server) - self.server_combo.set_active(0) - - if self.password is not None: - self.password_entry.set_text(self.password) - - # Set bookmark switch sensitive if server supports bookmarks - acc = self.account_combo.get_active_id() - - self.show_all() - - def set_room(self, room_jid): - room, server = app.get_name_and_server_from_jid(room_jid) - self.room_entry.set_text(room) - self.server_combo.get_child().set_text(server) - - def _fill_recent_and_servers(self, account): - recently_liststore = self.recently_treeview.get_model() - recently_liststore.clear() - self.server_combo.remove_all() - recent = app.get_recent_groupchats(account) - servers = [] - for groupchat in recent: - label = '%s@%s' % (groupchat.room, groupchat.server) - - recently_liststore.append([groupchat.server, - groupchat.room, - groupchat.nickname, - label]) - servers.append(groupchat.server) - - self.recently_button.set_sensitive(bool(recent)) - - for server in set(servers): - self.server_combo.append_text(server) - - # Add own Server to ComboBox - muc_domain = app.get_muc_domain(account) - if muc_domain is not None: - self.server_combo.insert_text(0, muc_domain) - - def _on_recent_selected(self, treeview, *args): - (model, iter_) = treeview.get_selection().get_selected() - self.server_combo.get_child().set_text(model[iter_][0]) - self.room_entry.set_text(model[iter_][1]) - self.nick_entry.set_text(model[iter_][2]) - self.recently_popover.popdown() - - def _on_account_combo_changed(self, combo): - account = combo.get_active_id() - self.account = account - self.nick_entry.set_text(app.nicks[account]) - self._fill_recent_and_servers(account) - - def _on_jid_detection_changed(self, widget): - text = widget.get_text() - if text.startswith('xmpp:'): - text = text[5:] - if '@' in text: - room, server = text.split('@', 1) - server = server.split('?')[0] - widget.set_text('') - - if room: - self.room_entry.set_text(room) - - if server: - self.server_combo.get_child().set_text(server) - else: - self.server_combo.grab_focus() - - def _on_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() - if event.keyval == Gdk.KEY_Return: - self._on_join_clicked() - return True - - def _on_join_clicked(self, *args): - account = self.account_combo.get_active_id() - nickname = self.nick_entry.get_text() - - if app.is_invisible(account): - app.interface.raise_dialog('join-while-invisible') - return - - server = self.server_combo.get_active_text() - room = self.room_entry.get_text() - - if room == '': - ErrorDialog(_('Invalid Group Chat'), - _('Please choose a group chat'), transient_for=self) - return - - self.room_jid = '%s@%s' % (room, server) - - try: - self.room_jid = helpers.parse_jid(self.room_jid) - except helpers.InvalidFormat as error: - ErrorDialog(_('Invalid XMPP Address'), str(error), transient_for=self) - return - - if app.in_groupchat(account, self.room_jid): - # If we already in the groupchat, join_gc_room will bring - # it to front - app.interface.join_gc_room(account, self.room_jid, nickname, '') - self.destroy() - return - - if nickname == '': - ErrorDialog(_('Invalid Nickname'), - _('Please choose a nickname'), transient_for=self) - return - - try: - helpers.parse_resource(nickname) - except helpers.InvalidFormat as error: - ErrorDialog(_('Invalid Nickname'), str(error), transient_for=self) - return - - if not app.account_is_connected(account): - ErrorDialog( - _('You are not connected to the server'), - _('You can not join a group chat unless you are connected.'), - transient_for=self) - return - - password = self.password_entry.get_text() - self._add_bookmark(account, nickname, password) - app.add_recent_groupchat(account, self.room_jid, nickname) - - if self.automatic: - app.automatic_rooms[self.account][self.room_jid] = self.automatic - - app.interface.join_gc_room(account, self.room_jid, nickname, password) - self.destroy() - - def _on_cancel_clicked(self, *args): - self.destroy() - - def _on_bookmark_activate(self, switch, param): - bookmark_state = switch.get_active() - self.autojoin_switch.set_sensitive(bookmark_state) - if not bookmark_state: - self.autojoin_switch.set_active(False) - - def _add_bookmark(self, account, nickname, password): - con = app.connections[account] - - add_bookmark = self.bookmark_switch.get_active() - if not add_bookmark: - return - - autojoin = self.autojoin_switch.get_active() - - # Add as bookmark, with autojoin and not minimized - name = app.get_nick_from_jid(self.room_jid) - con.get_module('Bookmarks').add_bookmark(name, - JID(self.room_jid), - autojoin, - password, - nickname) - - def _on_search_clicked(self, widget): - server = self.server_combo.get_active_text().strip() - con = app.connections[self.account] - con.get_module('Discovery').disco_info( - server, callback=self._disco_info_received) - - def _disco_info_error(self, from_, error): - ErrorDialog(_('Wrong server'), - _('%s is not a group chat server') % from_, - transient_for=self) - - def _disco_info_received(self, result): - if is_error_result(result): - ErrorDialog(_('Wrong server'), - _('%s is not a group chat server') % result.jid, - transient_for=self) - return - if nbxmpp.NS_MUC not in result.features: - ErrorDialog(_('Wrong server'), - _('%s is not a group chat server') % result.jid, - transient_for=self) - return - - jid = str(result.jid) - if jid in app.interface.instances[self.account]['disco']: - app.interface.instances[self.account]['disco'][jid].window.\ - present() - else: - try: - # Object will add itself to the window dict - ServiceDiscoveryWindow( - self.account, jid, - initial_identities=[DiscoIdentity(category='conference', - type='text', - name=None)]) - except GajimGeneralException: - pass ===================================== gajim/gtk/start_chat.py ===================================== @@ -304,7 +304,7 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_join_clicked(self, _button=None): account = self._muc_info_box.get_account() jid = self._muc_info_box.get_jid() - app.interface.join_gc_minimal(account, str(jid)) + app.interface.show_or_join_groupchat(account, str(jid)) self.ready_to_destroy = True def _on_back_clicked(self, _button=None): ===================================== gajim/gui_interface.py ===================================== @@ -77,6 +77,7 @@ from gajim.common import socks5 from gajim.common import helpers from gajim.common import passwords from gajim.common import logging_helpers +from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.connection_handlers_events import ( @@ -89,7 +90,6 @@ from gajim.common.const import SSLError from gajim import roster_window from gajim.common import ged -from gajim.common.caps_cache import muc_caps_cache from gajim.common import configpaths from gajim.common import optparser @@ -106,7 +106,6 @@ from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow -from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data @@ -1396,51 +1395,6 @@ class Interface: if isinstance(ctrl, ChatControlBase): ctrl.scroll_to_end() - def join_gc_minimal(self, account, room_jid, password=None, - transient_for=None): - if account is not None: - if app.in_groupchat(account, room_jid): - # If we already in the groupchat, join_gc_room will bring - # it to front - app.interface.join_gc_room(account, room_jid, '', '') - return - - con = app.connections[account] - bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) - if bookmark is not None: - app.interface.join_gc_room( - account, str(bookmark.jid), bookmark.nick, bookmark.password) - return - - try: - room_jid = helpers.parse_jid(room_jid) - except helpers.InvalidFormat: - ErrorDialog(_('Invalid XMPP Address'), - transient_for=app.app.get_active_window()) - return - - connected_accounts = app.get_connected_accounts() - if account is not None and account not in connected_accounts: - connected_accounts = None - if not connected_accounts: - ErrorDialog( - _('You are not connected to the server'), - _('You can not join a group chat unless you are connected.'), - transient_for=app.app.get_active_window()) - return - - def _on_discover_result(): - if not muc_caps_cache.is_cached(room_jid): - ErrorDialog(_('XMPP Address is not a group chat'), - transient_for=app.app.get_active_window()) - return - JoinGroupchatWindow(account, room_jid, password=password, - transient_for=transient_for) - - disco_account = connected_accounts[0] if account is None else account - app.connections[disco_account].get_module('Discovery').disco_muc( - room_jid, _on_discover_result) - ################################################################################ ### Methods dealing with emoticons ################################################################################ @@ -1566,85 +1520,71 @@ class Interface: return True return False - def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False, config=None): - """ - Join the room immediately - """ + def create_groupchat_control(self, account, room_jid, muc_data, + minimize=False): + contact = app.contacts.create_contact(jid=room_jid, + account=account, + groups=[_('Group chats')], + sub='none', + groupchat=True) + app.contacts.add_contact(account, contact) - if app.contacts.get_contact(account, room_jid) and \ - not app.contacts.get_contact(account, room_jid).is_groupchat: - ErrorDialog( - _('This is not a group chat'), - _('%(room_jid)s is already in your contact list. Please check ' - 'if %(room_jid)s is a correct group chat name. If it is, ' - 'delete it from your contact list and try joining the group ' - 'chat again.') % {'room_jid': room_jid}) - return + if minimize: + control = GroupchatControl(None, contact, muc_data, account) + app.interface.minimized_controls[account][room_jid] = control + self.roster.add_groupchat(room_jid, account) + + else: + mw = self.msg_win_mgr.get_window(room_jid, account) + if not mw: + mw = self.msg_win_mgr.create_window(contact, + account, + GroupchatControl.TYPE_ID) + control = GroupchatControl(mw, contact, muc_data, account) + mw.new_tab(control) + mw.set_active_tab(control) - if not nick: - nick = app.nicks[account] + @staticmethod + def _create_muc_data(account, room_jid, password, config): + nick = app.nicks[account] + password = password - minimized_control = app.interface.minimized_controls[account].get( - room_jid, None) + # Fetch data from bookmarks + con = app.connections[account] + bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) + if bookmark is not None: + if bookmark.nick is not None: + nick = bookmark.nick - if (self.msg_win_mgr.has_window(room_jid, account) or \ - minimized_control) and app.gc_connected[account][room_jid]: - if self.msg_win_mgr.has_window(room_jid, account): - gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) - win = gc_ctrl.parent_win - win.set_active_tab(gc_ctrl) - else: - self.roster.on_groupchat_maximized(None, room_jid, account) + if bookmark.password is not None: + password = bookmark.password + + return MUCData(room_jid, nick, password, config) + + def create_groupchat(self, account, room_jid, config=None): + muc_data = self._create_muc_data(account, room_jid, None, config) + self.create_groupchat_control(account, room_jid, muc_data) + app.connections[account].get_module('MUC').join(muc_data) + + def show_or_join_groupchat(self, account, room_jid, **kwargs): + if self.show_groupchat(account, room_jid): return + self.join_groupchat(account, room_jid, **kwargs) + def join_groupchat(self, account, room_jid, password=None, minimized=False): if app.is_invisible(account): ErrorDialog( _('You cannot join a group chat while you are invisible')) return - if minimized_control is None and not self.msg_win_mgr.has_window( - room_jid, account): - # Join new groupchat - if minimize: - # GCMIN - contact = app.contacts.create_contact(jid=room_jid, - account=account, groups=[_('Group chats')], sub='none', - groupchat=True) - app.contacts.add_contact(account, contact) - gc_control = GroupchatControl(None, contact, nick, account) - app.interface.minimized_controls[account][room_jid] = \ - gc_control - self.roster.add_groupchat(room_jid, account) - else: - self.new_room(room_jid, nick, account, - is_continued=is_continued) - elif minimized_control is None: - # We are already in that groupchat - gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) - gc_control.nick = nick - gc_control.parent_win.set_active_tab(gc_control) - - # Connect - app.connections[account].get_module('MUC').join( - room_jid, nick, password, config=config) - if password: - app.gc_passwords[room_jid] = password - - def new_room(self, room_jid, nick, account, is_continued=False): - # Get target window, create a control, and associate it with the window - # GCMIN - contact = app.contacts.create_contact(jid=room_jid, account=account, - groups=[_('Group chats')], sub='none', groupchat=True) - app.contacts.add_contact(account, contact) - mw = self.msg_win_mgr.get_window(contact.jid, account) - if not mw: - mw = self.msg_win_mgr.create_window(contact, account, - GroupchatControl.TYPE_ID) - gc_control = GroupchatControl(mw, contact, nick, account, - is_continued=is_continued) - mw.new_tab(gc_control) - mw.set_active_tab(gc_control) + if not app.account_is_connected(account): + return + + muc_data = self._create_muc_data(account, room_jid, password, None) + self.create_groupchat_control( + account, room_jid, muc_data, minimize=minimized) + + app.connections[account].get_module('MUC').join(muc_data) def new_private_chat(self, gc_contact, account, session=None): conn = app.connections[account] ===================================== gajim/gui_menu_builder.py ===================================== @@ -778,7 +778,7 @@ def get_conv_context_menu(account, uri): if uri.action == URIAction.JOIN: context_menu = [ ('copy-text', _('Copy XMPP Address')), - ('-join-groupchat', _('Join Groupchat')), + ('groupchat-join', _('Join Groupchat')), ] else: context_menu = [ @@ -810,7 +810,7 @@ def get_conv_context_menu(account, uri): ('copy-text', _('Copy XMPP Address/Email')), ('open-link', _('Open Email Composer')), ('-start-chat', _('Start Chat')), - ('-join-groupchat', _('Join Groupchat')), + ('groupchat-join', _('Join Groupchat')), ('-add-contact', _('Add to Contact List…')), ] else: @@ -828,10 +828,14 @@ def get_conv_context_menu(account, uri): action = 'app.%s' % action menuitem.set_action_name(action) + data = uri.data + if uri.type == URIType.XMPP: + data = uri.data['jid'] + if action in ('app.open-link', 'app.copy-text'): - value = GLib.Variant.new_string(uri.data) + value = GLib.Variant.new_string(data) else: - value = GLib.Variant.new_strv([account, uri.data]) + value = GLib.Variant.new_strv([account, data]) menuitem.set_action_target_value(value) menuitem.show() menu.append(menuitem) ===================================== gajim/remote_control.py ===================================== @@ -149,7 +149,6 @@ class GajimRemote(Server): </method> <method name='join_room'> <arg name='room_jid' type='s' /> - <arg name='nick' type='s' /> <arg name='password' type='s' /> <arg name='account' type='s' /> </method> @@ -895,7 +894,7 @@ class GajimRemote(Server): for acc in app.contacts.get_accounts(): app.connections[acc].send_stanza(str(xml)) - def join_room(self, room_jid, nick, password, account): + def join_room(self, room_jid, password, account): if not account: # get the first connected account accounts = app.connections.keys() @@ -911,10 +910,9 @@ class GajimRemote(Server): # zeroconf not support groupchats return - if not nick: - app.interface.join_gc_minimal(account, room_jid) - else: - app.interface.join_gc_room(account, room_jid, nick, password) + app.interface.show_or_join_groupchat(account, + room_jid, + password=password) def Introspect(self): return self.__doc__ ===================================== gajim/roster_window.py ===================================== @@ -2684,10 +2684,6 @@ class RosterWindow: ### FIXME: order callbacks in itself... ################################################################################ - def on_bookmark_menuitem_activate(self, widget, account, bookmark): - app.interface.join_gc_room( - account, str(bookmark.jid), bookmark.nick, bookmark.password) - def on_info(self, widget, contact, account): """ Call vcard_information_window class to display contact's information View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/23d0bfcf692615d8ffc5c205b8ddfabe9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/23d0bfcf692615d8ffc5c205b8ddfabe9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix typo
by Philipp Hörist 22 Jul '19

22 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4f7f1d1 by Andrey Gursky at 2019-07-22T02:03:27Z Fix typo Closes #9766 - - - - - 23d0bfcf by Andrey Gursky at 2019-07-22T02:55:30Z Make exception message more informative - - - - - 3 changed files: - gajim/common/modules/base.py - gajim/common/modules/message.py - gajim/session.py Changes: ===================================== gajim/common/modules/base.py ===================================== @@ -50,7 +50,7 @@ class BaseModule: def __getattr__(self, key): if key not in self._nbxmpp_methods: - raise AttributeError + raise AttributeError("attribute '%s' is neither part of object '%s' nor declared in '_nbxmpp_methods'" % (key, self.__class__.__name__)) if not app.account_is_connected(self._account): self._log.warning('Account not connected, cant use %s', key) return ===================================== gajim/common/modules/message.py ===================================== @@ -294,7 +294,7 @@ class Message(BaseModule): message_id=event.message_id) if muc_caps_cache.has_mam(event.room_jid): - finished = self._con.get_module('MAM').is_catchup_finished( + finished = self._con.get_module('MAM').is_catch_up_finished( event.room_jid) if not finished: return ===================================== gajim/session.py ===================================== @@ -140,7 +140,7 @@ class ChatControlSession: message_id=obj.message_id) jid = self.conn.get_own_jid().getStripped() - if self.conn.get_module('MAM').is_catchup_finished(jid): + if self.conn.get_module('MAM').is_catch_up_finished(jid): app.logger.set_archive_infos(jid, last_mam_id=obj.stanza_id, last_muc_timestamp=obj.timestamp) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/623960beb212af053b5ffa7967010e4ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/623960beb212af053b5ffa7967010e4ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Only show GroupchatInfo when not already joined
by Philipp Hörist 21 Jul '19

21 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 623960be by Philipp Hörist at 2019-07-21T21:13:27Z StartChat: Only show GroupchatInfo when not already joined When we are already in a group chat just show the GroupChatControl instead of GroupchatInfo - - - - - 2 changed files: - gajim/gtk/start_chat.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -259,7 +259,14 @@ class StartChatDialog(Gtk.ApplicationWindow): self._show_error_page(_('You can not join a group chat ' 'unless you are connected.')) return + + self.ready_to_destroy = True + if app.interface.show_groupchat(row.account, row.jid): + return + + self.ready_to_destroy = False self._disco_muc(row.account, row.jid) + else: app.interface.new_chat_from_jid(row.account, row.jid) self.ready_to_destroy = True ===================================== gajim/gui_interface.py ===================================== @@ -1553,6 +1553,19 @@ class Interface: ### Methods for opening new messages controls ################################################################################ + def show_groupchat(self, account, room_jid): + minimized_control = self.minimized_controls[account].get(room_jid) + if minimized_control is not None: + self.roster.on_groupchat_maximized(None, room_jid, account) + return True + + if self.msg_win_mgr.has_window(room_jid, account): + gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) + # FIXME: Access message window directly + gc_ctrl.parent_win.set_active_tab(gc_ctrl) + return True + return False + def join_gc_room(self, account, room_jid, nick, password, minimize=False, is_continued=False, config=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/623960beb212af053b5ffa7967010e4ad4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/623960beb212af053b5ffa7967010e4ad4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: MUC: Use SyncThreshold for MUC history
by Philipp Hörist 21 Jul '19

21 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d6178669 by Philipp Hörist at 2019-07-21T14:30:14Z MUC: Use SyncThreshold for MUC history Before SyncThreshold was only used for MAM history. Now its also used for MUC history. - - - - - e97a6317 by Philipp Hörist at 2019-07-21T17:38:15Z XMLConsole: Add jabber:client namespace to templates Without the namespace all child elements get a undeclared namespace - - - - - dc282f22 by Philipp Hörist at 2019-07-21T18:02:05Z Refactor save_archive_id Move the code out of the MAM module as we need it also for MUC history now - - - - - 9 changed files: - gajim/common/config.py - gajim/common/logger.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/groupchat_control.py - gajim/gtk/xml_console.py - gajim/session.py Changes: ===================================== gajim/common/config.py ===================================== @@ -170,8 +170,6 @@ class Config: 'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')], 'restore_lines': [opt_int, 10, _('Number of messages from chat history to be restored when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], - 'muc_restore_lines': [opt_int, 100, _('How many lines to request from server when entering a group chat. -1 means no limit.')], - 'muc_restore_timeout': [opt_int, -1, _('Minutes of backlog to request when entering a group chat. -1 means no limit.')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to automatically rejoin a group chat you were disconnected from. Set to 0 to disable automatic rejoining.')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should automatic rejoin be activated when you were kicked from a group chat?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], @@ -429,8 +427,6 @@ class Config: }, {}), 'rooms': ({ 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a group chat. -1 means no limit, -2 means global value.')], - 'muc_restore_timeout': [opt_int, -2, _('Minutes of backlog to request when entering a group chat. -1 means no limit, -2 means global value.')], 'notify_on_all_messages': [opt_bool, False, _('If enabled, a notification is created for every message in this group chat.')], 'print_status': [opt_bool, False, _('Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')], 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat.')], ===================================== gajim/common/logger.py ===================================== @@ -103,10 +103,7 @@ CACHE_SQL_STATEMENT = ''' hash_method TEXT, hash TEXT, data TEXT, - last_seen INTEGER); - CREATE TABLE rooms_last_message_time( - jid_id INTEGER PRIMARY KEY UNIQUE, - time INTEGER + last_seen INTEGER ); CREATE TABLE roster_entry( account_jid_id INTEGER, @@ -962,45 +959,6 @@ class Logger: return self._con.execute( sql, tuple(jids) + (start, end)).fetchone() - def get_room_last_message_time(self, account, jid): - """ - Get the timestamp of the last message we received in a room. - - :param account: The account - - :param jid: The jid for which we request the last timestamp - - returns a timestamp or None - """ - sql = ''' - SELECT time FROM rooms_last_message_time - NATURAL JOIN jids WHERE jid = ? - ''' - - row = self._con.execute(sql, (jid,)).fetchone() - if not row: - return self.get_last_date_that_has_logs(account, jid) - return row.time - - def set_room_last_message_time(self, jid, timestamp): - """ - Set the timestamp of the last message we received in a room. - - :param jid: The jid - - :param timestamp: The timestamp in epoch - - """ - - jid_id = self.get_jid_id(jid, type_=JIDConstant.ROOM_TYPE) - sql = '''REPLACE INTO rooms_last_message_time - VALUES (:jid_id, COALESCE( - (SELECT time FROM rooms_last_message_time - WHERE jid_id = :jid_id AND time >= :time), :time))''' - - self._con.execute(sql, {"jid_id": jid_id, "time": timestamp}) - self._timeout_commit() - def save_transport_type(self, jid, type_): """ Save the type of the transport in DB @@ -1497,6 +1455,10 @@ class Logger: kwargs.get('sync_threshold', None) )) else: + for key, value in list(kwargs.items()): + if value is None: + del kwargs[key] + args = ' = ?, '.join(kwargs.keys()) + ' = ?' sql = '''UPDATE last_archive_message SET {} WHERE jid_id = ?'''.format(args) ===================================== gajim/common/modules/mam.py ===================================== @@ -73,6 +73,9 @@ class MAM(BaseModule): self._mam_query_ids.clear() self._catch_up_finished.clear() + def is_catch_up_finished(self, jid): + return jid in self._catch_up_finished + def _from_valid_archive(self, _stanza, properties): if properties.type.is_groupchat: expected_archive = properties.jid @@ -531,20 +534,6 @@ class MAM(BaseModule): query.setAttr('queryid', query_id) return iq - def save_archive_id(self, jid, stanza_id, timestamp): - if jid is None: - jid = self._con.get_own_jid().getStripped() - if jid not in self._catch_up_finished: - return - self._log.info('Save: %s: %s, %s', jid, stanza_id, timestamp) - if stanza_id is None: - # mam:1 - app.logger.set_archive_infos(jid, last_muc_timestamp=timestamp) - else: - # mam:2 - app.logger.set_archive_infos( - jid, last_mam_id=stanza_id, last_muc_timestamp=timestamp) - def request_mam_preferences(self): self._log.info('Request MAM preferences') iq = nbxmpp.Iq('get', self.archiving_namespace) ===================================== gajim/common/modules/message.py ===================================== @@ -26,6 +26,7 @@ from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict +from gajim.common.caps_cache import muc_caps_cache from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message @@ -251,7 +252,6 @@ class Message(BaseModule): event.nickname = event.resource event.xhtml_msgtxt = event.xhtml event.nick = event.resource or '' - app.nec.push_incoming_event(NetworkEvent('gc-message-received', **vars(event))) # TODO: Some plugins modify msgtxt in the GUI event @@ -292,9 +292,16 @@ class Message(BaseModule): additional_data=event.additional_data, stanza_id=event.stanza_id, message_id=event.message_id) - app.logger.set_room_last_message_time(event.room_jid, event.timestamp) - self._con.get_module('MAM').save_archive_id( - event.room_jid, event.stanza_id, event.timestamp) + + if muc_caps_cache.has_mam(event.room_jid): + finished = self._con.get_module('MAM').is_catchup_finished( + event.room_jid) + if not finished: + return + + app.logger.set_archive_infos(event.room_jid, + last_mam_id=event.stanza_id, + last_muc_timestamp=event.timestamp) def _check_for_mam_compliance(self, room_jid, stanza_id): namespace = caps_cache.muc_caps_cache.get_mam_namespace(room_jid) ===================================== gajim/common/modules/muc.py ===================================== @@ -17,6 +17,8 @@ import time import logging +from datetime import datetime +from datetime import timedelta from functools import partial import nbxmpp @@ -30,9 +32,11 @@ from gajim.common import app from gajim.common import helpers from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState +from gajim.common.const import SyncThreshold from gajim.common.structs import MUCData from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config +from gajim.common.helpers import get_sync_threshold from gajim.common import idle from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent @@ -130,11 +134,11 @@ class MUC(BaseModule): def get_mucs_with_state(self, states): return [muc for muc in self._muc_data.values() if muc.state in states] - def join(self, room_jid, nick, password, rejoin=False, config=None): + def join(self, room_jid, nick, password, config=None): if not app.account_is_connected(self._account): return - muc_data = MUCData(room_jid, nick, password, rejoin, config) + muc_data = MUCData(room_jid, nick, password, config) self._muc_data[room_jid] = muc_data self._con.get_module('Discovery').disco_muc( @@ -149,7 +153,7 @@ class MUC(BaseModule): status=self._con.status) muc_x = presence.setTag(nbxmpp.NS_MUC + ' x') - self._add_history_query(muc_x, str(muc_data.jid), muc_data.rejoin) + self._add_history_query(muc_x, str(muc_data.jid)) if muc_data.password is not None: muc_x.setTagData('password', muc_data.password) @@ -281,37 +285,27 @@ class MUC(BaseModule): show=show, status=self._con.status) - def _add_history_query(self, muc_x, room_jid, rejoin): - last_date = app.logger.get_room_last_message_time( - self._account, room_jid) - if not last_date: - last_date = 0 - + def _add_history_query(self, muc_x, room_jid): if muc_caps_cache.has_mam(room_jid): # The room is MAM capable dont get MUC History muc_x.setTag('history', {'maxchars': '0'}) else: # Request MUC History (not MAM) - tags = {} - timeout = app.config.get_per('rooms', room_jid, - 'muc_restore_timeout') - if timeout is None or timeout == -2: - timeout = app.config.get('muc_restore_timeout') - if last_date == 0 and timeout >= 0: - last_date = time.time() - timeout * 60 - elif not rejoin and timeout >= 0: - last_date = max(last_date, time.time() - timeout * 60) - last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( - last_date)) - tags['since'] = last_date - - nb = app.config.get_per('rooms', room_jid, 'muc_restore_lines') - if nb is None or nb == -2: - nb = app.config.get('muc_restore_lines') - if nb >= 0: - tags['maxstanzas'] = nb - if tags: - muc_x.setTag('history', tags) + archive = app.logger.get_archive_infos(room_jid) + threshold = get_sync_threshold(room_jid, archive) + + since_epoch = 0 + if archive is not None and archive.last_muc_timestamp is not None: + since_epoch = float(archive.last_muc_timestamp) + + since_date = datetime.utcfromtimestamp(since_epoch) + if threshold != SyncThreshold.NO_THRESHOLD: + threshold_date = datetime.utcnow() - timedelta(days=threshold) + since_date = max(threshold_date, since_date) + + date_string = since_date.strftime('%Y-%m-%dT%H:%M:%SZ') + muc_x.setTag('history', {'since': date_string}) + self._log.info('Threshold for %s: %s', room_jid, threshold) def _on_muc_presence(self, _con, _stanza, properties): muc_data = self._get_muc_data(properties.muc_jid) ===================================== gajim/common/structs.py ===================================== @@ -26,11 +26,10 @@ CapsIdentity = namedtuple('CapsIdentity', 'category type name lang') class MUCData: - def __init__(self, room_jid, nick, password, rejoin, config=None): + def __init__(self, room_jid, nick, password, config=None): self._room_jid = JID(room_jid) self._nick = nick self._password = password - self._rejoin = rejoin self._config = config self._state = MUCJoinedState.NOT_JOINED @@ -64,14 +63,6 @@ class MUCData: def state(self, value): self._state = value - @property - def rejoin(self): - return self._rejoin - - @rejoin.setter - def rejoin(self, value): - self._rejoin = value - @property def config(self): return self._config ===================================== gajim/groupchat_control.py ===================================== @@ -511,10 +511,6 @@ class GroupchatControl(ChatControlBase): vcard_support and contact.affiliation.is_owner) - # Sync Threshold - has_mam = muc_caps_cache.has_mam(self.room_jid) - self._get_action('choose-sync-').set_enabled(has_mam) - # Print join/left join_default = app.config.get('print_join_left_default') value = app.config.get_per('rooms', self.contact.jid, @@ -1414,8 +1410,7 @@ class GroupchatControl(ChatControlBase): if obj.conn.name != self.account: return password = app.gc_passwords.get(self.room_jid, '') - obj.conn.get_module('MUC').join(self.room_jid, self.nick, password, - rejoin=True) + obj.conn.get_module('MUC').join(self.room_jid, self.nick, password) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1552,7 +1547,7 @@ class GroupchatControl(ChatControlBase): return False password = app.gc_passwords.get(self.room_jid, '') app.connections[self.account].get_module('MUC').join( - self.room_jid, self.nick, password, rejoin=True) + self.room_jid, self.nick, password) return True def draw_roster(self): ===================================== gajim/gtk/xml_console.py ===================================== @@ -34,9 +34,6 @@ from gajim.gtk.const import SettingKind from gajim.gtk.const import SettingType -UNDECLARED = 'http://www.gajim.org/xmlns/undeclared' - - class XMLConsoleWindow(Gtk.ApplicationWindow): def __init__(self, account): Gtk.ApplicationWindow.__init__(self) @@ -141,19 +138,19 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): input_text = None if text == 'Presence': input_text = ( - '<presence>\n' + '<presence xmlns="jabber:client">\n' '<show></show>\n' '<status></status>\n' '<priority></priority>\n' '</presence>') elif text == 'Message': input_text = ( - '<message to="" type="">\n' + '<message to="" type="" xmlns="jabber:client">\n' '<body></body>\n' '</message>') elif text == 'Iq': input_text = ( - '<iq to="" type="">\n' + '<iq to="" type="" xmlns="jabber:client">\n' '<query xmlns=""></query>\n' '</iq>') @@ -176,8 +173,6 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): if stanza: try: node = nbxmpp.Protocol(node=stanza) - if node.getNamespace() == UNDECLARED: - node.setNamespace(nbxmpp.NS_CLIENT) except Exception as error: ErrorDialog(_('Invalid Node'), str(error)) return ===================================== gajim/session.py ===================================== @@ -139,8 +139,11 @@ class ChatControlSession: stanza_id=obj.unique_id, message_id=obj.message_id) - self.conn.get_module('MAM').save_archive_id( - None, obj.stanza_id, obj.timestamp) + jid = self.conn.get_own_jid().getStripped() + if self.conn.get_module('MAM').is_catchup_finished(jid): + app.logger.set_archive_infos(jid, + last_mam_id=obj.stanza_id, + last_muc_timestamp=obj.timestamp) if obj.muc_pm and not obj.gc_control: # This is a carbon of a PM from a MUC we are not currently View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f6ce10eb4d0c0c69ffa18258d1fe9ad07… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f6ce10eb4d0c0c69ffa18258d1fe9ad07… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AdHoc: Prevent request with invalid JID
by Philipp Hörist 20 Jul '19

20 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6ce10eb by Philipp Hörist at 2019-07-20T21:58:17Z AdHoc: Prevent request with invalid JID resource can also be an empty string - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -3537,7 +3537,7 @@ class RosterWindow: callback """ jid = contact.jid - if resource is not None: + if resource: jid = jid + '/' + resource AdHocCommand(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6ce10eb4d0c0c69ffa18258d1fe9ad073… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6ce10eb4d0c0c69ffa18258d1fe9ad073… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Groupchat: Integrate captcha request into GroupChatControl
by Philipp Hörist 20 Jul '19

20 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3df8196b by Philipp Hörist at 2019-07-20T20:29:47Z Groupchat: Integrate captcha request into GroupChatControl - - - - - 8686e6ab by Philipp Hörist at 2019-07-20T21:28:41Z Remove an unused variable - - - - - 22c9c9b3 by Philipp Hörist at 2019-07-20T21:35:27Z Groupchat: Activate join button on Return Activate the join button when pressing Return inside the password entry on group chat join - - - - - d7dfac90 by Philipp Hörist at 2019-07-20T21:43:28Z DataFormWidget: Invalidate form on start validation This prevents that the form can be sent before the validation is complete - - - - - 3 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gtk/dataform.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -103,319 +103,310 @@ <signal name="button-release-event" handler="_on_hpaned_release_button" swapped="no"/> <signal name="notify::position" handler="_on_hpaned_handle_change" swapped="no"/> <child> - <object class="GtkOverlay" id="overlay"> + <object class="GtkBox" id="gc_textviews_vbox"> + <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">4</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="gc_textviews_vbox"> - <property name="width_request">0</property> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">GroupChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">4</property> - <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">GroupChatControl-BannerEventBox</property> + <object class="GtkBox" id="hbox3024"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="hbox3024"> + <object class="GtkImage" id="gc_banner_status_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkImage" id="gc_banner_status_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">GroupChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><span weight="heavy" size="large">room jid</span></property> - <property name="use_markup">True</property> - <property name="selectable">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> - <child> - <object class="GtkActionBar" id="banner_actionbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="actionbar-no-border"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="name">GroupChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><span weight="heavy" size="large">room jid</span></property> + <property name="use_markup">True</property> + <property name="selectable">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> + <child> + <object class="GtkActionBar" id="banner_actionbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="actionbar-no-border"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <style> + <class name="gajim-banner"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator-top"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="width_request">200</property> + <property name="height_request">60</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <object class="GtkMenuButton" id="settings_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">open-menu-symbolic</property> </object> </child> <style> - <class name="gajim-banner"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <object class="GtkButton" id="authentication_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </object> + </child> <style> - <class name="chatcontrol-separator-top"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> + <object class="GtkMenuButton" id="encryption_menu"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose encryption</property> + <property name="relief">none</property> <child> <placeholder/> </child> <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">mail-attachment-symbolic</property> + </object> + </child> <style> - <class name="chatcontrol-separator"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="hbox"> + <object class="GtkMenuButton" id="emoticons_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> - <child> - <placeholder/> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sendfile_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <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="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> + <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="relief">none</property> <child> - <object class="GtkMenuButton" id="formattings_button"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> - <child> - <object class="GtkImage" id="image10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> + <property name="can_focus">False</property> + <property name="icon_name">face-smile-symbolic</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <placeholder/> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> <child> - <object class="GtkComboBox" id="label_selector"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkComboBox" id="label_selector"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> </packing> </child> </object> <packing> - <property name="index">-1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> </packing> </child> </object> <packing> <property name="resize">False</property> - <property name="shrink">False</property> + <property name="shrink">True</property> </packing> </child> <child> @@ -790,6 +781,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">*</property> + <property name="activates_default">True</property> <property name="input_purpose">password</property> <signal name="notify::text" handler="_on_password_changed" swapped="no"/> </object> @@ -811,6 +803,97 @@ <property name="position">4</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_captcha_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="captcha_set_button"> + <property name="label" translatable="yes">_Join</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_captcha_set_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="captcha_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">captcha</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -1125,33 +1125,6 @@ class GroupchatControl(ChatControlBase): from_whom=self.room_jid, form_node=event.form) - @event_filter(['account', 'room_jid']) - def _on_captcha_challenge(self, event): - self._remove_captcha_request() - - def on_send_dataform_clicked(*args): - form_node = self._captcha_request.get_submit_form() - con = app.connections[self.account] - con.get_module('MUC').send_captcha(self.room_jid, form_node) - self._remove_captcha_request() - - self._captcha_request = CaptchaRequest(event.form, - on_send_dataform_clicked) - self._overlay.add_overlay(self._captcha_request) - - if self.parent_win: - self.parent_win.redraw_tab(self, 'attention') - else: - self.attention_flag = True - - def _remove_captcha_request(self): - if self._captcha_request is None: - return - if self._captcha_request in self._overlay.get_children(): - self._overlay.remove(self._captcha_request) - self._captcha_request.destroy() - self._captcha_request = None - @event_filter(['account']) def _nec_mam_decrypted_message_received(self, obj): if not obj.groupchat: @@ -1946,7 +1919,6 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_presence_error(self, event): - nick = event.properties.muc_nickname error_type = event.properties.error.type error_message = event.properties.error.message @@ -2477,6 +2449,8 @@ class GroupchatControl(ChatControlBase): if self._get_current_page() == 'password': self._on_password_cancel_clicked() + elif self._get_current_page() == 'captcha': + self._on_captcha_cancel_clicked() else: self._show_page('groupchat') return Gdk.EVENT_STOP @@ -2935,6 +2909,8 @@ class GroupchatControl(ChatControlBase): self.xml.password_entry.set_text('') self.xml.password_entry.grab_focus() self.xml.password_set_button.grab_default() + elif page_name == 'captcha': + self.xml.captcha_set_button.grab_default() def _on_change_nick(self, _action, _param): if self._get_current_page() == 'nickname': @@ -2993,6 +2969,50 @@ class GroupchatControl(ChatControlBase): self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) self.force_non_minimizable = False + @event_filter(['account', 'room_jid']) + def _on_captcha_challenge(self, event): + self._remove_captcha_request() + + options = {'no-scrolling': True, + 'entry-activates-default': True} + self._captcha_request = DataFormWidget(event.form, options=options) + self._captcha_request.connect('is-valid', self._on_captcha_changed) + self._captcha_request.set_valign(Gtk.Align.START) + self._captcha_request.show_all() + self.xml.captcha_box.add(self._captcha_request) + + if self.parent_win: + self.parent_win.redraw_tab(self, 'attention') + else: + self.attention_flag = True + + self._show_page('captcha') + self._captcha_request.focus_first_entry() + + def _remove_captcha_request(self): + if self._captcha_request is None: + return + if self._captcha_request in self.xml.captcha_box.get_children(): + self.xml.captcha_box.remove(self._captcha_request) + self._captcha_request.destroy() + self._captcha_request = None + + def _on_captcha_changed(self, _widget, is_valid): + self.xml.captcha_set_button.set_sensitive(is_valid) + + def _on_captcha_set_clicked(self, _button): + form_node = self._captcha_request.get_submit_form() + con = app.connections[self.account] + con.get_module('MUC').send_captcha(self.room_jid, form_node) + self._remove_captcha_request() + self._show_page('groupchat') + + def _on_captcha_cancel_clicked(self, _button=None): + self._remove_captcha_request() + self.force_non_minimizable = True + self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) + self.force_non_minimizable = False + def _on_page_cancel_clicked(self, _button): self._show_page('groupchat') @@ -3040,27 +3060,3 @@ class SubjectPopover(Gtk.Popover): # is not cross-platform compatible open_uri(uri) return Gdk.EVENT_STOP - - -class CaptchaRequest(Gtk.Box): - def __init__(self, form, callback): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) - - options = {'no-scrolling': True} - self._form_widget = DataFormWidget(form, options=options) - self._form_widget.set_valign(Gtk.Align.START) - - send_button = Gtk.Button(label='Send') - send_button.connect('clicked', callback) - send_button.set_halign(Gtk.Align.CENTER) - - self.add(self._form_widget) - self.add(send_button) - - self.set_valign(Gtk.Align.START) - self.set_margin_top(100) - - self.show_all() - - def get_submit_form(self): - return self._form_widget.get_submit_form() ===================================== gajim/gtk/dataform.py ===================================== @@ -66,6 +66,12 @@ class DataFormWidget(Gtk.ScrolledWindow): self._form_node.type_ = 'submit' return self._form_node + def focus_first_entry(self): + for widget in self._form_grid.get_children(): + if isinstance(widget, Gtk.Entry): + widget.grab_focus() + break + class FormGrid(Gtk.Grid): def __init__(self, form_node, options): @@ -266,6 +272,7 @@ class Field: self._warning_image.set_visible(not is_valid) def _validate(self): + self._form_grid.validate(False) if self._validate_source_id is not None: GLib.source_remove(self._validate_source_id) @@ -504,6 +511,8 @@ class TextSingleField(Field): self._widget = Gtk.Entry() self._widget.set_text(field.value) self._widget.connect('changed', self._changed) + if options.get('entry-activates-default', False): + self._widget.set_activates_default(True) self._widget.set_valign(Gtk.Align.CENTER) def _changed(self, _widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0dbad0ca817404953865661104187c43b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0dbad0ca817404953865661104187c43b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add a dependency on python-cairo and libcairo > 1.14.0
by Philipp Hörist 20 Jul '19

20 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b51b99f9 by Philipp Hörist at 2019-07-20T11:17:45Z Add a dependency on python-cairo and libcairo > 1.14.0 - - - - - 0dbad0ca by Philipp Hörist at 2019-07-20T13:33:08Z Groupchat: Integrate password entry into GroupChatControl - - - - - 5 changed files: - gajim/data/gui/groupchat_control.ui - gajim/gajim.py - gajim/groupchat_control.py - gajim/gui_interface.py - setup.cfg Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -84,6 +84,7 @@ <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can_focus">False</property> + <signal name="notify::visible-child-name" handler="_on_page_change" swapped="no"/> <child> <object class="GtkBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> @@ -704,6 +705,112 @@ <property name="position">3</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Enter password</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_password_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="password_set_button"> + <property name="label" translatable="yes">_Join</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_password_set_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> + <property name="input_purpose">password</property> + <signal name="notify::text" handler="_on_password_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">password</property> + <property name="position">4</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/gajim.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import i18n _MIN_NBXMPP_VER = "0.9.91" _MIN_GTK_VER = "3.22.0" +_MIN_CAIRO_VER = "1.14.0" def _check_required_deps(): @@ -42,6 +43,22 @@ def _check_required_deps(): 'Quitting...' % _MIN_NBXMPP_VER) sys.exit(1) + try: + import cairo + except ImportError: + print('Gajim needs python-cairo to run. Quitting…') + sys.exit(1) + + if V(cairo.cairo_version_string()) < V(_MIN_CAIRO_VER): + print('Gajim needs libcairo >= %s to run. ' + 'Quitting...' % _MIN_CAIRO_VER) + sys.exit(1) + + if V(cairo.version) < V(_MIN_CAIRO_VER): + print('Gajim needs python-cairo >= %s to run. ' + 'Quitting...' % _MIN_CAIRO_VER) + sys.exit(1) + def _init_gui(gui): if gui == 'GTK': ===================================== gajim/groupchat_control.py ===================================== @@ -1951,8 +1951,7 @@ class GroupchatControl(ChatControlBase): error_message = event.properties.error.message if error_type == Error.NOT_AUTHORIZED: - app.interface.handle_gc_password_required( - self.account, self.room_jid, nick) + self._show_page('password') elif error_type == Error.FORBIDDEN: # we are banned @@ -2475,7 +2474,11 @@ class GroupchatControl(ChatControlBase): if action == 'escape': if self._get_current_page() == 'groupchat': return Gdk.EVENT_PROPAGATE - self._show_page('groupchat') + + if self._get_current_page() == 'password': + self._on_password_cancel_clicked() + else: + self._show_page('groupchat') return Gdk.EVENT_STOP if action == 'change-subject': @@ -2926,6 +2929,13 @@ class GroupchatControl(ChatControlBase): else: self.revoke_owner(widget, jid) + def _on_page_change(self, stack, _param): + page_name = stack.get_visible_child_name() + if page_name == 'password': + self.xml.password_entry.set_text('') + self.xml.password_entry.grab_focus() + self.xml.password_set_button.grab_default() + def _on_change_nick(self, _action, _param): if self._get_current_page() == 'nickname': return @@ -2968,6 +2978,21 @@ class GroupchatControl(ChatControlBase): con.get_module('MUC').set_subject(self.room_jid, subject) self._show_page('groupchat') + def _on_password_set_clicked(self, _button): + password = self.xml.password_entry.get_text() + app.gc_passwords[self.room_jid] = password + app.connections[self.account].get_module('MUC').join( + self.room_jid, self.nick, password) + self._show_page('groupchat') + + def _on_password_changed(self, entry, _param): + self.xml.password_set_button.set_sensitive(bool(entry.get_text())) + + def _on_password_cancel_clicked(self, _button=None): + self.force_non_minimizable = True + self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) + self.force_non_minimizable = False + def _on_page_cancel_clicked(self, _button): self._show_page('groupchat') ===================================== gajim/gui_interface.py ===================================== @@ -266,34 +266,6 @@ class Interface: d.set_transient_for(gc_control.parent_win.window) d.set_modal(False) - def handle_gc_password_required(self, account, room_jid, nick): - def on_ok(text): - app.connections[account].get_module('MUC').join( - room_jid, nick, text) - app.gc_passwords[room_jid] = text - gc_control.error_dialog = None - - def on_cancel(): - # get and destroy window - if room_jid in app.interface.minimized_controls[account]: - self.roster.on_disconnect(None, room_jid, account) - else: - win = self.msg_win_mgr.get_window(room_jid, account) - ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) - win.remove_tab(ctrl, 3) - gc_control.error_dialog = None - - gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) - if gc_control: - if gc_control.error_dialog: - gc_control.error_dialog.destroy() - - gc_control.error_dialog = InputDialog(_('Password Required'), - _('A Password is required to join the group chat %s. Please type it.') % \ - room_jid, is_modal=False, ok_handler=on_ok, - cancel_handler=on_cancel) - gc_control.error_dialog.input_entry.set_visibility(False) - def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, # priority, timestamp)) ===================================== setup.cfg ===================================== @@ -25,6 +25,7 @@ install_requires = nbxmpp>=0.9.91 precis-i18n>=1.0.0 pyOpenSSL>=16.2 + pycairo>=1.14.0 [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2c82deccf7186b062da930e85a7bd53e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2c82deccf7186b062da930e85a7bd53e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 17 Jul '19

17 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c82decc by Philipp Hörist at 2019-07-17T22:05:24Z Remove unused import - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -74,7 +74,6 @@ from gajim.common.connection_handlers_events import GcMessageOutgoingEvent from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import InputTextDialog from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.single_message import SingleMessageWindow View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c82deccf7186b062da930e85a7bd53e1e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c82deccf7186b062da930e85a7bd53e1e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Groupchat: Integrate subject change into GroupchatControl
by Philipp Hörist 17 Jul '19

17 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6ba21fe5 by Philipp Hörist at 2019-07-17T22:00:47Z Groupchat: Integrate subject change into GroupchatControl - - - - - a58e9d31 by Philipp Hörist at 2019-07-17T22:00:52Z Groupchat: Don't reload nickname page - - - - - e2c4a6d5 by Philipp Hörist at 2019-07-17T22:01:06Z MessageWindow: Dont forward all keypresses to the MessageTextview This is very messy, because it has the potential to disturb other widgets shortcuts. Instead we should give focus to the MessageTextview whenever it makes sense. - - - - - 05bb0f45 by Philipp Hörist at 2019-07-17T22:01:06Z Groupchat: Give MessageTextview focus after page change - - - - - 3 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/message_window.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -543,7 +543,7 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="use_underline">True</property> - <signal name="clicked" handler="_on_nickname_cancel_clicked" swapped="no"/> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -592,6 +592,118 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Change Subject</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="subject_change_button"> + <property name="label" translatable="yes">Ch_ange</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_subject_change_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="width_request">450</property> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="subject_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">subject</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -538,6 +538,7 @@ class GroupchatControl(ChatControlBase): transition = Gtk.StackTransitionType.SLIDE_DOWN if name == 'groupchat': transition = Gtk.StackTransitionType.SLIDE_UP + self.msg_textview.grab_focus() self.xml.stack.set_visible_child_full(name, transition) def _get_current_page(self): @@ -627,17 +628,6 @@ class GroupchatControl(ChatControlBase): # Actions - def _on_change_subject(self, action, param): - def on_ok(subject): - # Note, we don't update self.subject since we don't know whether it - # will work yet - con = app.connections[self.account] - con.get_module('MUC').set_subject(self.room_jid, subject) - - InputTextDialog(_('Changing Subject'), - _('Please specify the new subject:'), input_str=self.subject, - ok_handler=on_ok, transient_for=self.parent_win.window) - def _on_disconnect(self, action, param): app.connections[self.account].get_module('MUC').leave(self.room_jid) self.force_non_minimizable = True @@ -2322,17 +2312,6 @@ class GroupchatControl(ChatControlBase): # gc can only have messages as event return nb - def _on_change_subject_menuitem_activate(self, widget): - def on_ok(subject): - # Note, we don't update self.subject since we don't know whether it - # will work yet - con = app.connections[self.account] - con.get_module('MUC').set_subject(self.room_jid, subject) - - InputTextDialog(_('Changing Subject'), - _('Please specify the new subject:'), input_str=self.subject, - ok_handler=on_ok, transient_for=self.parent_win.window) - def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): if not selection.get_data(): @@ -2949,6 +2928,8 @@ class GroupchatControl(ChatControlBase): self.revoke_owner(widget, jid) def _on_change_nick(self, _action, _param): + if self._get_current_page() == 'nickname': + return self.xml.nickname_entry.set_text(self.nick) self.xml.nickname_entry.grab_focus() self.xml.nickname_change_button.grab_default() @@ -2972,7 +2953,23 @@ class GroupchatControl(ChatControlBase): self.room_jid, new_nick) self._show_page('groupchat') - def _on_nickname_cancel_clicked(self, _button): + def _on_change_subject(self, _action, _param): + if self._get_current_page() == 'subject': + return + self.xml.subject_textview.get_buffer().set_text(self.subject) + self.xml.subject_textview.grab_focus() + self._show_page('subject') + + def _on_subject_change_clicked(self, _button): + buffer_ = self.xml.subject_textview.get_buffer() + subject = buffer_.get_text(buffer_.get_start_iter(), + buffer_.get_end_iter(), + False) + con = app.connections[self.account] + con.get_module('MUC').set_subject(self.room_jid, subject) + self._show_page('groupchat') + + def _on_page_cancel_clicked(self, _button): self._show_page('groupchat') ===================================== gajim/message_window.py ===================================== @@ -132,9 +132,6 @@ class MessageWindow: id_ = self.notebook.connect('switch-page', self._on_notebook_switch_page) self.handlers[id_] = self.notebook - id_ = self.notebook.connect('key-press-event', - self._on_notebook_key_press) - self.handlers[id_] = self.notebook # Tab customizations pref_pos = app.config.get('tabs_position') @@ -257,17 +254,6 @@ class MessageWindow: self.move_to_next_unread_tab(False) return - def _on_notebook_key_press(self, _widget, event): - control = self.get_active_control() - if control is None: - return - - if isinstance(control, ChatControlBase): - # we forwarded it to message textview - control.msg_textview.remove_placeholder() - control.msg_textview.event(event) - control.msg_textview.grab_focus() - def change_account_name(self, old_name, new_name): if old_name in self._controls: self._controls[new_name] = self._controls[old_name] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c3f53b574104ca9da94b4a741d52253f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c3f53b574104ca9da94b4a741d52253f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusIcon: Remove bookmarks menu
by Philipp Hörist 17 Jul '19

17 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3f53b57 by Philipp Hörist at 2019-07-17T19:25:03Z StatusIcon: Remove bookmarks menu Fixes #9761 - - - - - 2 changed files: - gajim/data/gui/systray_context_menu.ui - gajim/gtk/statusicon.py Changes: ===================================== gajim/data/gui/systray_context_menu.ui ===================================== @@ -22,14 +22,6 @@ <signal name="activate" handler="on_new_chat" swapped="no"/> </object> </child> - <child> - <object class="GtkMenuItem" id="join_gc_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Join _Group Chat</property> - <property name="use_underline">True</property> - </object> - </child> <child> <object class="GtkMenuItem" id="single_message_menuitem"> <property name="visible">True</property> ===================================== gajim/gtk/statusicon.py ===================================== @@ -182,7 +182,6 @@ class StatusIcon: start_chat_menuitem = self._ui.start_chat_menuitem single_message_menuitem = self._ui.single_message_menuitem status_menuitem = self._ui.status_menu - join_gc_menuitem = self._ui.join_gc_menuitem sounds_mute_menuitem = self._ui.sounds_mute_menuitem show_roster_menuitem = self._ui.show_roster_menuitem @@ -195,9 +194,6 @@ class StatusIcon: self.popup_menus.append(sub_menu) status_menuitem.set_submenu(sub_menu) - gc_sub_menu = Gtk.Menu() # gc is always a submenu - join_gc_menuitem.set_submenu(gc_sub_menu) - for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) @@ -227,7 +223,6 @@ class StatusIcon: app.zeroconf_is_connected()) start_chat_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) - join_gc_menuitem.set_sensitive(iskey) accounts_list = sorted(app.contacts.get_accounts()) @@ -245,9 +240,6 @@ class StatusIcon: self.single_message_handler_id = single_message_menuitem.\ connect('activate', self.on_single_message_menuitem_activate, account) - # join gc - app.interface.roster.add_bookmarks_list(gc_sub_menu, - account) break # No other account connected else: # 2 or more 'real' accounts are connected, make submenus @@ -268,28 +260,6 @@ class StatusIcon: self.on_single_message_menuitem_activate, account) account_menu_for_single_message.append(item) - # join gc - gc_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account_label) - gc_sub_menu.append(gc_item) - gc_menuitem_menu = Gtk.Menu() - app.interface.roster.add_bookmarks_list(gc_menuitem_menu, - account) - gc_item.set_submenu(gc_menuitem_menu) - gc_sub_menu.show_all() - - newitem = Gtk.SeparatorMenuItem.new() # separator - gc_sub_menu.append(newitem) - newitem = Gtk.MenuItem.new_with_mnemonic(_('_Manage Bookmarks…')) - newitem.connect('activate', - app.interface.roster.on_manage_bookmarks_menuitem_activate) - newitem.set_sensitive(False) - gc_sub_menu.append(newitem) - for account in accounts_list: - if app.account_supports_private_storage(account): - newitem.set_sensitive(True) - break - sounds_mute_menuitem.set_active(not app.config.get('sounds_on')) win = app.interface.roster.window View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3f53b574104ca9da94b4a741d52253f53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3f53b574104ca9da94b4a741d52253f53… 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