Commits June 2017

commits@gajim.org

1 participants
45 discussions

[Git][gajim/gajim][master] Dont set scrollbar policy in GC config window
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 209fa4c9 by Philipp Hörist at 2017-06-11T22:54:15+02:00 Dont set scrollbar policy in GC config window This crashes Gajim on Windows. Its to be investigated why this happens and how we can avoid it. - - - - - 1 changed file: - src/config.py Changes: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -2935,7 +2935,6 @@ class GroupchatConfigWindow: self.affiliation_treeview[affiliation].append_column(col) sw = Gtk.ScrolledWindow() - sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.NEVER) sw.add(self.affiliation_treeview[affiliation]) add_on_vbox.pack_start(sw, True, True, 0) gajim.connections[self.account].get_affiliation_list(self.room_jid, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/209fa4c92634cdd86ee6ae25b34c3ab636…

1 0

[Git][gajim/gajim][master] Show encryption icon in chat
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c34dd6d by Philipp Hörist at 2017-06-11T20:06:34+02:00 Show encryption icon in chat - - - - - 6 changed files: - + icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png - src/chat_control.py - src/chat_control_base.py - src/common/connection_handlers_events.py - src/conversation_textview.py - src/groupchat_control.py Changes: ===================================== icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png ===================================== Binary files /dev/null and b/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png differ ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -990,7 +990,7 @@ class ChatControl(ChatControlBase): def get_our_nick(self): return gajim.nicks[self.account] - def print_conversation(self, text, frm='', tim=None, encrypted=False, + def print_conversation(self, text, frm='', tim=None, encrypted=None, subject=None, xhtml=None, simple=False, xep0184_id=None, displaymarking=None, msg_log_id=None, correct_id=None, msg_stanza_id=None, additional_data=None): @@ -1023,12 +1023,6 @@ class ChatControl(ChatControlBase): kind = 'info' name = '' else: - if self.session and self.session.enable_encryption: - # ESessions - if not encrypted: - msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', - '', tim) if not frm: kind = 'incoming' name = contact.get_shown_name() @@ -1048,7 +1042,8 @@ class ChatControl(ChatControlBase): subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, - correct_id=correct_id, additional_data=additional_data) + correct_id=correct_id, additional_data=additional_data, + encrypted=encrypted) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -894,7 +894,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, - msg_stanza_id=None, correct_id=None, additional_data=None): + msg_stanza_id=None, correct_id=None, additional_data=None, + encrypted=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -919,7 +920,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): other_tags_for_name, other_tags_for_time, other_tags_for_text, subject, old_kind, xhtml, simple=simple, graphics=graphics, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, - correct_id=correct_id, additional_data=additional_data) + correct_id=correct_id, additional_data=additional_data, + encrypted=encrypted) if xep0184_id is not None: textview.add_xep0184_mark(xep0184_id) ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1497,6 +1497,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): self.nickname = self.msg_obj.resource self.timestamp = self.msg_obj.timestamp self.xhtml_msgtxt = self.stanza.getXHTML() + self.encrypted = self.msg_obj.encrypted self.correct_id = None # XEP-0308 if gajim.config.get('ignore_incoming_xhtml'): ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -170,6 +170,8 @@ class ConversationTextview(GObject.GObject): MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'document-edit-symbolic') + MESSAGE_ENCRYPTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'channel-secure-croped-symbolic') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds @@ -1100,7 +1102,8 @@ class ConversationTextview(GObject.GObject): def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, - displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None): + displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, + encrypted=None): """ Print 'chat' type messages """ @@ -1168,6 +1171,9 @@ class ConversationTextview(GObject.GObject): self.print_time(text, kind, tim, simple, direction_mark, other_tags_for_time, iter_) + if encrypted: + buffer_.insert_pixbuf(iter_, self.MESSAGE_ENCRYPTED_PIXBUF) + # If there's a displaymarking, print it here. if displaymarking: self.print_displaymarking(displaymarking, iter_=iter_) ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1090,14 +1090,14 @@ class GroupchatControl(ChatControlBase): # don't print xhtml if it's an old message. # Like that xhtml messages are grayed too. self.print_old_conversation(obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, xhtml=None, + tim=obj.timestamp, xhtml=None, encrypted=obj.encrypted, displaymarking=obj.displaymarking, msg_stanza_id=obj.id_) else: if obj.nick == self.nick: self.last_sent_txt = obj.msgtxt self.print_conversation(obj.msgtxt, contact=obj.nick, tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, - displaymarking=obj.displaymarking, + displaymarking=obj.displaymarking, encrypted=obj.encrypted, correct_id=obj.correct_id, msg_stanza_id=obj.id_) obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) @@ -1153,7 +1153,7 @@ class GroupchatControl(ChatControlBase): return None def print_old_conversation(self, text, contact='', tim=None, xhtml = None, - displaymarking=None, msg_stanza_id=None): + displaymarking=None, msg_stanza_id=None, encrypted=None): if contact: if contact == self.nick: # it's us kind = 'outgoing' @@ -1165,13 +1165,16 @@ class GroupchatControl(ChatControlBase): small_attr = ['small'] else: small_attr = [] + ChatControlBase.print_conversation_line(self, text, kind, contact, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml, - displaymarking=displaymarking, msg_stanza_id=msg_stanza_id) + displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, + encrypted=encrypted) def print_conversation(self, text, contact='', tim=None, xhtml=None, - graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None): + graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None, + encrypted=None): """ Print a line in the conversation @@ -1233,7 +1236,7 @@ class GroupchatControl(ChatControlBase): ChatControlBase.print_conversation_line(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text, xhtml=xhtml, graphics=graphics, displaymarking=displaymarking, - correct_id=correct_id, msg_stanza_id=msg_stanza_id) + correct_id=correct_id, msg_stanza_id=msg_stanza_id, encrypted=encrypted) def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c34dd6d458d2a09731925fa2e7346ac0b…

1 0

[Git][gajim/gajim][master] Set transient for ErrorDialog
by Philipp Hörist 08 Jun '17

08 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8115e41 by Philipp Hörist at 2017-06-08T23:34:03+02:00 Set transient for ErrorDialog Fixes #8649 - - - - - 1 changed file: - src/adhoc_commands.py Changes: ===================================== src/adhoc_commands.py ===================================== --- a/src/adhoc_commands.py +++ b/src/adhoc_commands.py @@ -367,8 +367,10 @@ class CommandWindow: if self.data_form_widget.get_data_form(): df = self.data_form_widget.get_data_form() if not df.is_valid(): - dialogs.ErrorDialog(_('Invalid Form'), - _('The form is not filled correctly.')) + dialogs.ErrorDialog( + _('Invalid Form'), + _('The form is not filled correctly.'), + transient_for=self.window) self.data_form_widget.set_sensitive(True) return self.data_form_widget.data_form.type_ = 'submit' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c8115e4164496da3527486507cb0c0acb8…

1 0

[Git][gajim/gajim][gajim_0.16] 3 commits: Pass use_agent to GPG init instead of overwrite
by Philipp Hörist 08 Jun '17

08 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 2da22cf3 by Philipp Hörist at 2017-06-08T23:30:08+02:00 Pass use_agent to GPG init instead of overwrite - - - - - 35f8893b by Philipp Hörist at 2017-06-08T23:30:57+02:00 Remove unused GPG code - - - - - 5433b2a2 by Philipp Hörist at 2017-06-08T23:31:09+02:00 Always pass utf8 encoded strings to python-gnupg self.encoding which we set in the init is only intended to decode gpg´s stderr which uses a system specific encoding. if we dont encode the data we pass to python-gnupg ourself, it will fallback and use self.encoding. This might be of no concern if self.encoding is set to 'utf8' and when we are on Linux which has a preferred encoding of 'utf8'. But if we are on Windows the preferred encoding for stderr is most of the time not 'utf8'. If python-gnupg tries to decode a stderr stream that is for example encoded with 'cp1252' with our set encoding of 'utf8' this will fail. The solution is to pre-encode the data before we pass it to python-gnupg, so it does not have to use self.encoding as a fallback. And set self.encoding='latin1' because latin1 will not yield exceptions on decoding errors. Also gpg itself will fallback to latin1 as stderr encoding when it cant determine the preferred encoding of a system. self.decode_errors is used for something differently, and has no influence on the situation. Fixes #8644 - - - - - 2 changed files: - src/common/connection.py - src/common/gpg.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -147,7 +147,7 @@ class CommonConnection: self.USE_GPG = False if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) + self.gpg = gpg.GnuPG() self.status = '' self.old_show = '' self.priority = gajim.get_priority(name, 'offline') @@ -248,8 +248,7 @@ class CommonConnection: signed = '' keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID and self.USE_GPG: - use_gpg_agent = gajim.config.get('use_gpg_agent') - if self.gpg.passphrase is None and not use_gpg_agent: + if self.gpg.passphrase is None and not self.gpg.use_agent: # We didn't set a passphrase return None signed = self.gpg.sign(msg, keyID) @@ -692,8 +691,7 @@ class CommonConnection: def gpg_passphrase(self, passphrase): if self.gpg: - use_gpg_agent = gajim.config.get('use_gpg_agent') - if use_gpg_agent: + if self.gpg.use_agent: self.gpg.passphrase = None else: self.gpg.passphrase = passphrase @@ -740,7 +738,7 @@ class CommonConnection: self.server_resource = self._compute_resource() if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) + self.gpg = gpg.GnuPG() gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, conn=self, show=show, message=msg)) self.connect_and_init(show, msg, sign_msg) @@ -1017,8 +1015,7 @@ class Connection(CommonConnection, ConnectionHandlers): return if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = gpg.GnuPG(gajim.config.get( - 'use_gpg_agent')) + self.gpg = gpg.GnuPG() gajim.nec.push_incoming_event( AccountCreatedEvent(None, conn=self, account_info = self.new_account_info)) ===================================== src/common/gpg.py ===================================== --- a/src/common/gpg.py +++ b/src/common/gpg.py @@ -32,26 +32,16 @@ if gajim.HAVE_GPG: gnupg.logger = logging.getLogger('gajim.c.gnupg') class GnuPG(gnupg.GPG): - def __init__(self, use_agent=False): - gnupg.GPG.__init__(self, gpgbinary=gajim.GPG_BINARY) + def __init__(self): + use_agent = gajim.config.get('use_gpg_agent') + gnupg.GPG.__init__(self, gpgbinary=gajim.GPG_BINARY, use_agent=use_agent) encoding = gajim.config.get('pgp_encoding') if encoding: self.encoding = encoding self.decode_errors = 'replace' self.passphrase = None - self.use_agent = use_agent self.always_trust = [] # list of keyID to always trust - def _setup_my_options(self): - self.options.armor = 1 - self.options.meta_interactive = 0 - self.options.extra_args.append('--no-secmem-warning') - # disable photo viewer when verifying keys - self.options.extra_args.append('--verify-options') - self.options.extra_args.append('no-show-photo') - if self.use_agent: - self.options.extra_args.append('--use-agent') - def encrypt(self, str_, recipients, always_trust=False): trust = always_trust if not trust: @@ -69,7 +59,7 @@ if gajim.HAVE_GPG: return '', 'NOT_TRUSTED ' + key['keyid'][-8:] else: trust = True - result = super(GnuPG, self).encrypt(str_, recipients, + result = super(GnuPG, self).encrypt(str_.encode('utf8'), recipients, always_trust=trust, passphrase=self.passphrase) if result.ok: @@ -81,13 +71,13 @@ if gajim.HAVE_GPG: def decrypt(self, str_, keyID): data = self._addHeaderFooter(str_, 'MESSAGE') - result = super(GnuPG, self).decrypt(data, + result = super(GnuPG, self).decrypt(data.encode('utf8'), passphrase=self.passphrase) return str(result) def sign(self, str_, keyID): - result = super(GnuPG, self).sign(str_, keyid=keyID, detach=True, + result = super(GnuPG, self).sign(str_.encode('utf8'), keyid=keyID, detach=True, passphrase=self.passphrase) if result.fingerprint: @@ -110,7 +100,7 @@ if gajim.HAVE_GPG: str_, self._addHeaderFooter(sign, 'SIGNATURE')] ) - result = super(GnuPG, self).verify(data) + result = super(GnuPG, self).verify(data.encode('utf8')) if result.valid: return result.key_id View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cc42fba09bcf837042e5bd72c81f14487…

1 0

[Git][gajim/gajim][gajim_0.16] Set transient for ErrorDialog
by Philipp Hörist 08 Jun '17

08 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: cc42fba0 by Philipp Hörist at 2017-06-08T23:23:37+02:00 Set transient for ErrorDialog Fixes #8649 - - - - - 1 changed file: - src/adhoc_commands.py Changes: ===================================== src/adhoc_commands.py ===================================== --- a/src/adhoc_commands.py +++ b/src/adhoc_commands.py @@ -369,8 +369,10 @@ class CommandWindow: if self.data_form_widget.get_data_form(): df = self.data_form_widget.get_data_form() if not df.is_valid(): - dialogs.ErrorDialog(_('Invalid Form'), - _('The form is not filled correctly.')) + dialogs.ErrorDialog( + _('Invalid Form'), + _('The form is not filled correctly.'), + transient_for=self.window) self.data_form_widget.set_sensitive(True) return self.data_form_widget.data_form.type_ = 'submit' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cc42fba09bcf837042e5bd72c81f144873…

1 0

[Git][gajim/gajim][master] 4 commits: Pass use_agent to GPG init instead of overwrite
by Philipp Hörist 08 Jun '17

08 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 92b0a155 by Philipp Hörist at 2017-06-08T19:09:22+02:00 Pass use_agent to GPG init instead of overwrite - - - - - 2872993b by Philipp Hörist at 2017-06-08T19:10:04+02:00 Remove unused GPG code - - - - - 1bf66b85 by Philipp Hörist at 2017-06-08T19:33:01+02:00 Always pass utf8 encoded strings to python-gnupg self.encoding which we set in the init is only intended to decode gpg´s stderr which uses a system specific encoding. if we dont encode the data we pass to python-gnupg ourself, it will fallback and use self.encoding. This might be of no concern if self.encoding is set to 'utf8' and when we are on Linux which has a preferred encoding of 'utf8'. But if we are on Windows the preferred encoding for stderr is most of the time not 'utf8'. If python-gnupg tries to decode a stderr stream that is for example encoded with 'cp1252' with our set encoding of 'utf8' this will fail. The solution is to pre-encode the data before we pass it to python-gnupg, so it does not have to use self.encoding as a fallback. And set self.encoding='latin1' because latin1 will not yield exceptions on decoding errors. Also gpg itself will fallback to latin1 as stderr encoding when it cant determine the preferred encoding of a system. self.decode_errors is used for something differently, and has no influence on the situation. Fixes #8644 - - - - - 2296e75d by Philipp Hörist at 2017-06-08T19:58:40+02:00 Replace unicode char in print message - - - - - 3 changed files: - src/common/connection.py - src/common/gpg.py - src/gajim.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -132,7 +132,7 @@ class CommonConnection: self.USE_GPG = False if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) + self.gpg = gpg.GnuPG() self.status = '' self.old_show = '' self.priority = gajim.get_priority(name, 'offline') @@ -234,8 +234,7 @@ class CommonConnection: signed = '' keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID and self.USE_GPG: - use_gpg_agent = gajim.config.get('use_gpg_agent') - if self.gpg.passphrase is None and not use_gpg_agent: + if self.gpg.passphrase is None and not self.gpg.use_agent: # We didn't set a passphrase return None signed = self.gpg.sign(msg, keyID) @@ -566,8 +565,7 @@ class CommonConnection: def gpg_passphrase(self, passphrase): if self.gpg: - use_gpg_agent = gajim.config.get('use_gpg_agent') - if use_gpg_agent: + if self.gpg.use_agent: self.gpg.passphrase = None else: self.gpg.passphrase = passphrase @@ -614,7 +612,7 @@ class CommonConnection: self.server_resource = self._compute_resource() if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent')) + self.gpg = gpg.GnuPG() gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, conn=self, show=show, message=msg)) self.connect_and_init(show, msg, sign_msg) @@ -892,8 +890,7 @@ class Connection(CommonConnection, ConnectionHandlers): return if gajim.HAVE_GPG: self.USE_GPG = True - self.gpg = gpg.GnuPG(gajim.config.get( - 'use_gpg_agent')) + self.gpg = gpg.GnuPG() gajim.nec.push_incoming_event( AccountCreatedEvent(None, conn=self, account_info = self.new_account_info)) ===================================== src/common/gpg.py ===================================== --- a/src/common/gpg.py +++ b/src/common/gpg.py @@ -32,26 +32,16 @@ if HAVE_GPG: gnupg.logger = logging.getLogger('gajim.c.gnupg') class GnuPG(gnupg.GPG): - def __init__(self, use_agent=False): - gnupg.GPG.__init__(self, gpgbinary=GPG_BINARY) + def __init__(self): + use_agent = gajim.config.get('use_gpg_agent') + gnupg.GPG.__init__(self, gpgbinary=GPG_BINARY, use_agent=use_agent) encoding = gajim.config.get('pgp_encoding') if encoding: self.encoding = encoding self.decode_errors = 'replace' self.passphrase = None - self.use_agent = use_agent self.always_trust = [] # list of keyID to always trust - def _setup_my_options(self): - self.options.armor = 1 - self.options.meta_interactive = 0 - self.options.extra_args.append('--no-secmem-warning') - # disable photo viewer when verifying keys - self.options.extra_args.append('--verify-options') - self.options.extra_args.append('no-show-photo') - if self.use_agent: - self.options.extra_args.append('--use-agent') - def encrypt(self, str_, recipients, always_trust=False): trust = always_trust if not trust: @@ -69,7 +59,7 @@ if HAVE_GPG: return '', 'NOT_TRUSTED ' + key['keyid'][-8:] else: trust = True - result = super(GnuPG, self).encrypt(str_, recipients, + result = super(GnuPG, self).encrypt(str_.encode('utf8'), recipients, always_trust=trust, passphrase=self.passphrase) if result.ok: @@ -81,13 +71,13 @@ if HAVE_GPG: def decrypt(self, str_, keyID): data = self._addHeaderFooter(str_, 'MESSAGE') - result = super(GnuPG, self).decrypt(data, + result = super(GnuPG, self).decrypt(data.encode('utf8'), passphrase=self.passphrase) return str(result) def sign(self, str_, keyID): - result = super(GnuPG, self).sign(str_, keyid=keyID, detach=True, + result = super(GnuPG, self).sign(str_.encode('utf8'), keyid=keyID, detach=True, passphrase=self.passphrase) if result.fingerprint: @@ -110,7 +100,7 @@ if HAVE_GPG: str_, self._addHeaderFooter(sign, 'SIGNATURE')] ) - result = super(GnuPG, self).verify(data) + result = super(GnuPG, self).verify(data.encode('utf8')) if result.valid: return result.key_id ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -122,7 +122,7 @@ class GajimApplication(Gtk.Application): from distutils.version import LooseVersion as V if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): print('Gajim needs python-nbxmpp >= %s to run. ' - 'Quitting…' % MIN_NBXMPP_VER) + 'Quitting...' % MIN_NBXMPP_VER) sys.exit(1) # Create and initialize Application Paths & Databases View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b5e9b07a07508689bf9b8509a0049aa55…

1 0

[Git][gajim/gajim][master] Remove unused or old config values
by Philipp Hörist 06 Jun '17

06 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5e9b07a by Philipp Hörist at 2017-06-06T22:12:37+02:00 Remove unused or old config values - - - - - 2 changed files: - src/common/connection.py - src/config.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1007,7 +1007,7 @@ class Connection(CommonConnection, ConnectionHandlers): Start a connection to the XMPP server Returns connection, and connection type ('tls', 'ssl', 'plain', '') data - MUST contain hostname, usessl, proxy, use_custom_host, custom_host (if + MUST contain hostname, proxy, use_custom_host, custom_host (if use_custom_host), custom_port (if use_custom_host) """ if self.connection: @@ -1039,7 +1039,6 @@ class Connection(CommonConnection, ConnectionHandlers): custom_p = data['custom_port'] else: hostname = gajim.config.get_per('accounts', self.name, 'hostname') - usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -4026,14 +4026,12 @@ class AccountCreationWizardWindow: config['hostname'] = server config['savepass'] = savepass config['password'] = password - config['resource'] = 'Gajim' config['anonymous_auth'] = anonymous config['priority'] = 5 config['autoconnect'] = True config['no_log_for'] = '' config['sync_with_global_status'] = True config['proxy'] = '' - config['usessl'] = False config['use_custom_host'] = False config['custom_port'] = 0 config['custom_host'] = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5e9b07a07508689bf9b8509a0049aa55a…

1 0

[Git][gajim/gajim][gajim_0.16] Remove unused or old config values
by Philipp Hörist 06 Jun '17

06 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 53e55677 by Philipp Hörist at 2017-06-06T21:24:27+02:00 Remove unused or old config values - - - - - 2 changed files: - src/common/connection.py - src/config.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1132,7 +1132,7 @@ class Connection(CommonConnection, ConnectionHandlers): Start a connection to the Jabber server Returns connection, and connection type ('tls', 'ssl', 'plain', '') data - MUST contain hostname, usessl, proxy, use_custom_host, custom_host (if + MUST contain hostname, proxy, use_custom_host, custom_host (if use_custom_host), custom_port (if use_custom_host) """ if self.connection: @@ -1164,7 +1164,6 @@ class Connection(CommonConnection, ConnectionHandlers): custom_p = data['custom_port'] else: hostname = gajim.config.get_per('accounts', self.name, 'hostname') - usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -4017,14 +4017,12 @@ class AccountCreationWizardWindow: config['hostname'] = server config['savepass'] = savepass config['password'] = password - config['resource'] = 'Gajim' config['anonymous_auth'] = anonymous config['priority'] = 5 config['autoconnect'] = True config['no_log_for'] = '' config['sync_with_global_status'] = True config['proxy'] = '' - config['usessl'] = False config['use_custom_host'] = False config['custom_port'] = 0 config['custom_host'] = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/53e556774fbad7d5b1a3e0679ebe806324…

1 0

[Git][gajim/gajim][gajim_0.16] Improve error handling of zeroconf bonjour
by Philipp Hörist 06 Jun '17

06 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 8a66c100 by Philipp Hörist at 2017-06-06T20:10:13+02:00 Improve error handling of zeroconf bonjour - - - - - 1 changed file: - src/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== src/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/src/common/zeroconf/zeroconf_bonjour.py +++ b/src/common/zeroconf/zeroconf_bonjour.py @@ -72,10 +72,13 @@ class Zeroconf: self.remove_service_callback(serviceName) return - # asynchronous resolving - resolve_sdRef = pybonjour.DNSServiceResolve(0, interfaceIndex, serviceName, regtype, replyDomain, self.service_resolved_callback) - try: + # asynchronous resolving + resolve_sdRef = None + resolve_sdRef = pybonjour.DNSServiceResolve( + 0, interfaceIndex, serviceName, + regtype, replyDomain, self.service_resolved_callback) + while not self.resolved: ready = select.select([resolve_sdRef], [], [], resolve_timeout) if resolve_sdRef not in ready[0]: @@ -84,8 +87,13 @@ class Zeroconf: pybonjour.DNSServiceProcessResult(resolve_sdRef) else: self.resolved.pop() + + except pybonjour.BonjourError, e: + log.info('Error when resolving DNS: %s', e) + finally: - resolve_sdRef.close() + if resolve_sdRef: + resolve_sdRef.close() def remove_service_callback(self, name): log.info('Service %s disappeared.' % name) @@ -189,6 +197,7 @@ class Zeroconf: self.resolved_contacts[hosttarget] = (fullname, port, txtRecord) try: + query_sdRef = None query_sdRef = \ pybonjour.DNSServiceQueryRecord(interfaceIndex = interfaceIndex, fullname = hosttarget, @@ -205,13 +214,14 @@ class Zeroconf: self.queried.pop() except pybonjour.BonjourError, e: - if e[0][0] == kDNSServiceErr_ServiceNotRunning: + if e.errorCode == kDNSServiceErr_ServiceNotRunning: log.info('Service not running') else: - self.error_CB(_('Error while adding service. %s') % str(e[0][0])) + self.error_CB(_('Error while adding service. %s') % e) finally: - query_sdRef.close() + if query_sdRef: + query_sdRef.close() self.resolved.append(True) @@ -274,10 +284,10 @@ class Zeroconf: pybonjour.DNSServiceProcessResult(self.service_sdRef) except pybonjour.BonjourError, e: - if e[0][0] == kDNSServiceErr_ServiceNotRunning: + if e.errorCode == kDNSServiceErr_ServiceNotRunning: log.info('Service not running') else: - self.error_CB(_('Error while adding service. %s') % str(e[0][0])) + self.error_CB(_('Error while adding service. %s') % e) self.disconnect() def announce(self): @@ -296,7 +306,7 @@ class Zeroconf: self.announced = False return True except pybonjour.BonjourError, e: - log.debug(e) + log.error('Error when removing announce: %s', e) return False def connect(self): @@ -325,10 +335,10 @@ class Zeroconf: log.info('Starting to browse .local') return True except pybonjour.BonjourError, e: - if e[0][0] == kDNSServiceErr_ServiceNotRunning: + if e.errorCode == kDNSServiceErr_ServiceNotRunning: log.info('Service not running') else: - log.error('Error while browsing for services. %s', str(e[0][0])) + log.error('Error while browsing for services. %s', e) return False def browse_loop(self): @@ -337,12 +347,11 @@ class Zeroconf: if self.browse_sdRef in ready[0]: pybonjour.DNSServiceProcessResult(self.browse_sdRef) except pybonjour.BonjourError, e: - if e[0][0] == kDNSServiceErr_ServiceNotRunning: + if e.errorCode == kDNSServiceErr_ServiceNotRunning: log.info('Service not running') return False else: - log.error('Error while browsing for services. %s', - str(e[0][0])) + log.error('Error while browsing for services. %s', e) return True # resolve_all() is called every X seconds and querys for new clients @@ -358,6 +367,7 @@ class Zeroconf: # its more efficient (see pybonjour documentation) for val in self.contacts.values(): try: + query_sdRef = None query_sdRef = \ pybonjour.DNSServiceQueryRecord( interfaceIndex=pybonjour.kDNSServiceInterfaceIndexAny, @@ -375,13 +385,13 @@ class Zeroconf: self.queried.pop() except pybonjour.BonjourError, e: - if e[0][0] == kDNSServiceErr_ServiceNotRunning: + if e.errorCode == kDNSServiceErr_ServiceNotRunning: log.info('Service not running') return False else: - log.error('Error in query for TXT records. %s', - str(e[0][0])) + log.error('Error in query for TXT records. %s', e) finally: + if query_sdRef: query_sdRef.close() return True @@ -401,6 +411,7 @@ class Zeroconf: txt = pybonjour.TXTRecord(self.txt, strict=True) try: pybonjour.DNSServiceUpdateRecord(self.service_sdRef, None, 0, txt) - except pybonjour.BonjourError: + except pybonjour.BonjourError as e: + log.error('Error when updating TXT Record: %s', e) return False return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a66c10084471364f2a3f90538344315e0…

1 0

[Git][gajim/gajim][gajim_0.16] Use dict for zeroconf txt data
by Philipp Hörist 05 Jun '17

05 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 5a2b04c2 by Philipp Hörist at 2017-06-06T00:18:42+02:00 Use dict for zeroconf txt data Use dict or else zeroconf_connection.py would constantly overwrite it with a dict which we would have to check and transform back. so we use a dict and only transform to TXTRecord when we call pybonjour - - - - - 1 changed file: - src/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== src/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/src/common/zeroconf/zeroconf_bonjour.py +++ b/src/common/zeroconf/zeroconf_bonjour.py @@ -43,7 +43,7 @@ class Zeroconf: self.port = port # listening port that gets announced self.username = name self.host = host - self.txt = pybonjour.TXTRecord() # service data + self.txt = {} # service data # XXX these CBs should be set to None when we destroy the object # (go offline), because they create a circular reference @@ -245,7 +245,7 @@ class Zeroconf: txt = {} #remove empty keys - for key, val in self.txt: + for key, val in self.txt.iteritems(): if val: txt[key] = val @@ -258,14 +258,13 @@ class Zeroconf: txt['status'] = self.replace_show(self.txt['status']) else: txt['status'] = 'avail' - - self.txt = pybonjour.TXTRecord(txt, strict=True) + self.txt = txt try: self.service_sdRef = pybonjour.DNSServiceRegister( name=self.name, regtype=self.stype, port=self.port, - txtRecord=self.txt, + txtRecord=pybonjour.TXTRecord(self.txt, strict=True), callBack=self.service_added_callback) log.info('Publishing service %s of type %s' % (self.name, self.stype)) @@ -399,8 +398,9 @@ class Zeroconf: if show: self.txt['status'] = self.replace_show(show) + txt = pybonjour.TXTRecord(self.txt, strict=True) try: - pybonjour.DNSServiceUpdateRecord(self.service_sdRef, None, 0, self.txt) + pybonjour.DNSServiceUpdateRecord(self.service_sdRef, None, 0, txt) except pybonjour.BonjourError: return False return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5a2b04c2f19a5342d1c1dbd91b23da104e…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2017