Commits July 2020

commits@gajim.org

1 participants
77 discussions

[Git][gajim/gajim][master] Remove unused config values
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b182ca81 by lovetox at 2020-07-31T20:25:32+02:00 Remove unused config values - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -104,7 +104,6 @@ class Config: 'remove */_ . So *abc* will be bold but with * * not removed.')], 'sounds_on': [opt_bool, True], 'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nickname completion (tab) in group chat.')], - 'gc_proposed_nick_char': [opt_str, '_', _('Character to propose to add after desired nickname when nickname is already used in group chat.')], 'msgwin-max-state': [opt_bool, False], 'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide @@ -144,7 +143,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_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.')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP (previously sent messages).')], @@ -222,7 +220,6 @@ class Config: 'audio_output_volume': [opt_int, 50], 'use_stun_server': [opt_bool, False, _('If enabled, Gajim will try to use a STUN server when using Jingle. The one in \'stun_server\' option, or the one given by the XMPP server.')], 'stun_server': [opt_str, '', _('STUN server to use when using Jingle')], - 'show_affiliation_in_groupchat': [opt_bool, True, _('If enabled, Gajim will show affiliation of group chat participants by adding a colored square to the status icon.')], 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured.')], 'ignore_incoming_attention': [opt_bool, False, _('If enabled, Gajim will ignore incoming attention requests (\'wizz\').')], 'remember_opened_chat_controls': [opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], @@ -289,7 +286,6 @@ class Config: 'sync_with_global_status': [opt_bool, False, ], 'no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you do not want to store chat history. You can also add the name of an account to disable storing chat history for this account.')], 'attached_gpg_keys': [opt_str, ''], - 'time_for_ping_alive_answer': [opt_int, 60, _('How many seconds to wait for the answer of a ping alive packet before trying to reconnect.')], 'http_auth': [opt_str, 'ask'], # yes, no, ask # proxy65 for FT 'file_transfer_proxies': [opt_str, ''], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b182ca811bf17f7caff435a49b1c6705… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b182ca811bf17f7caff435a49b1c6705… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remote: Remove possibility to adjust settings via DBus
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ea229746 by lovetox at 2020-07-31T17:12:33+02:00 Remote: Remove possibility to adjust settings via DBus - - - - - 3 changed files: - data/gajim-remote.1 - gajim/gajim_remote.py - gajim/remote_control.py Changes: ===================================== data/gajim-remote.1 ===================================== @@ -37,14 +37,6 @@ Shows a help on specific command Prints a list of registered accounts .Ss list_contacts Bq account Prints a list of all contacts in the roster. Each contact appears on a separate line -.Ss prefs_del Aq key -Deletes a preference item -.Ss prefs_list -Lists all preferences and their values -.Ss prefs_put Aq key=value -Sets value of 'key' to 'value'. -.Ss prefs_store -Writes the current state of Gajim preferences to the .config file .Ss remove_contact Ao jid Ac Bq account Removes contact from roster .Ss send_chat_message Ao jid Ac Ao message Ac Bo PGP key Bc Bq account ===================================== gajim/gajim_remote.py ===================================== @@ -164,28 +164,6 @@ class GajimRemote: 'account'), False) ] ], - 'prefs_list': [ - _('Lists all preferences and their values'), - [] - ], - 'prefs_put': [ - _('Sets value of \'key\' to \'value\'.'), - [ - (_('key=value'), _('\'key\' is the name of the preference, ' - '\'value\' is what to set it to'), True) - ] - ], - 'prefs_del': [ - _('Deletes a preference item'), - [ - (_('key'), _('name of the preference to be deleted'), True) - ] - ], - 'prefs_store': [ - _('Writes the current state of Gajim preferences to the .config ' - 'file'), - [] - ], 'remove_contact': [ _('Removes contact from contact list'), [ ===================================== gajim/remote_control.py ===================================== @@ -165,20 +165,6 @@ class GajimRemote(Server): <arg name='message' type='s' /> <arg direction='out' type='b' /> </method> - <method name='prefs_del'> - <arg name='key' type='s' /> - <arg direction='out' type='b' /> - </method> - <method name='prefs_list'> - <arg direction='out' type='a{ss}' /> - </method> - <method name='prefs_put'> - <arg name='key' type='s' /> - <arg direction='out' type='b' /> - </method> - <method name='prefs_store'> - <arg direction='out' type='b' /> - </method> <method name='remove_contact'> <arg name='jid' type='s' /> <arg name='account' type='s' /> @@ -739,53 +725,6 @@ class GajimRemote(Server): result.append(item) return result - def prefs_list(self): - prefs_dict = {} - - def get_prefs(data, name, path, value): - if value is None: - return - key = '' - if path is not None: - for node in path: - key += node + '#' - key += name - prefs_dict[key] = str(value) - - app.config.foreach(get_prefs) - return prefs_dict - - def prefs_store(self): - try: - app.interface.save_config() - except Exception: - return False - return True - - def prefs_del(self, key): - if not key: - return False - key_path = key.split('#', 2) - if len(key_path) != 3: - return False - if key_path[2] == '*': - app.config.del_per(key_path[0], key_path[1]) - else: - app.config.del_per(key_path[0], key_path[1], key_path[2]) - return True - - def prefs_put(self, key): - if not key: - return False - key_path = key.split('#', 2) - if len(key_path) < 3: - subname, value = key.split('=', 1) - app.config.set(subname, value) - return True - subname, value = key_path[2].split('=', 1) - app.config.set_per(key_path[0], key_path[1], subname, value) - return True - def add_contact(self, jid, account): if account: if app.account_is_available(account): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ea229746f58897b478bf642994876f2b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ea229746f58897b478bf642994876f2b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Don't assume Local account will be always there
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 90cf076a by lovetox at 2020-07-31T16:35:30+02:00 Don't assume Local account will be always there - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -396,8 +396,9 @@ def get_accounts_sorted(): ''' account_list = config.get_per('accounts') account_list.sort(key=str.lower) - account_list.remove('Local') - account_list.insert(0, 'Local') + if 'Local' in account_list: + account_list.remove('Local') + account_list.insert(0, 'Local') return account_list def get_enabled_accounts_with_labels(exclude_local=True, connected_only=False, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/90cf076abc860cf22a78e5a59f2d75ed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/90cf076abc860cf22a78e5a59f2d75ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Don’t translate id column
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc2b5afd by lovetox at 2020-07-31T15:49:12+02:00 Preferences: Don’t translate id column - - - - - 1 changed file: - gajim/data/gui/preferences_window.ui Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -81,7 +81,7 @@ </row> <row> <col id="0" translatable="yes">Detached contact list with chat grouped by account</col> - <col id="1" translatable="yes">peracct</col> + <col id="1">peracct</col> </row> <row> <col id="0" translatable="yes">Detached contact list with chat grouped by type</col> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc2b5afdf07914d8aea13efb59e3fbf3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc2b5afdf07914d8aea13efb59e3fbf3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Util: Don’t depend on config constant
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e08b6467 by lovetox at 2020-07-31T15:21:47+02:00 Util: Don’t depend on config constant - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -256,7 +256,7 @@ def get_icon_name(name: str, iconset = app.config.get('iconset') if not iconset: - iconset = app.config.DEFAULT_ICONSET + iconset = 'dcraven' return '%s-%s' % (iconset, name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e08b64673cad525aa1e9b786eec66b7f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e08b64673cad525aa1e9b786eec66b7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Preferences: Simplify combobox code
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 185e1b93 by lovetox at 2020-07-31T15:02:23+02:00 Preferences: Simplify combobox code - - - - - 347fbb83 by lovetox at 2020-07-31T15:02:45+02:00 Remove unused code - - - - - 309cd5b7 by lovetox at 2020-07-31T15:14:22+02:00 Preferences: Simplify combobox code - - - - - 4 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py - gajim/message_window.py Changes: ===================================== gajim/common/config.py ===================================== @@ -54,9 +54,6 @@ opt_int = ['integer', 0] opt_str = ['string', 0] opt_bool = ['boolean', 0] opt_color = ['color', r'(#[0-9a-fA-F]{6})|rgb\(\d+,\d+,\d+\)|rgba\(\d+,\d+,\d+,[01]\.?\d*\)'] -opt_one_window_types = ['never', 'always', 'always_with_roster', 'peracct', 'pertype'] -opt_show_roster_on_startup = ['always', 'never', 'last_state'] -opt_treat_incoming_messages = ['', 'chat', 'normal'] class Config: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -61,24 +61,31 @@ </object> <object class="GtkListStore" id="one_window_type_liststore"> <columns> -  +  + <column type="gchararray"/> +  <column type="gchararray"/> </columns> <data> <row> <col id="0" translatable="yes">Detached contact list with detached chats</col> + <col id="1">never</col> </row> <row> <col id="0" translatable="yes">Detached contact list with single chat</col> + <col id="1">always</col> </row> <row> <col id="0" translatable="yes">Single window for everything</col> + <col id="1">always_with_roster</col> </row> <row> <col id="0" translatable="yes">Detached contact list with chat grouped by account</col> + <col id="1" translatable="yes">peracct</col> </row> <row> <col id="0" translatable="yes">Detached contact list with chat grouped by type</col> + <col id="1">pertype</col> </row> </data> </object> @@ -112,18 +119,23 @@ </object> <object class="GtkListStore" id="show_roster_on_startup_liststore"> <columns> -  +  + <column type="gchararray"/> +  <column type="gchararray"/> </columns> <data> <row> <col id="0" translatable="yes">Always</col> + <col id="1">always</col> </row> <row> <col id="0" translatable="yes">Never</col> + <col id="1">never</col> </row> <row> <col id="0" translatable="yes">Last state</col> + <col id="1">last_state</col> </row> </data> </object> @@ -257,6 +269,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="model">one_window_type_liststore</property> + <property name="id_column">1</property> <signal name="changed" handler="on_one_window_type_combo_changed" swapped="no"/> <child> <object class="GtkCellRendererText"/> @@ -275,6 +288,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="model">show_roster_on_startup_liststore</property> + <property name="id_column">1</property> <signal name="changed" handler="on_show_roster_on_startup_changed" swapped="no"/> <child> <object class="GtkCellRendererText"/> ===================================== gajim/gtk/preferences.py ===================================== @@ -29,7 +29,6 @@ except Exception: from gajim.common import app from gajim.common import configpaths from gajim.common import helpers -from gajim.common import config as c_config from gajim.common import idle from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ @@ -69,20 +68,12 @@ class Preferences(Gtk.ApplicationWindow): ### General tab ### ## Behavior of Windows and Tabs # Set default for single window type - choices = c_config.opt_one_window_types - type_ = app.config.get('one_message_window') - if type_ in choices: - self._ui.one_window_type_combobox.set_active(choices.index(type_)) - else: - self._ui.one_window_type_combobox.set_active(0) + self._ui.one_window_type_combobox.set_active_id( + app.config.get('one_message_window')) # Show roster on startup - choices = c_config.opt_show_roster_on_startup - type_ = app.config.get('show_roster_on_startup') - if type_ in choices: - self._ui.show_roster_on_startup.set_active(choices.index(type_)) - else: - self._ui.show_roster_on_startup.set_active(0) + self._ui.show_roster_on_startup.set_active_id( + app.config.get('show_roster_on_startup')) # Quit on roster x st = app.config.get('quit_on_roster_x_button') @@ -499,16 +490,12 @@ class Preferences(Gtk.ApplicationWindow): yield ctrl ### General tab ### - def on_one_window_type_combo_changed(self, widget): - active = widget.get_active() - config_type = c_config.opt_one_window_types[active] - app.config.set('one_message_window', config_type) + def on_one_window_type_combo_changed(self, combobox): + app.config.set('one_message_window', combobox.get_active_id()) app.interface.msg_win_mgr.reconfig() - def on_show_roster_on_startup_changed(self, widget): - active = widget.get_active() - config_type = c_config.opt_show_roster_on_startup[active] - app.config.set('show_roster_on_startup', config_type) + def on_show_roster_on_startup_changed(self, combobox): + app.config.set('show_roster_on_startup', combobox.get_active_id()) def on_quit_on_roster_x_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'quit_on_roster_x_button') ===================================== gajim/message_window.py ===================================== @@ -31,7 +31,6 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio -from gajim import common from gajim.common import app from gajim.common import ged from gajim.common.i18n import Q_ @@ -56,7 +55,13 @@ from gajim.gtk.const import ControlType log = logging.getLogger('gajim.message_window') -#################### + +WINDOW_TYPES = ['never', + 'always', + 'always_with_roster', + 'peracct', + 'pertype'] + class MessageWindow(EventHelper): """ @@ -877,7 +882,7 @@ class MessageWindowMgr(GObject.GObject): 'window-delete': (GObject.SignalFlags.RUN_LAST, None, (object,)), } - # These constants map to common.config.opt_one_window_types indices + # These constants map to WINDOW_TYPES indices ( ONE_MSG_WINDOW_NEVER, ONE_MSG_WINDOW_ALWAYS, @@ -885,6 +890,7 @@ class MessageWindowMgr(GObject.GObject): ONE_MSG_WINDOW_PERACCT, ONE_MSG_WINDOW_PERTYPE, ) = range(5) + # A key constant for the main window in ONE_MSG_WINDOW_ALWAYS mode MAIN_WIN = 'main' # A key constant for the main window in ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER mode @@ -904,7 +910,7 @@ class MessageWindowMgr(GObject.GObject): # Map the mode to a int constant for frequent compares mode = app.config.get('one_message_window') - self.mode = common.config.opt_one_window_types.index(mode) + self.mode = WINDOW_TYPES.index(mode) self.parent_win = parent_window self.parent_paned = parent_paned @@ -1198,10 +1204,10 @@ class MessageWindowMgr(GObject.GObject): for w in self.windows(): self.save_state(w) mode = app.config.get('one_message_window') - if self.mode == common.config.opt_one_window_types.index(mode): + if self.mode == WINDOW_TYPES.index(mode): # No change return - self.mode = common.config.opt_one_window_types.index(mode) + self.mode = WINDOW_TYPES.index(mode) controls = [] for w in self.windows(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e503523cad8e611df0f510c9c9dcdc1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e503523cad8e611df0f510c9c9dcdc1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Don't use get_options()
by Philipp Hörist 31 Jul '20

31 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e503523c by lovetox at 2020-07-31T14:00:49+02:00 Preferences: Don't use get_options() This is in preparation of migrating the config module - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -161,7 +161,8 @@ class Preferences(Gtk.ApplicationWindow): # Group chat settings threshold_model = self._ui.sync_threshold_combobox.get_model() - days = app.config.get_options('threshold_options', return_type=int) + options = app.config.get('threshold_options').split(',') + days = [int(option.strip()) for option in options] for day in days: if day == 0: label = _('No threshold') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e503523cad8e611df0f510c9c9dcdc19… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e503523cad8e611df0f510c9c9dcdc19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Contacts: Add can_notify() method for group chats
by Philipp Hörist 30 Jul '20

30 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 93d4e512 by lovetox at 2020-07-30T18:54:30+02:00 Contacts: Add can_notify() method for group chats - - - - - 11 changed files: - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/groupchat_control.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/message_window.py - gajim/remote_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1138,7 +1138,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if kind == 'incoming': if (not self._type.is_groupchat or - helpers.notify_for_muc(jid) or + self.contact.can_notify() or 'marked' in other_tags_for_text): # it's a normal message, or a muc message with want to be # notified about if quitting just after @@ -1176,7 +1176,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): event = 'message_received' show_in_roster = get_show_in_roster(event, self.session) show_in_systray = get_show_in_systray( - event_type.type_, self.contact.jid) + event_type.type_, self.account, self.contact.jid) event = event_type(text, subject, ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -305,8 +305,9 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.control_focused = self.control.has_focus() if app.config.get('notify_on_new_message'): - notify_for_muc = (helpers.notify_for_muc(self.jid) or - sound == 'highlight') + contact = app.contacts.get_groupchat_contact(self.account, + self.jid) + notify_for_muc = sound == 'highlight' or contact.can_notify() if not notify_for_muc: self.do_popup = False ===================================== gajim/common/contacts.py ===================================== @@ -243,6 +243,14 @@ class Contact(CommonContact): # if not '@' or '@' starts the jid then contact is transport return self.jid.find('@') <= 0 + def can_notify(self): + if not self.is_groupchat: + raise ValueError + + all_ = app.config.get('notify_on_all_muc_messages') + room = app.config.get_per('rooms', self.jid, 'notify_on_all_messages') + return all_ or room + class GC_Contact(CommonContact): """ ===================================== gajim/common/helpers.py ===================================== @@ -1434,9 +1434,3 @@ def should_log(account, jid): no_log_for = no_log_for.split() return (account not in no_log_for) and (jid not in no_log_for) - - -def notify_for_muc(room): - all_ = app.config.get('notify_on_all_muc_messages') - room = app.config.get_per('rooms', room, 'notify_on_all_messages') - return all_ or room ===================================== gajim/groupchat_control.py ===================================== @@ -962,7 +962,7 @@ class GroupchatControl(ChatControlBase): def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] - if helpers.notify_for_muc(self.room_jid): + if self.contact.can_notify(): type_events.append('printed_gc_msg') nb = len(app.events.get_events(self.account, self.room_jid, @@ -984,7 +984,7 @@ class GroupchatControl(ChatControlBase): """ highlight, sound = None, None - notify = helpers.notify_for_muc(self.room_jid) + notify = self.contact.can_notify() message_sound_enabled = app.config.get_per('soundevents', 'muc_message_received', 'enabled') ===================================== gajim/gtk/util.py ===================================== @@ -48,7 +48,6 @@ from gajim.common import configpaths from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import URL_REGEX -from gajim.common.helpers import notify_for_muc from gajim.common.const import MOODS from gajim.common.const import ACTIVITIES from gajim.common.const import LOCATION_DATA @@ -497,12 +496,14 @@ def get_show_in_roster(event, session=None): return True -def get_show_in_systray(type_, jid): +def get_show_in_systray(type_, account, jid): """ Return True if this event must be shown in systray, else False """ - notify = notify_for_muc(jid) - if type_ == 'printed_gc_msg' and not notify: + if type_ == 'printed_gc_msg': + contact = app.contacts.get_groupchat_contact(account, jid) + if contact is not None: + return contact.can_notify() # it's not an highlighted message, don't show in systray return False return app.config.get('trayicon_notification_on_events') ===================================== gajim/gui_interface.py ===================================== @@ -1058,7 +1058,7 @@ class Interface: 'file-completed': 'ft_finished'} event_type = event_types.get(event.type_) show_in_roster = get_show_in_roster(event_type, jid) - show_in_systray = get_show_in_systray(event_type, jid) + show_in_systray = get_show_in_systray(event_type, account, jid) event.show_in_roster = show_in_roster event.show_in_systray = show_in_systray app.events.add_event(account, jid, event) ===================================== gajim/message_window.py ===================================== @@ -36,7 +36,6 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import Q_ from gajim.common.i18n import _ -from gajim.common.helpers import notify_for_muc from gajim.common.nec import EventHelper from gajim import gtkgui_helpers @@ -492,8 +491,8 @@ class MessageWindow(EventHelper): unread = 0 for ctrl in self.controls(): if (ctrl.is_groupchat and - not notify_for_muc(ctrl.room_jid) and - not ctrl.attention_flag): + not ctrl.contact.can_notify() and + not ctrl.attention_flag): # count only pm messages unread += ctrl.get_nb_unread_pm() continue @@ -510,7 +509,7 @@ class MessageWindow(EventHelper): if control.is_groupchat: name = control.contact.get_shown_name() urgent = (control.attention_flag or - notify_for_muc(control.room_jid)) + control.contact.can_notify()) else: name = control.contact.get_shown_name() if control.resource: ===================================== gajim/remote_control.py ===================================== @@ -884,8 +884,12 @@ class GajimRemote(Server): def get_unread_msgs_number(self): unread = app.events.get_nb_events() for event in app.events.get_all_events(['printed_gc_msg']): - if not helpers.notify_for_muc(event.jid): + contact = app.contacts.get_groupchat_contact(event.account, + event.jid) + if contact is None or not contact.can_notify(): unread -= 1 + continue + return str(unread) def start_chat(self, jid=''): ===================================== gajim/roster_window.py ===================================== @@ -2368,7 +2368,9 @@ class RosterWindow: unread = app.events.get_nb_events() for event in app.events.get_all_events(['printed_gc_msg']): - if not helpers.notify_for_muc(event.jid): + contact = app.contacts.get_groupchat_contact(event.account, + event.jid) + if contact is None or not contact.can_notify(): unread -= 1 # check if we have recent messages ===================================== gajim/session.py ===================================== @@ -218,7 +218,9 @@ class ChatControlSession: else: # Everything else obj.show_in_roster = get_show_in_roster(event_type, self) - obj.show_in_systray = get_show_in_systray(event_type, contact.jid) + obj.show_in_systray = get_show_in_systray(event_type, + obj.conn.name, + contact.jid) do_event = True if do_event: kind = obj.properties.type.value @@ -321,7 +323,9 @@ class ChatControlSession: event_type = 'message_received' show_in_roster = get_show_in_roster(event_type, self) - show_in_systray = get_show_in_systray(event_type, contact.jid) + show_in_systray = get_show_in_systray(event_type, + self.conn.name, + contact.jid) event = event_t(msg, subject, msg_type, tim, resource, msg_log_id, session=self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93d4e5129648800294f85cc9c57adab2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93d4e5129648800294f85cc9c57adab2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HtmlTextview: Remove <img> support
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4493fead by lovetox at 2020-07-29T18:58:08+02:00 HtmlTextview: Remove <img> support If at all this needs to be reimplemented with libsoup - - - - - 5 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/gtk/htmltextview.py - mypy.ini - pylintrc Changes: ===================================== gajim/common/app.py ===================================== @@ -140,7 +140,6 @@ _dependencies = { 'AV': False, 'GEOCLUE': False, 'UPNP': False, - 'PYCURL': False, 'GSOUND': False, 'GSPELL': False, 'IDLE': False, @@ -239,13 +238,6 @@ def detect_dependencies(): except ValueError: pass - # PYCURL - try: - import pycurl # pylint: disable=unused-import - _dependencies['PYCURL'] = True - except ImportError: - pass - # IDLE try: from gajim.common import idle ===================================== gajim/common/helpers.py ===================================== @@ -38,7 +38,6 @@ import base64 import hashlib import shlex import socket -import time import logging import json import copy @@ -52,7 +51,6 @@ import string from string import Template import urllib from urllib.parse import unquote -from io import StringIO from encodings.punycode import punycode_encode from functools import wraps from packaging.version import Version as V @@ -84,9 +82,6 @@ from gajim.common.const import GIO_TLS_ERRORS from gajim.common.const import SHOW_LIST from gajim.common.structs import URI -if app.is_installed('PYCURL'): - import pycurl - log = logging.getLogger('gajim.c.helpers') @@ -871,137 +866,6 @@ def get_proxy(proxy_name): username=username, password=password) -def get_proxy_info(account): - p = app.config.get_per('accounts', account, 'proxy') - if not p: - p = app.config.get('global_proxy') - if p and p in app.config.get_per('proxies'): - proxy = {} - proxyptr = app.config.get_per('proxies', p) - if not proxyptr: - return proxy - for key in proxyptr.keys(): - proxy[key] = proxyptr[key] - return proxy - -def _get_img_direct(attrs): - """ - Download an image. This function should be launched in a separated thread. - """ - mem = b'' - alt = '' - max_size = 2*1024*1024 - if 'max_size' in attrs: - max_size = attrs['max_size'] - # Wait maximum 10s for connection - socket.setdefaulttimeout(10) - try: - req = urllib.request.Request(attrs['src']) - req.add_header('User-Agent', 'Gajim ' + app.version) - f = urllib.request.urlopen(req) - except Exception as ex: - log.debug('Error loading image %s ', attrs['src'] + str(ex)) - alt = attrs.get('alt', 'Broken image') - else: - # Wait 2s between each byte - try: - f.fp._sock.fp._sock.settimeout(2) - except Exception: - pass - - # On a slow internet connection with ~1000kbps - # you need ~10 seconds for 1 MB - deadline = time.time() + (10 * (max_size / 1048576)) - while True: - if time.time() > deadline: - log.debug('Timeout loading image %s ', attrs['src']) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - try: - temp = f.read(100) - except socket.timeout as ex: - log.debug('Timeout loading image %s ', attrs['src'] + str(ex)) - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - if temp: - mem += temp - else: - break - if len(mem) > max_size: - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Image is too big') - break - f.close() - return (mem, alt) - -def _get_img_proxy(attrs, proxy): - """ - Download an image through a proxy. This function should be launched in a - separated thread. - """ - if not app.is_installed('PYCURL'): - return '', _('PyCURL is not installed') - alt, max_size = '', 2*1024*1024 - if 'max_size' in attrs: - max_size = attrs['max_size'] - try: - b = StringIO() - c = pycurl.Curl() - c.setopt(pycurl.URL, attrs['src'].encode('utf-8')) - c.setopt(pycurl.FOLLOWLOCATION, 1) - # Wait maximum 10s for connection - c.setopt(pycurl.CONNECTTIMEOUT, 10) - - # On a slow internet connection with ~1000kbps - # you need ~10 seconds for 1 MB - c.setopt(pycurl.TIMEOUT, 10 * (max_size / 1048576)) - c.setopt(pycurl.MAXFILESIZE, max_size) - c.setopt(pycurl.WRITEFUNCTION, b.write) - c.setopt(pycurl.USERAGENT, 'Gajim ' + app.version) - # set proxy - c.setopt(pycurl.PROXY, proxy['host'].encode('utf-8')) - c.setopt(pycurl.PROXYPORT, proxy['port']) - if proxy['useauth']: - c.setopt(pycurl.PROXYUSERPWD, proxy['user'].encode('utf-8')\ - + ':' + proxy['pass'].encode('utf-8')) - c.setopt(pycurl.PROXYAUTH, pycurl.HTTPAUTH_ANY) - if proxy['type'] == 'http': - c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_HTTP) - elif proxy['type'] == 'socks5': - c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS5) - c.close() - t = b.getvalue() - return (t, attrs.get('alt', '')) - except pycurl.error as ex: - alt = attrs.get('alt', '') - if alt: - alt += '\n' - if ex.errno == pycurl.E_FILESIZE_EXCEEDED: - alt += _('Image is too big') - elif ex.errno == pycurl.E_OPERATION_TIMEOUTED: - alt += _('Timeout loading image') - else: - alt += _('Error loading image') - except Exception as ex: - log.debug('Error loading image %s ', attrs['src'] + str(ex)) - alt = attrs.get('alt', 'Broken image') - return ('', alt) - -def download_image(account, attrs): - proxy = get_proxy_info(account) - if proxy and proxy['type'] in ('http', 'socks5'): - return _get_img_proxy(attrs, proxy) - return _get_img_direct(attrs) - def version_condition(current_version, required_version): if V(current_version) < V(required_version): return False ===================================== gajim/gtk/htmltextview.py ===================================== @@ -33,7 +33,6 @@ modular. import re import logging -import urllib import xml.sax import xml.sax.handler from io import StringIO @@ -42,16 +41,12 @@ from gi.repository import GObject from gi.repository import Pango from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import GLib from gajim.common import app -from gajim.common import helpers -from gajim.common.i18n import _ from gajim.common.const import StyleAttr from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri -from gajim.gtk.util import load_icon from gajim.gtk.util import get_cursor from gajim.gui_menu_builder import get_conv_context_menu @@ -510,123 +505,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.title = title return tag - def _update_img(self, output, attrs, img_mark, tags): - '''Callback function called after the function helpers.download_image. - ''' - mem, alt = output - self._process_img(attrs, (mem, alt, img_mark, tags)) - - def _process_img(self, attrs, loaded=None): - '''Process a img tag. - ''' - mem = '' - pixbuf = None - replace_mark = None - replace_tags = None - - try: - if attrs['src'].startswith('data:image/'): - # The "data" URL scheme http://tools.ietf.org/html/rfc2397 - import base64 - img = attrs['src'].split(',')[1] - mem = base64.standard_b64decode(urllib.parse.unquote( - img).encode('utf-8')) - elif loaded is not None: - (mem, alt, replace_mark, replace_tags) = loaded - else: - if self.conv_textview: - img_mark = self.textbuf.create_mark(None, self.iter, True) - app.thread_interface( - helpers.download_image, - [self.conv_textview.account, attrs], - self._update_img, - [attrs, img_mark, self._get_style_tags()]) - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Loading') - pixbuf = load_icon('image-missing', - self.textview, - pixbuf=True) - if mem: - # Caveat: GdkPixbuf is known not to be safe to load - # images from network... this program is now potentially - # hackable ;) - loader = GdkPixbuf.PixbufLoader() - dims = [0, 0] - def height_cb(length): - dims[1] = length - def width_cb(length): - dims[0] = length - # process width and height attributes - width = attrs.get('width') - height = attrs.get('height') - # override with width and height styles - for attr, val in style_iter(attrs.get('style', '')): - if attr == 'width': - width = val - elif attr == 'height': - height = val - if width: - self._parse_length(width, False, False, 1, 1000, width_cb) - if height: - self._parse_length(height, False, False, 1, 1000, height_cb) - - def set_size(_pixbuf, width_, height_, dims): - """ - FIXME: Floats should be relative to the whole textview, and - resize with it. This needs new pifbufs for every resize, - GdkPixbuf.Pixbuf.scale_simple or similar. - """ - if isinstance(dims[0], float): - dims[0] = int(dims[0] * width_) - elif not dims[0]: - dims[0] = width_ - if isinstance(dims[1], float): - dims[1] = int(dims[1] * height_) - if not dims[1]: - dims[1] = height_ - loader.set_size(*dims) - - if width or height: - loader.connect('size-prepared', set_size, dims) - loader.write(mem) - loader.close() - pixbuf = loader.get_pixbuf() - alt = attrs.get('alt', '') - working_iter = self.iter - if replace_mark is not None: - working_iter = self.textbuf.get_iter_at_mark(replace_mark) - next_iter = working_iter.copy() - next_iter.forward_char() - self.textbuf.delete(working_iter, next_iter) - self.textbuf.delete_mark(replace_mark) - if pixbuf is not None: - if replace_mark: - tags = replace_tags - else: - tags = self._get_style_tags() - if tags: - tmpmark = self.textbuf.create_mark(None, working_iter, True) - self.textbuf.insert_pixbuf(working_iter, pixbuf) - self.starting = False - if tags: - start = self.textbuf.get_iter_at_mark(tmpmark) - for tag in tags: - self.textbuf.apply_tag(tag, start, working_iter) - self.textbuf.delete_mark(tmpmark) - else: - self._insert_text('[IMG: %s]' % alt, working_iter) - except Exception as ex: - log.error('Error loading image %s', str(ex)) - pixbuf = None - alt = attrs.get('alt', 'Broken image') - try: - loader.close() - except Exception: - pass - return pixbuf - def _begin_span(self, style, tag=None, id_=None): if style is None: self.styles.append(tag) @@ -730,8 +608,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.is_anchor = True elif name in LIST_ELEMS: style += ';margin-left: 2em' - elif name == 'img': - tag = self._process_img(attrs) + if name in _element_styles: style += _element_styles[name] # so that explicit styles override implicit ones, ===================================== mypy.ini ===================================== @@ -40,9 +40,6 @@ ignore_missing_imports = True [mypy-PIL.*] ignore_missing_imports = True -[mypy-pycurl.*] -ignore_missing_imports = True - [mypy-netifaces.*] ignore_missing_imports = True ===================================== pylintrc ===================================== @@ -3,7 +3,7 @@ # A comma-separated list of package or module names from where C extensions may # be loaded. Extensions are loading into the active Python interpreter and may # run arbitrary code -extension-pkg-whitelist=pycurl +extension-pkg-whitelist= # Add files or directories to the blacklist. They should be base names, not # paths. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4493feadfbcb5989f5a458ec4207c0bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4493feadfbcb5989f5a458ec4207c0bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix warning 'Theme Standard not found, fallback to default'
by Philipp Hörist 29 Jul '20

29 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 636effbc by André Apitzsch at 2020-07-29T17:53:03+02:00 Fix warning 'Theme Standard not found, fallback to default' when new config is generated - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -91,7 +91,7 @@ class Config: 'iconset': [opt_str, DEFAULT_ICONSET, '', True], 'use_transports_iconsets': [opt_bool, True, '', True], 'collapsed_rows': [opt_str, '', _('List of rows (accounts and groups) that are collapsed (space separated).'), True], - 'roster_theme': [opt_str, _('default'), '', True], + 'roster_theme': [opt_str, 'default', '', True], 'mergeaccounts': [opt_bool, False, '', True], 'sort_by_show_in_roster': [opt_bool, True, '', True], 'sort_by_show_in_muc': [opt_bool, False, '', True], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/636effbc9232cf3805365e8715dea71d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/636effbc9232cf3805365e8715dea71d… 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 July 2020