Commits May 2019

commits@gajim.org

1 participants
15 discussions

[Git][gajim/gajim][master] AdHoc: Show error page if no commands are available
by Philipp Hörist 16 May '19

16 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9f8492ae by Philipp Hörist at 2019-05-16T21:34:15Z AdHoc: Show error page if no commands are available - Remove some unused code Fixes #9704 - - - - - 1 changed file: - gajim/gtk/adhoc.py Changes: ===================================== gajim/gtk/adhoc.py ===================================== @@ -137,7 +137,12 @@ class AdHocCommand(Gtk.Assistant): if button is not None: button.show() - elif page in (Page.ERROR, Page.COMPLETED): + elif page == Page.ERROR: + error_page = self.get_nth_page(page) + if error_page.show_command_button: + self._buttons['commands'].show() + + elif page == Page.COMPLETED: self._buttons['commands'].show() def _add_page(self, page): @@ -155,6 +160,10 @@ class AdHocCommand(Gtk.Assistant): dataform = None if action == AdHocAction.EXECUTE: command = self.get_nth_page(current_page).get_selected_command() + if command is None: + # The commands page should not show if there are no commands, + # but if for some reason it does dont fail horribly + return else: command, dataform = self.get_nth_page(current_page).stage_data if action == AdHocAction.PREV: @@ -178,9 +187,19 @@ class AdHocCommand(Gtk.Assistant): @ensure_not_destroyed def _received_command_list(self, commands): + error_text = None if is_error_result(commands): + error_text = str(commands) + + elif not commands: + error_text = _('No commands available') + + if error_text is not None: + self.get_nth_page(Page.ERROR).set_text(error_text) + self.get_nth_page(Page.ERROR).show_command_button = False self.set_current_page(Page.ERROR) return + self.get_nth_page(Page.COMMANDS).add_commands(commands) self.set_current_page(Page.COMMANDS) @@ -188,6 +207,7 @@ class AdHocCommand(Gtk.Assistant): def _received_stage(self, stage): if is_error_result(stage): self.get_nth_page(Page.ERROR).set_text(str(stage)) + self.get_nth_page(Page.ERROR).show_command_button = True self.set_current_page(Page.ERROR) return @@ -211,12 +231,6 @@ class AdHocCommand(Gtk.Assistant): def _on_page_change(self, _assistant, _page): self._set_button_visibility(self.get_current_page()) - def _on_error(self, error_text): - log.info('Show Error page') - page = self.get_nth_page(Page.ERROR) - page.set_text(error_text) - self.set_current_page(Page.ERROR) - def _on_cancel(self, _widget): self.destroy() @@ -443,6 +457,7 @@ class Error(Gtk.Box): super().__init__(orientation=Gtk.Orientation.VERTICAL) self.set_spacing(12) self.set_homogeneous(True) + self._show_command_button = False icon = Gtk.Image.new_from_icon_name('dialog-error-symbolic', Gtk.IconSize.DIALOG) @@ -458,3 +473,11 @@ class Error(Gtk.Box): def set_text(self, text): self._label.set_text(text) + + @property + def show_command_button(self): + return self._show_command_button + + @show_command_button.setter + def show_command_button(self, value): + self._show_command_button = value View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9f8492ae694f6d3dbb705f9b1d84f1eccc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9f8492ae694f6d3dbb705f9b1d84f1eccc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Unify display of URLs in status messages
by Philipp Hörist 15 May '19

15 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c823ef6c by Daniel Brötzmann at 2019-05-15T21:23:46Z Unify display of URLs in status messages Status messages in group chats and private chats are now displayed in the same way as status messages in single chat windows. This avoids trailing brackets to be appended to a possible hyperlink inside the status message. Fixes #8470 - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/privatechat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1854,7 +1854,7 @@ class GroupchatControl(ChatControlBase): nick = event.properties.muc_nickname status = event.properties.status - status = '' if status is None else ' (%s)' % status + status = '' if status is None else ' - %s' % status show = helpers.get_uf_show(event.properties.show.value) status_default = app.config.get('print_status_muc_default') ===================================== gajim/privatechat_control.py ===================================== @@ -132,7 +132,7 @@ class PrivateChatControl(ChatControl): nick = event.properties.muc_nickname status = event.properties.status - status = '' if status is None else ' (%s)' % status + status = '' if status is None else ' - %s' % status show = helpers.get_uf_show(event.properties.show.value) status_default = app.config.get('print_status_muc_default') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c823ef6cebf77dfa52fa3737e46dde7da4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c823ef6cebf77dfa52fa3737e46dde7da4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix proxy auth
by Philipp Hörist 15 May '19

15 May '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0a116941 by Philipp Hörist at 2019-05-15T19:17:33Z Fix proxy auth - - - - - 1 changed file: - nbxmpp/proxy_connectors.py Changes: ===================================== nbxmpp/proxy_connectors.py ===================================== @@ -152,7 +152,7 @@ class SOCKS5Connector(ProxyConnector): self.on_failure('Invalid proxy reply') return if self._to_int(reply[1]) == 0: - return self._on_proxy_auth('\x01\x00') + return self._on_proxy_auth(b'\x01\x00') elif self._to_int(reply[1]) == 2: to_send = '\x01' + chr(len(self.proxy_user)) + self.proxy_user +\ chr(len(self.proxy_pass)) + self.proxy_pass @@ -176,14 +176,11 @@ class SOCKS5Connector(ProxyConnector): log.error('Invalid proxy reply') self.on_failure('Invalid proxy reply') return - if reply[0] != '\x01': - log.error('Invalid proxy reply') - self.on_failure('Invalid proxy reply') - return - if reply[1] != '\x00': + if reply != b'\x01\x00': log.error('Authentification to proxy failed') self.on_failure('Authentification to proxy failed') return + log.info('Authentification successfull. Jabber server contacted.') # Request connection req = b'\x05\x01\x00' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0a116941254d652808a2ec954b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0a116941254d652808a2ec954b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Always reset state on reconnect
by Philipp Hörist 15 May '19

15 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac4bde04 by Philipp Hörist at 2019-05-15T18:12:41Z MAM: Always reset state on reconnect It was not reset if the previous MAM query was interrupted because of a disconnect - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/modules/mam.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1346,6 +1346,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._discover_server() self._set_send_timeouts() self.get_module('Chatstate').enabled = True + self.get_module('MAM').reset_state() def _set_send_timeouts(self): if app.config.get_per('accounts', self.name, 'keep_alives_enabled'): ===================================== gajim/common/modules/mam.py ===================================== @@ -68,6 +68,10 @@ class MAM(BaseModule): account=self._account, feature=self.archiving_namespace)) + def reset_state(self): + self._mam_query_ids.clear() + self._catch_up_finished.clear() + def _from_valid_archive(self, _stanza, properties): if properties.type.is_groupchat: expected_archive = properties.jid View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4bde0447a5553d6a2515a8eac664806c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4bde0447a5553d6a2515a8eac664806c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Settings: Determine activateable via func
by Philipp Hörist 09 May '19

09 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc5e7541 by Philipp Hörist at 2019-05-09T15:51:53Z Settings: Determine activateable via func - - - - - 03917eda by Philipp Hörist at 2019-05-09T15:54:33Z Fix pylint errors - - - - - 2 changed files: - gajim/gtk/const.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -21,7 +21,8 @@ from enum import unique Filter = namedtuple('Filter', 'name pattern default') -Setting = namedtuple('Setting', 'kind label type value name callback data desc enabledif props') +Setting = namedtuple('Setting', 'kind label type value name callback data desc ' + 'enabledif enabled_func props') Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore @unique ===================================== gajim/gtk/settings.py ===================================== @@ -66,12 +66,12 @@ class SettingsDialog(Gtk.ApplicationWindow): self.listbox.connect('row-activated', self.on_row_activated) self.connect('key-press-event', self.on_key_press) - def on_key_press(self, widget, event): + def on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() @staticmethod - def on_row_activated(listbox, row): + def on_row_activated(_listbox, row): row.on_row_activated() def get_setting(self, name): @@ -143,7 +143,7 @@ class SettingsBox(Gtk.ListBox): class GenericSetting(Gtk.ListBoxRow): def __init__(self, account, label, type_, value, - name, callback, data, desc, enabledif): + name, callback, data, desc, enabledif, enabled_func): Gtk.ListBoxRow.__init__(self) self._grid = Gtk.Grid() self._grid.set_size_request(-1, 30) @@ -157,6 +157,7 @@ class GenericSetting(Gtk.ListBoxRow): self.account = account self.name = name self.enabledif = enabledif + self.enabled_func = enabled_func self.setting_value = self.get_value() description_box = Gtk.Box( @@ -208,7 +209,7 @@ class GenericSetting(Gtk.ListBoxRow): @staticmethod def __get_value(type_, value, account): if value is None: - return + return None if type_ == SettingType.VALUE: return value @@ -260,18 +261,23 @@ class GenericSetting(Gtk.ListBoxRow): raise NotImplementedError def update_activatable(self, name, value): - if self.enabledif is None or self.enabledif[0] != name: - return - activatable = (name, value) == self.enabledif - self.set_activatable(activatable) - self.set_sensitive(activatable) + enabled_func_value = True + if self.enabled_func is not None: + enabled_func_value = self.enabled_func() + + enabledif_value = True + if self.enabledif is not None and self.enabledif[0] == name: + enabledif_value = (name, value) == self.enabledif + + self.set_activatable(enabled_func_value and enabledif_value) + self.set_sensitive(enabled_func_value and enabledif_value) class SwitchSetting(GenericSetting): __gproperties__ = { "setting-value": (bool, 'Switch Value', '', False, - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -305,7 +311,7 @@ class EntrySetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Entry Value', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args): GenericSetting.__init__(self, *args) @@ -336,7 +342,7 @@ class DialogSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, dialog): GenericSetting.__init__(self, *args) @@ -369,7 +375,7 @@ class SpinSetting(GenericSetting): __gproperties__ = { "setting-value": (int, 'Priority', '', -128, 127, 0, - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, range_): GenericSetting.__init__(self, *args) @@ -407,7 +413,7 @@ class FileChooserSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Certificate Path', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, filefilter): GenericSetting.__init__(self, *args) @@ -457,7 +463,7 @@ class CallbackSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, callback): GenericSetting.__init__(self, *args) @@ -472,7 +478,7 @@ class ActionSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Dummy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, account): GenericSetting.__init__(self, *args) @@ -510,7 +516,7 @@ class ComboSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Proxy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args, combo_items): GenericSetting.__init__(self, *args) @@ -550,7 +556,7 @@ class ProxyComboSetting(GenericSetting): __gproperties__ = { "setting-value": (str, 'Proxy', '', '', - GObject.ParamFlags.READWRITE),} + GObject.ParamFlags.READWRITE),} def __init__(self, *args): GenericSetting.__init__(self, *args) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b59d5434f2d922ea395eb81d486b87b3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b59d5434f2d922ea395eb81d486b87b3d… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2019