Commits November 2017

commits@gajim.org

1 participants
52 discussions

[Git][gajim/gajim][master] 2 commits: Fix additional_data in events
by Philipp Hörist 01 Nov '17

01 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0638cdc6 by Thilo Molitor at 2017-11-01T23:14:47+01:00 Fix additional_data in events - - - - - 3bf3ddeb by Philipp Hörist at 2017-11-01T23:44:43+01:00 Merge branch 'master' into 'master' Fix additional_data in events See merge request gajim/gajim!146 - - - - - 6 changed files: - gajim/chat_control.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/logger.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1385,7 +1385,7 @@ class ChatControl(ChatControlBase): self.print_conversation(event.message, kind, tim=event.time, encrypted=event.encrypted, subject=event.subject, xhtml=event.xhtml, displaymarking=event.displaymarking, - correct_id=event.correct_id) + correct_id=event.correct_id, additional_data=event.additional_data) if isinstance(event.msg_log_id, int): message_ids.append(event.msg_log_id) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1124,7 +1124,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): base_network_events = ['raw-message-received'] def init(self): - self.additional_data = None + self.additional_data = {} def generate(self): self.conn = self.base_event.conn @@ -2696,7 +2696,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): base_network_events = [] def init(self): - self.additional_data = None + self.additional_data = {} self.message = None self.keyID = None self.type_ = 'chat' ===================================== gajim/common/events.py ===================================== --- a/gajim/common/events.py +++ b/gajim/common/events.py @@ -83,6 +83,8 @@ class ChatEvent(Event): self.form_node = form_node self.displaymarking = displaymarking self.sent_forwarded = sent_forwarded + if additional_data is None: + additional_data = {} self.additional_data = additional_data class NormalEvent(ChatEvent): ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -132,9 +132,8 @@ class Logger: Row = namedtuple("Row", fields) named_row = Row(*row) if 'additional_data' in fields: - if named_row.additional_data is not None: - named_row = named_row._replace( - additional_data=json.loads(named_row.additional_data)) + named_row = named_row._replace( + additional_data=json.loads(named_row.additional_data or '{}')) return named_row def dispatch(self, event, error): @@ -1113,7 +1112,13 @@ class Logger: a field in the `logs` table """ jid_id = self.get_jid_id(jid, kind=kind) - + + if 'additional_data' in kwargs: + if not kwargs['additional_data']: + del kwargs['additional_data'] + else: + kwargs['additional_data'] = json.dumps(kwargs["additional_data"]) + sql = ''' INSERT INTO logs (jid_id, time, kind, {columns}) VALUES (?, ?, ?, {values}) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2723,7 +2723,7 @@ class RosterWindow: tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, - xep0184_id=xep0184_id) + xep0184_id=xep0184_id, additional_data=obj.additional_data) if obj.msg_log_id: pw = obj.session.control.parent_win end = obj.session.control.was_at_the_end ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -273,7 +273,8 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): displaymarking=obj.displaymarking, sent_forwarded=obj.forwarded and obj.sent, show_in_roster=obj.show_in_roster, - show_in_systray=obj.show_in_systray) + show_in_systray=obj.show_in_systray, + additional_data=obj.additional_data) app.events.add_event(self.conn.name, fjid, event) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f397e1b7cb4a0f09f8005e30ce039882b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f397e1b7cb4a0f09f8005e30ce039882b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Make OptionsDialog extendable
by Philipp Hörist 01 Nov '17

01 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5510e042 by Philipp Hörist at 2017-11-01T11:42:44+01:00 Make OptionsDialog extendable Plugins or other code can pass custom Options - - - - - f397e1b7 by Philipp Hörist at 2017-11-01T12:25:19+01:00 Rename OptionType.BOOL to VALUE - - - - - 3 changed files: - gajim/common/const.py - gajim/dialogs.py - gajim/options_dialog.py Changes: ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -24,7 +24,7 @@ class OptionKind(IntEnum): class OptionType(IntEnum): ACCOUNT_CONFIG = 0 CONFIG = 1 - BOOL = 2 + VALUE = 2 ACTION = 3 DIALOG = 4 ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3439,24 +3439,24 @@ class XMLConsoleWindow(Gtk.Window): def on_filter_options(self, *args): options = [ Option(OptionKind.SWITCH, 'Presence', - OptionType.BOOL, self.presence, + OptionType.VALUE, self.presence, callback=self.on_option, data='presence'), Option(OptionKind.SWITCH, 'Message', - OptionType.BOOL, self.message, + OptionType.VALUE, self.message, callback=self.on_option, data='message'), - Option(OptionKind.SWITCH, 'Iq', OptionType.BOOL, self.iq, + Option(OptionKind.SWITCH, 'Iq', OptionType.VALUE, self.iq, callback=self.on_option, data='iq'), Option(OptionKind.SWITCH, 'Stream\nManagement', - OptionType.BOOL, self.stream, + OptionType.VALUE, self.stream, callback=self.on_option, data='stream'), - Option(OptionKind.SWITCH, 'In', OptionType.BOOL, self.incoming, + Option(OptionKind.SWITCH, 'In', OptionType.VALUE, self.incoming, callback=self.on_option, data='incoming'), - Option(OptionKind.SWITCH, 'Out', OptionType.BOOL, self.outgoing, + Option(OptionKind.SWITCH, 'Out', OptionType.VALUE, self.outgoing, callback=self.on_option, data='outgoing'), ] ===================================== gajim/options_dialog.py ===================================== --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -8,7 +8,8 @@ from gajim import dialogs class OptionsDialog(Gtk.ApplicationWindow): - def __init__(self, parent, title, flags, options, account): + def __init__(self, parent, title, flags, options, account, + extend=None): Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_show_menubar(False) @@ -23,7 +24,7 @@ class OptionsDialog(Gtk.ApplicationWindow): elif flags == Gtk.DialogFlags.DESTROY_WITH_PARENT: self.set_destroy_with_parent(True) - self.listbox = OptionsBox(account) + self.listbox = OptionsBox(account, extend) self.listbox.set_hexpand(True) self.listbox.set_selection_mode(Gtk.SelectionMode.NONE) @@ -50,7 +51,7 @@ class OptionsDialog(Gtk.ApplicationWindow): class OptionsBox(Gtk.ListBox): - def __init__(self, account): + def __init__(self, account, extend=None): Gtk.ListBox.__init__(self) self.set_name('OptionsBox') self.account = account @@ -72,6 +73,10 @@ class OptionsBox(Gtk.ListBox): OptionKind.GPG: GPGOption, } + if extend is not None: + for option, callback in extend: + self.map[option] = callback + def add_option(self, option): if option.props is not None: listitem = self.map[option.kind]( @@ -168,7 +173,7 @@ class GenericOption(Gtk.Grid): def __get_value(type_, value, account): if value is None: return - if type_ == OptionType.BOOL: + if type_ == OptionType.VALUE: return value elif type_ == OptionType.CONFIG: return app.config.get(value) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ecd5c652a24c156460f782d15362f9a3e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ecd5c652a24c156460f782d15362f9a3e… 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 November 2017