Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][settings] 14 commits: Plugins: Fix configuration button state
by Philipp Hörist 24 Aug '20

24 Aug '20

Philipp Hörist pushed to branch settings at gajim / gajim Commits: fa1323e8 by lovetox at 2020-08-24T11:26:50+02:00 Plugins: Fix configuration button state Fixes #10238 - - - - - e589bdde by lovetox at 2020-08-24T11:34:40+02:00 Add new Settings Backend - - - - - 055934f4 by lovetox at 2020-08-24T11:34:58+02:00 Migrate app.config.get() - - - - - ef88bfef by lovetox at 2020-08-24T11:35:31+02:00 Migrate app.config.set() - - - - - 75ab0110 by lovetox at 2020-08-24T11:36:23+02:00 Migrate app.config.get_per('contacts') - - - - - 57c3a817 by lovetox at 2020-08-24T11:36:56+02:00 Migrate app.config.get_per('accounts') - - - - - e62c9c3c by lovetox at 2020-08-24T11:37:26+02:00 Migrate app.config.get_per('soundevents') - - - - - 8bfbb4aa by lovetox at 2020-08-24T11:37:51+02:00 Migrate app.config.get_per('rooms') - - - - - 22d24ad4 by lovetox at 2020-08-24T11:38:15+02:00 Migrate app.config.get_per('encryption') - - - - - 99821c02 by lovetox at 2020-08-24T11:38:30+02:00 Migrate app.config.get_per('accounts')) - - - - - 59c7fe3d by lovetox at 2020-08-24T11:38:47+02:00 Migrate app.config.get_per('proxies') - - - - - 8136e3c1 by lovetox at 2020-08-24T11:40:58+02:00 Migrate app.config.get per('statusmsg') - - - - - c97db7e0 by lovetox at 2020-08-24T11:40:58+02:00 PluginManager: Use new settings API - - - - - b9e535ee by lovetox at 2020-08-24T11:40:58+02:00 AdvancedConfig: Port to new settings API - - - - - 30 changed files: - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/execute.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/dbus/location.py - gajim/common/helpers.py - gajim/common/jingle_ft.py - gajim/common/jingle_rtp.py - gajim/common/jingle_transport.py - gajim/common/logger.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/bookmarks.py - gajim/common/modules/bytestream.py - gajim/common/modules/chatstates.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/94aaca9ae48b0473ba349c29802fa2d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/94aaca9ae48b0473ba349c29802fa2d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Plugins: Fix configuration button state
by Philipp Hörist 24 Aug '20

24 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa1323e8 by lovetox at 2020-08-24T11:26:50+02:00 Plugins: Fix configuration button state Fixes #10238 - - - - - 1 changed file: - gajim/plugins/gui.py Changes: ===================================== gajim/plugins/gui.py ===================================== @@ -217,7 +217,8 @@ class PluginsWindow(Gtk.ApplicationWindow, EventHelper): transient_for=self) return - self._ui.configure_plugin_button.set_sensitive(not is_active) + self._ui.configure_plugin_button.set_sensitive( + plugin.config_dialog is not None and not is_active) self.installed_plugins_model[path][Column.ACTIVE] = not is_active def _on_configure_plugin(self, _widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa1323e80d8a1e236cd3fead3d33d8e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa1323e80d8a1e236cd3fead3d33d8e8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch settings
by Philipp Hörist 24 Aug '20

24 Aug '20

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

1 0

[Git][gajim/gajim][master] 3 commits: Remove subscribe_nick config option
by Philipp Hörist 23 Aug '20

23 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49780177 by lovetox at 2020-08-23T11:45:06+02:00 Remove subscribe_nick config option - - - - - e466e5a4 by lovetox at 2020-08-23T11:50:23+02:00 Merge subscribe settings - - - - - 54f99da5 by lovetox at 2020-08-23T12:46:59+02:00 Accounts: Make more settings available - - - - - 3 changed files: - gajim/common/config.py - gajim/common/helpers.py - gajim/gtk/accounts.py Changes: ===================================== gajim/common/config.py ===================================== @@ -277,7 +277,7 @@ class Config: 'keyid': [opt_str, '', '', True], 'keyname': [opt_str, '', '', True], 'use_plain_connection': [opt_bool, False, _('Use an unencrypted connection to the server')], - 'action_when_plain_connection': [opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', or \'none\'.')], + 'confirm_unencrypted_connection': [opt_bool, True], 'use_custom_host': [opt_bool, False, '', True], 'custom_port': [opt_int, 5222, '', True], 'custom_host': [opt_str, '', '', True], @@ -304,11 +304,7 @@ class Config: 'answer_receipts': [opt_bool, True, _('If enabled, Gajim will answer to message receipt requests.')], 'publish_tune': [opt_bool, False], 'publish_location': [opt_bool, False], - 'subscribe_mood': [opt_bool, True], - 'subscribe_activity': [opt_bool, True], - 'subscribe_tune': [opt_bool, True], - 'subscribe_nick': [opt_bool, True], - 'subscribe_location': [opt_bool, True], + 'request_user_data': [opt_bool, True], 'ignore_unknown_contacts': [opt_bool, False], 'send_os_info': [opt_bool, True, _('Allow Gajim to send information about the operating system you are running.')], 'send_time_info': [opt_bool, True, _('Allow Gajim to send your local time.')], ===================================== gajim/common/helpers.py ===================================== @@ -802,16 +802,14 @@ def get_current_show(account): def get_optional_features(account): features = [] - if app.config.get_per('accounts', account, 'subscribe_mood'): + if app.config.get_per('accounts', account, 'request_user_data'): features.append(Namespace.MOOD + '+notify') - if app.config.get_per('accounts', account, 'subscribe_activity'): features.append(Namespace.ACTIVITY + '+notify') - if app.config.get_per('accounts', account, 'subscribe_tune'): features.append(Namespace.TUNE + '+notify') - if app.config.get_per('accounts', account, 'subscribe_nick'): - features.append(Namespace.NICK + '+notify') - if app.config.get_per('accounts', account, 'subscribe_location'): features.append(Namespace.LOCATION + '+notify') + + features.append(Namespace.NICK + '+notify') + if app.connections[account].get_module('Bookmarks').using_bookmark_2: features.append(Namespace.BOOKMARKS_2 + '+notify') elif app.connections[account].get_module('Bookmarks').using_bookmark_1: @@ -1395,7 +1393,7 @@ def get_custom_host(account): def warn_about_plain_connection(account, connection_types): warn = app.config.get_per( - 'accounts', account, 'action_when_plain_connection') == 'warn' + 'accounts', account, 'confirm_unencrypted_connection') for type_ in connection_types: if type_.is_plain and warn: return True ===================================== gajim/gtk/accounts.py ===================================== @@ -309,6 +309,7 @@ class AccountSubMenu(Gtk.ListBox): if account != 'Local': self.add(PageMenuItem('privacy', _('Privacy'))) self.add(PageMenuItem('connection', _('Connection'))) + self.add(PageMenuItem('advanced', _('Advanced'))) self.add(RemoveMenuItem()) @property @@ -400,6 +401,8 @@ class PageMenuItem(MenuItem): icon = 'preferences-system-privacy-symbolic' elif name == 'connection': icon = 'preferences-system-network-symbolic' + elif name == 'advanced': + icon = 'preferences-other-symbolic' else: icon = 'dialog-error-symbolic' @@ -422,6 +425,7 @@ class Account: self._settings.add_page(GeneralPage(account)) self._settings.add_page(ConnectionPage(account)) self._settings.add_page(PrivacyPage(account)) + self._settings.add_page(AdvancedPage(account)) self._account_row = AccountRow(account) self._menu.add_account(self._account_row) @@ -675,6 +679,10 @@ class PrivacyPage(GenericSettingPage): desc=_('Ignore everything from contacts not in your ' 'Roster')), + Setting(SettingKind.SWITCH, _('Send Message Receipts'), + SettingType.ACCOUNT_CONFIG, 'answer_receipts', + desc=_('Tell your contacts if you received a message')), + ] GenericSettingPage.__init__(self, account, settings) @@ -698,8 +706,42 @@ class ConnectionPage(GenericSettingPage): Setting(SettingKind.PRIORITY, _('Priority'), SettingType.DIALOG, props={'dialog': PriorityDialog}), + + Setting(SettingKind.SWITCH, _('Use Unencrypted Connection'), + SettingType.ACCOUNT_CONFIG, 'use_plain_connection', + desc=_('Use an unencrypted connection to the server')), + + Setting(SettingKind.SWITCH, _('Confirm Unencrypted Connection'), + SettingType.ACCOUNT_CONFIG, + 'confirm_unencrypted_connection', + desc=_('Show a confirmation dialog before connecting ' + 'unencrypted')), ] + GenericSettingPage.__init__(self, account, settings) + +class AdvancedPage(GenericSettingPage): + + name = 'advanced' + + def __init__(self, account): + + settings = [ + Setting(SettingKind.SWITCH, _('Contact Information'), + SettingType.ACCOUNT_CONFIG, 'request_user_data', + desc=_('Request contact information ' + '(Mood, Activity, Tune, Location)')), + + Setting(SettingKind.SWITCH, _('Accept all Contact Requests'), + SettingType.ACCOUNT_CONFIG, 'autoauth', + desc=_('Automatically accept all contact requests')), + + Setting(SettingKind.COMBO, _('Filetransfer Preference'), + SettingType.ACCOUNT_CONFIG, 'filetransfer_preference', + props={'combo_items': ['httpupload', 'jingle']}, + desc=_('Preferred file transfer mechanism for ' + 'file drag&drop on a chat window')) + ] GenericSettingPage.__init__(self, account, settings) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e8cf6a27e80fc9260b38638cbff16d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e8cf6a27e80fc9260b38638cbff16d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Port mutiple modules to pathlib
by Philipp Hörist 22 Aug '20

22 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e8cf6a27 by lovetox at 2020-08-22T22:34:14+02:00 Port mutiple modules to pathlib - - - - - 7 changed files: - gajim/common/helpers.py - gajim/gtk/account_wizard.py - gajim/gtk/emoji_chooser.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/plugins_i18n.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -913,7 +913,7 @@ def get_sync_threshold(jid, archive_info): def load_json(path, key=None, default=None): try: - with open(path, 'r') as file: + with path.open('r') as file: json_dict = json.loads(file.read()) except Exception: log.exception('Parsing error') ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import logging +from pathlib import Path from gi.repository import Gdk from gi.repository import GLib @@ -553,9 +553,8 @@ class Login(Page): def _create_server_completion(self): # Parse servers.json - server_file_path = os.path.join( - configpaths.get('DATA'), 'other', 'servers.json') - self._servers = helpers.load_json(server_file_path, 'servers', []) + file_path = Path(configpaths.get('DATA')) / 'other' / 'servers.json' + self._servers = helpers.load_json(file_path, 'servers', []) # Create a separate model for the address entry, because it will # be updated with our localpart@ @@ -631,11 +630,6 @@ class Signup(Page): self.complete = False self.title = _('Create New Account') - # Parse servers.json - server_file_path = os.path.join( - configpaths.get('DATA'), 'other', 'servers.json') - self._servers = helpers.load_json(server_file_path, 'servers', []) - self._ui = get_builder('account_wizard.ui') self._ui.server_comboboxtext_sign_up_entry.set_activates_default(True) self._create_server_completion() @@ -658,13 +652,12 @@ class Signup(Page): def _create_server_completion(self): # Parse servers.json - server_file_path = os.path.join( - configpaths.get('DATA'), 'other', 'servers.json') - self._servers = helpers.load_json(server_file_path, 'servers', []) + file_path = Path(configpaths.get('DATA')) / 'other' / 'servers.json' + servers = helpers.load_json(file_path, 'servers', []) # Create servers_model for comboboxes and entries servers_model = Gtk.ListStore(str) - for server in self._servers: + for server in servers: servers_model.append((server,)) # Sign up combobox and entry ===================================== gajim/gtk/emoji_chooser.py ===================================== @@ -12,10 +12,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import sys import logging import weakref +from pathlib import Path from collections import OrderedDict from gi.repository import Gtk @@ -317,15 +317,14 @@ class EmojiChooser(Gtk.Popover): def _get_emoji_theme_path(theme): if theme == 'font': return 'font' - emoticons_data_path = os.path.join(configpaths.get('EMOTICONS'), - theme, - '%s.png' % theme) - if os.path.exists(emoticons_data_path): + + base_path = Path(configpaths.get('EMOTICONS')) + emoticons_data_path = base_path / theme / f'{theme}.png' + if emoticons_data_path.exists(): return emoticons_data_path - emoticons_user_path = os.path.join(configpaths.get('MY_EMOTS'), - '%s.png' % theme) - if os.path.exists(emoticons_user_path): + emoticons_user_path = Path(configpaths.get('MY_EMOTS')) / f'{theme}.png' + if emoticons_user_path.exists(): return emoticons_user_path log.warning('Could not find emoji theme: %s', theme) @@ -385,7 +384,7 @@ class EmojiChooser(Gtk.Popover): @staticmethod def _get_next_pixbuf(path): src_x = src_y = cur_column = 0 - atlas = GdkPixbuf.Pixbuf.new_from_file(path) + atlas = GdkPixbuf.Pixbuf.new_from_file(str(path)) while True: src_x = cur_column * Emoji.PARSE_WIDTH ===================================== gajim/gtk/util.py ===================================== @@ -20,7 +20,6 @@ from typing import List from typing import Tuple from typing import Optional -import os import sys import logging import textwrap @@ -60,7 +59,7 @@ from gajim.gtk.const import WINDOW_MODULES _icon_theme = Gtk.IconTheme.get_default() if _icon_theme is not None: - _icon_theme.append_search_path(configpaths.get('ICONS')) + _icon_theme.append_search_path(str(configpaths.get('ICONS'))) log = logging.getLogger('gajim.gtk.util') @@ -164,7 +163,7 @@ class Builder: if gettext_ is None: gettext_ = _ - file_path = os.path.join(configpaths.get('GUI'), filename) + file_path = str(Path(configpaths.get('GUI')) / filename) if sys.platform == "win32": # This is a workaround for non working translation on Windows ===================================== gajim/gui_interface.py ===================================== @@ -115,7 +115,7 @@ from gajim.gtk.util import get_color_for_account from gajim.gtk.const import ControlType -parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) +parser = optparser.OptionsParser(str(configpaths.get('CONFIG_FILE'))) log = logging.getLogger('gajim.interface') class Interface: ===================================== gajim/history_manager.py ===================================== @@ -30,6 +30,7 @@ import sys import time import getopt import sqlite3 +from pathlib import Path from enum import IntEnum, unique import gi @@ -108,8 +109,8 @@ class Column(IntEnum): class HistoryManager: def __init__(self): - log_db_path = configpaths.get('LOG_DB') - if not os.path.exists(log_db_path): + log_db_path = Path(configpaths.get('LOG_DB')) + if not log_db_path.exists(): ErrorDialog(_('Cannot find history logs database'), _('%s does not exist.') % log_db_path) sys.exit() ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -14,21 +14,23 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import locale import gettext +from pathlib import Path from gajim.common import configpaths DOMAIN = 'gajim_plugins' try: - plugin_user_dir = configpaths.get('PLUGINS_USER') + plugin_user_dir = Path(configpaths.get('PLUGINS_USER')) except KeyError: # This allows to import the module for tests print('No plugin translation path available') - plugin_user_dir = '' + plugin_user_dir = Path.cwd() -plugins_locale_dir = os.path.join(plugin_user_dir, 'locale') + +# python 3.7 gettext module does not support Path objects +plugins_locale_dir = str(plugin_user_dir / 'locale') try: t = gettext.translation(DOMAIN, plugins_locale_dir) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8cf6a27e80fc9260b38638cbff16d70… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8cf6a27e80fc9260b38638cbff16d70… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] css_config: Port to pathlib
by Philipp Hörist 22 Aug '20

22 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0b67eb6 by André Apitzsch at 2020-08-22T20:57:24+02:00 css_config: Port to pathlib - - - - - 1 changed file: - gajim/gtk/css_config.py Changes: ===================================== gajim/gtk/css_config.py ===================================== @@ -15,9 +15,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import math import logging +from pathlib import Path from gi.repository import Gtk from gi.repository import Gdk @@ -148,7 +148,7 @@ class CSSConfig(): CSSPriority.DEFAULT_THEME_DARK) def _load_css_from_file(self, filename, priority): - path = os.path.join(configpaths.get('STYLE'), filename) + path = Path(configpaths.get('STYLE')) / filename try: with open(path, "r") as file_: css = file_.read() @@ -180,8 +180,8 @@ class CSSConfig(): return int(math.ceil(number / 100.0)) * 100 def _gather_available_themes(self): - files = os.listdir(configpaths.get('MY_THEME')) - self.themes = [file[:-4] for file in files if file.endswith('.css')] + files = Path(configpaths.get('MY_THEME')).iterdir() + self.themes = [file.stem for file in files if file.suffix == '.css'] if 'default' in self.themes: # Ignore user created themes that are named 'default' self.themes.remove('default') @@ -191,8 +191,8 @@ class CSSConfig(): theme = 'default-dark' if user: - return os.path.join(configpaths.get('MY_THEME'), '%s.css' % theme) - return os.path.join(configpaths.get('STYLE'), '%s.css' % theme) + return Path(configpaths.get('MY_THEME')) / f'{theme}.css' + return Path(configpaths.get('STYLE')) / f'{theme}.css' def _determine_theme_path(self): # Gets the path of the currently active theme. @@ -202,7 +202,7 @@ class CSSConfig(): return self.get_theme_path(theme, user=False) theme_path = self.get_theme_path(theme) - if not theme or not os.path.exists(theme_path): + if not theme or not theme_path.exists(): log.warning('Theme %s not found, fallback to default', theme) app.config.set('roster_theme', 'default') log.info('Use Theme: default') @@ -462,7 +462,7 @@ class CSSConfig(): def change_theme(self, theme): user = not theme == 'default' theme_path = self.get_theme_path(theme, user=user) - if not os.path.exists(theme_path): + if not theme_path.exists(): log.error('Change Theme: Theme %s does not exist', theme_path) return False self._load_selected(theme_path) @@ -473,7 +473,7 @@ class CSSConfig(): def change_preload_theme(self, theme): theme_path = self.get_theme_path(theme) - if not os.path.exists(theme_path): + if not theme_path.exists(): log.error('Change Preload Theme: Theme %s does not exist', theme_path) return False @@ -492,7 +492,7 @@ class CSSConfig(): old_theme_path = self.get_theme_path(old_theme) new_theme_path = self.get_theme_path(new_theme) - os.rename(old_theme_path, new_theme_path) + old_theme_path.rename(new_theme_path) self.themes.remove(old_theme) self.themes.append(new_theme) self._load_pre(new_theme) @@ -507,7 +507,7 @@ class CSSConfig(): def add_new_theme(self, theme): theme_path = self.get_theme_path(theme) - if os.path.exists(theme_path): + if theme_path.exists(): log.error('Add Theme: %s exists already', theme_path) return False with open(theme_path, 'w', encoding='utf8'): @@ -518,8 +518,8 @@ class CSSConfig(): def remove_theme(self, theme): theme_path = self.get_theme_path(theme) - if os.path.exists(theme_path): - os.remove(theme_path) + if theme_path.exists(): + theme_path.unlink() self.themes.remove(theme) log.info('Remove Theme: Successful removed theme %s', theme) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0b67eb6ed250e653eba9964337720b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e0b67eb6ed250e653eba9964337720b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Bookmarks: Improve parsing
by Philipp Hörist 20 Aug '20

20 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5bd11943 by lovetox at 2020-08-20T16:44:12+02:00 Bookmarks: Improve parsing - Add validation for nicknames - Bookmarks2: Parse password element - - - - - 1 changed file: - nbxmpp/modules/bookmarks.py Changes: ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -21,6 +21,7 @@ from nbxmpp.protocol import Node from nbxmpp.protocol import Iq from nbxmpp.protocol import JID from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import validate_resourcepart from nbxmpp.structs import StanzaHandler from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType @@ -129,61 +130,75 @@ class Bookmarks(BaseModule): bookmarks = [] confs = storage.getTags('conference') for conf in confs: - autojoin = conf.getAttr('autojoin') - if autojoin is None: - autojoin = False - else: - try: - autojoin = from_xs_boolean(autojoin) - except ValueError as error: - self._log.warning(error) - self._log.warning(storage) - autojoin = False - try: jid = JID(conf.getAttr('jid')) except Exception as error: - self._log.warning('Invalid JID: %s, %s', - conf.getAttr('jid'), error) + self._log.warning('Invalid JID: "%s", %s', + conf.getAttr('jid'), + error) continue + autojoin = self._parse_autojoin(conf.getAttr('autojoin')) + nick = self._parse_nickname(conf.getTagData('nick')) + name = conf.getAttr('name') or None + password = conf.getTagData('password') or None + bookmark = BookmarkData( jid=jid, - name=conf.getAttr('name'), + name=name, autojoin=autojoin, - password=conf.getTagData('password'), - nick=conf.getTagData('nick')) + password=password, + nick=nick) bookmarks.append(bookmark) return bookmarks def _parse_bookmarks2(self, item): - jid = item.getAttr('id') - if jid is None: - self._log.warning('No id attr found') - return None - - try: - jid = JID(jid) - except Exception as error: - self._log.warning('Invalid JID: %s', error) - self._log.warning(item) - return None - conference = item.getTag('conference', namespace=Namespace.BOOKMARKS_2) if conference is None: self._log.warning('No conference node found') self._log.warning(item) return None - autojoin = conference.getAttr('autojoin') in ('True', 'true', '1') - name = conference.getAttr('name') - nick = conference.getTagData('nick') + try: + jid = JID(item.getAttr('id')) + except Exception as error: + self._log.warning('Invalid JID: "%s", %s', + item.getAttr('id'), + error) + return None + + autojoin = self._parse_autojoin(conference.getAttr('autojoin')) + nick = self._parse_nickname(conference.getTagData('nick')) + name = conference.getAttr('name') or None + password = conference.getTagData('password') or None return BookmarkData(jid=jid, - name=name or None, + name=name, autojoin=autojoin, - nick=nick or None) + password=password, + nick=nick) + + def _parse_nickname(self, nick): + if nick is None: + return None + + try: + return validate_resourcepart(nick) + except Exception as error: + self._log.warning('Invalid nick: %s, %s', nick, error) + return None + + def _parse_autojoin(self, autojoin): + if autojoin is None: + return False + + try: + return from_xs_boolean(autojoin) + except ValueError as error: + self._log.warning('Invalid autojoin attribute: (%s) %s', + autojoin, error) + return False @staticmethod def get_private_request(): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5bd119438bfe0c9013b193d6… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5bd119438bfe0c9013b193d6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Preferences: Move 'restore_last_status' to account settings
by Philipp Hörist 19 Aug '20

19 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 557100e9 by wurstsalat at 2020-08-19T19:13:23+02:00 Preferences: Move 'restore_last_status' to account settings - - - - - b79430fe by wurstsalat at 2020-08-19T19:18:51+02:00 Preferences: Remove obsolete ListStores - - - - - f817e7d6 by wurstsalat at 2020-08-19T19:20:37+02:00 Preferences: Remove obsolete per-account config methods - - - - - 3 changed files: - gajim/data/gui/preferences_window.ui - gajim/gtk/accounts.py - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -16,32 +16,6 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkListStore" id="applications_liststore"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Use default applications</col> - </row> - <row> - <col id="0" translatable="yes">Custom</col> - </row> - </data> - </object> - <object class="GtkListStore" id="default_message_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gboolean"/> - </columns> - </object> <object class="GtkListStore" id="on_event_received_liststore"> <columns>  @@ -139,24 +113,6 @@ </row> </data> </object> - <object class="GtkListStore" id="status_message_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="sync_threshold_liststore"> <columns>  @@ -1276,57 +1232,6 @@ <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkCheckButton" id="restore_last_status_checkbutton"> - <property name="label" translatable="yes">_Remember last status</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, the status and status message used in the last session will be restored</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_restore_last_status_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">General</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> <child> <object class="GtkFrame"> <property name="visible">True</property> ===================================== gajim/gtk/accounts.py ===================================== @@ -635,6 +635,11 @@ class GeneralPage(GenericSettingPage): SettingType.ACCOUNT_CONFIG, 'sync_with_global_status', desc=_('Synchronise the status of all accounts')), + Setting(SettingKind.SWITCH, _('Remember Last Status'), + SettingType.ACCOUNT_CONFIG, 'restore_last_status', + desc=_('Restore status and status message of your ' + 'last session')), + Setting(SettingKind.SWITCH, _('Use file transfer proxies'), SettingType.ACCOUNT_CONFIG, 'use_ft_proxies'), ] ===================================== gajim/gtk/preferences.py ===================================== @@ -257,13 +257,6 @@ class Preferences(Gtk.ApplicationWindow): if not idle.Monitor.is_available(): self._ui.autoaway_table.set_sensitive(False) - # Restore last status - st = self.get_per_account_option('restore_last_status') - if st == 'mixed': - self._ui.restore_last_status_checkbutton.set_inconsistent(True) - else: - self._ui.restore_last_status_checkbutton.set_active(st) - # Ask for status when online/offline st = app.config.get('ask_online_status') self._ui.sign_in_status_checkbutton.set_active(st) @@ -427,23 +420,6 @@ class Preferences(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Escape: self.destroy() - def get_per_account_option(self, opt): - """ - Return the value of the option opt if it's the same in all accounts else - returns "mixed" - """ - if not app.connections: - # A non existent key return default value - return app.config.get_per('accounts', '__default__', opt) - val = None - for account in app.connections: - v = app.config.get_per('accounts', account, opt) - if val is None: - val = v - elif val != v: - return 'mixed' - return val - def on_checkbutton_toggled(self, widget, config_name, change_sensitivity_widgets=None): app.config.set(config_name, widget.get_active()) @@ -451,15 +427,6 @@ class Preferences(Gtk.ApplicationWindow): for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) - def on_per_account_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets=None): - for account in app.connections: - app.config.set_per('accounts', account, config_name, - widget.get_active()) - if change_sensitivity_widgets: - for w in change_sensitivity_widgets: - w.set_sensitive(widget.get_active()) - def _get_all_controls(self): for ctrl in app.interface.msg_win_mgr.get_controls(): yield ctrl @@ -663,10 +630,6 @@ class Preferences(Gtk.ApplicationWindow): def on_auto_xa_message_entry_changed(self, widget): app.config.set('autoxa_message', widget.get_text()) - def on_restore_last_status_checkbutton_toggled(self, widget): - widget.set_inconsistent(False) - self.on_per_account_checkbutton_toggled(widget, 'restore_last_status') - def on_sign_in_status_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ask_online_status') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/469c9bef9e91a62935e88d005ae05bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/469c9bef9e91a62935e88d005ae05bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Strip [] before hostname check
by Philipp Hörist 16 Aug '20

16 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 47daf6a9 by lovetox at 2020-08-16T22:20:35+02:00 Strip [] before hostname check - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -717,8 +717,9 @@ def validate_domainpart(domainpart): if not domainpart: raise DomainpartByteLimit - if GLib.hostname_is_ip_address(domainpart): - return domainpart + ip_address = domainpart.strip('[]') + if GLib.hostname_is_ip_address(ip_address): + return ip_address if domainpart.endswith('.'): # RFC7622, 3.2 domainpart = domainpart[:-1] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/47daf6a9313dbccc01739681… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/47daf6a9313dbccc01739681… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Simplify domainpart check
by Philipp Hörist 16 Aug '20

16 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e5f5effc by lovetox at 2020-08-16T20:50:40+02:00 Simplify domainpart check - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -20,10 +20,11 @@ sub- stanzas) handling routines import time import hashlib -import socket import functools from base64 import b64encode +from gi.repository import GLib + import idna from precis_i18n import get_profile from nbxmpp.simplexml import Node @@ -716,20 +717,8 @@ def validate_domainpart(domainpart): if not domainpart: raise DomainpartByteLimit - # Check if this is a IPV4 address - try: - socket.inet_aton(domainpart) + if GLib.hostname_is_ip_address(domainpart): return domainpart - except Exception: - pass - - # Check if this is a IPV6 address - if domainpart.startswith('[') and domainpart.endswith(']'): - try: - socket.inet_pton(socket.AF_INET6, domainpart.strip('[]')) - return domainpart - except Exception: - pass if domainpart.endswith('.'): # RFC7622, 3.2 domainpart = domainpart[:-1] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e5f5effc3065d1f6942915b6… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e5f5effc3065d1f6942915b6… 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