Commits July 2018

commits@gajim.org

1 participants
87 discussions

[Git][gajim/gajim][master] Add debug logging for saving roster position
by Philipp Hörist 12 Jul '18

12 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c225ae70 by Philipp Hörist at 2018-07-12T23:19:22+02:00 Add debug logging for saving roster position - - - - - 2 changed files: - gajim/gtkgui_helpers.py - gajim/roster_window.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -102,7 +102,9 @@ from gajim.common import helpers def get_total_screen_geometry(): screen = Gdk.Screen.get_default() window = Gdk.Screen.get_root_window(screen) - return window.get_width(), window.get_height() + w, h = window.get_width(), window.get_height() + log.debug('Get screen geometry: %s %s', w, h) + return w, h def add_image_to_button(button, icon_name): img = Gtk.Image() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -43,6 +43,7 @@ import os import sys import time import locale +import logging from enum import IntEnum, unique @@ -72,6 +73,8 @@ from gajim.message_window import MessageWindowMgr from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE +log = logging.getLogger('gajim.roster') + @unique class Column(IntEnum): IMG = 0 # image to show state (online, new message etc) @@ -2381,6 +2384,7 @@ class RosterWindow: 'on_event') or app.config.get('allow_hide_roster')): if app.config.get('save-roster-position'): x, y = self.window.get_position() + log.debug('Save roster position (get_position): %s %s', x, y) app.config.set('roster_x-position', x) app.config.set('roster_y-position', y) if os.name == 'nt' or app.config.get('hide_on_roster_x_button'): @@ -2409,6 +2413,7 @@ class RosterWindow: if self.window.get_window() is not None: if app.config.get('save-roster-position'): x, y = self.window.get_window().get_root_origin() + log.debug('Save roster position (get_root_origin): %s %s', x, y) app.config.set('roster_x-position', x) app.config.set('roster_y-position', y) width, height = self.window.get_size() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c225ae70e428c777d3a062f3fcc7410d76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c225ae70e428c777d3a062f3fcc7410d76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix bookmarks strategy
by Philipp Hörist 12 Jul '18

12 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4cb85291 by Philipp Hörist at 2018-07-12T21:34:15+02:00 Fix bookmarks strategy Strategy is now: 1. Get pubsub if supported 2. Get private storage and merge if we find boomarks we dont have 3. Store bookmarks to both pubsub and privatestorage The only drawback with this strategy is, that a client that supports only private storage cant delete bookmarks - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -160,8 +160,9 @@ class Bookmarks: continue if check_merge: - if jid not in self.bookmarks: - merged = True + if jid in self.bookmarks: + continue + merged = True log.debug('Found Bookmark: %s', jid) self.bookmarks[jid] = { @@ -218,8 +219,7 @@ class Bookmarks: if storage_type is None: if self._pubsub_support(): self._pubsub_store(storage_node) - else: - self._private_store(storage_node) + self._private_store(storage_node) elif storage_type == BookmarkStorageType.PUBSUB: if self._pubsub_support(): self._pubsub_store(storage_node) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4cb852914ea049b2002ae0a9bf1126e168… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4cb852914ea049b2002ae0a9bf1126e168… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change to gender-neutral alternatives of pronouns
by Philipp Hörist 12 Jul '18

12 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3a359ba by Ave O at 2018-07-11T23:15:56+03:00 Change to gender-neutral alternatives of pronouns - - - - - 6 changed files: - gajim/command_system/implementation/standard.py - gajim/common/config.py - gajim/common/modules/vcard_avatars.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -214,7 +214,7 @@ class StandardCommonChatCommands(CommandContainer): self._video_button.set_active(not state) @command(raw=True) - @doc(_("Send a message to the contact that will attract his (her) attention")) + @doc(_("Send a message to the contact that will attract their attention")) def attention(self, message): self.send_message(message, process_commands=False, attention=True) ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -245,8 +245,8 @@ class Config: 'show_tunes_in_roster': [opt_bool, True, '', True], 'show_location_in_roster': [opt_bool, True, '', True], 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], - 'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], - 'print_status_in_muc': [opt_str, 'none', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], + 'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes their status and/or their status message.')], + 'print_status_in_muc': [opt_str, 'none', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes their status and/or their status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')], ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -162,7 +162,7 @@ class VCardAvatars: return if gc_contact.avatar_sha != avatar_sha: - log.info('%s changed his Avatar: %s', nick, avatar_sha) + log.info('%s changed their Avatar: %s', nick, avatar_sha) gc_contact.avatar_sha = avatar_sha app.interface.update_avatar(contact=gc_contact) else: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1839,7 +1839,7 @@ class GroupchatControl(ChatControlBase): self.print_conversation(s, 'info', graphics=False) if obj.nick == self.nick: self.autorejoin = False - elif '303' in obj.status_code: # Someone changed his or her nick + elif '303' in obj.status_code: # Someone changed their nick if obj.new_nick == self.new_nick or obj.nick == self.nick: # We changed our nick self.nick = obj.new_nick ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -531,7 +531,7 @@ class Interface: app.contacts.add_contact(account, contact1) self.roster.add_contact(obj.jid, account) dialogs.InformationDialog(_('Authorization accepted'), - _('The contact "%s" has authorized you to see his or her status.') + _('The contact "%s" has authorized you to see their status.') % obj.jid) def show_unsubscribed_dialog(self, account, contact): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2162,7 +2162,7 @@ class RosterWindow: def chg_contact_status(self, contact, show, status, account): """ - When a contact changes his or her status + When a contact changes their status """ contact_instances = app.contacts.get_contacts(account, contact.jid) contact.show = show View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3a359ba232099aa6ed71d439dce51b796… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3a359ba232099aa6ed71d439dce51b796… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove whitespace char from groupchat label
by Philipp Hörist 11 Jul '18

11 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: aaab5f17 by Philipp Hörist at 2018-07-11T19:04:09+02:00 Remove whitespace char from groupchat label - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1139,7 +1139,7 @@ class GroupchatControl(ChatControlBase): name = self.get_continued_conversation_name() else: name = self.room_jid - text = '<span %s>%s</span>' % (font_attrs, '\u200E' + name) + text = '<span %s>%s</span>' % (font_attrs, name) self.name_label.set_markup(text) if self.subject: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aaab5f17ce54bd7b6a47c093a114496dc1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aaab5f17ce54bd7b6a47c093a114496dc1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update windows build to python 3.7
by Philipp Hörist 11 Jul '18

11 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0afd5811 by Philipp Hörist at 2018-07-11T18:29:38+02:00 Update windows build to python 3.7 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -34,7 +34,7 @@ function set_build_root { BUILD_ROOT="${DIR}/_build_root" REPO_CLONE="${BUILD_ROOT}/${MINGW}"/gajim MINGW_ROOT="${BUILD_ROOT}/${MINGW}" - PACKAGE_DIR="${BUILD_ROOT}/${MINGW}/lib/python3.6/site-packages" + PACKAGE_DIR="${BUILD_ROOT}/${MINGW}/lib/python3.7/site-packages" } function build_pacman { @@ -295,8 +295,8 @@ function cleanup_install { function move_ssl_libs { # Pythons ssl module searches in that path for these dlls, if they are not there # C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there - cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.6/lib-dynload/libeay32.dll - cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.6/lib-dynload/ssleay32.dll + cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/libeay32.dll + cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0afd5811192a456fd7f02b1bce274ce8b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0afd5811192a456fd7f02b1bce274ce8b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Disable recently button if popover is empty
by Philipp Hörist 10 Jul '18

10 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6d96005d by Sophie Herold at 2018-07-10T18:08:11+02:00 Disable recently button if popover is empty - - - - - 2 changed files: - gajim/data/gui/join_groupchat_window.ui - gajim/dialogs.py Changes: ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -336,7 +336,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Recently used channels</property> + <property name="tooltip_text" translatable="yes">Recently used group chats</property> <property name="popover">recently_popover</property> <child> <object class="GtkImage"> @@ -357,7 +357,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Search the rooms on this server</property> + <property name="tooltip_text" translatable="yes">Search group chats on selected server</property> <signal name="clicked" handler="_on_search_clicked" swapped="no"/> <child> <object class="GtkImage"> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2431,6 +2431,8 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): label]) servers.append(groupchat.server) + self.recently_button.set_sensitive(bool(recent)) + for server in set(servers): self.server_combo.append_text(server) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6d96005d5502c6e11178924ac9f1f1b109… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6d96005d5502c6e11178924ac9f1f1b109… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add paste from clipboard in JoinGroupchat dialog
by Philipp Hörist 10 Jul '18

10 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a506226d by Sophie Herold at 2018-07-10T18:01:50+02:00 Add paste from clipboard in JoinGroupchat dialog Closes #9237 - - - - - 2 changed files: - gajim/data/gui/join_groupchat_window.ui - gajim/dialogs.py Changes: ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -323,6 +323,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="activates_default">True</property> + <signal name="changed" handler="_on_jid_detection_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -388,6 +389,7 @@ <object class="GtkEntry"> <property name="can_focus">True</property> <property name="caps_lock_warning">False</property> + <signal name="changed" handler="_on_jid_detection_changed" swapped="no"/> </object> </child> </object> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2452,6 +2452,23 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.nick_entry.set_text(app.nicks[account]) self._fill_recent_and_servers(account) + def _on_jid_detection_changed(self, widget): + text = widget.get_text() + if text.startswith('xmpp:'): + text = text[5:] + if '@' in text: + room, server = text.split('@', 1) + server = server.split('?')[0] + widget.set_text('') + + if room: + self.room_entry.set_text(room) + + if server: + self.server_combo.get_child().set_text(server) + else: + self.server_combo.grab_focus() + def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a506226d88a9735f565dcbf4664de2789d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a506226d88a9735f565dcbf4664de2789d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Blocking: Raise NodeProcessed
by Philipp Hörist 09 Jul '18

09 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d9eb3e68 by Philipp Hörist at 2018-07-09T23:37:13+02:00 Blocking: Raise NodeProcessed - - - - - 1 changed file: - gajim/common/modules/blocking.py Changes: ===================================== gajim/common/modules/blocking.py ===================================== --- a/gajim/common/modules/blocking.py +++ b/gajim/common/modules/blocking.py @@ -79,7 +79,7 @@ class Blocking: for jid in self.blocked: self._presence_probe(jid) log.info('Unblock all Push') - return + raise nbxmpp.NodeProcessed for item in items: # Unblock some contacts View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d9eb3e6891d70887902f76f55e7dd81530… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d9eb3e6891d70887902f76f55e7dd81530… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dump certificate before writing it to storage
by Philipp Hörist 09 Jul '18

09 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb1b6f60 by Philipp Hörist at 2018-07-09T20:15:13+02:00 Dump certificate before writing it to storage - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -47,6 +47,8 @@ from gi.repository import GLib from gi.repository import Gio from gi.repository import Gdk +import OpenSSL + try: from PIL import Image except: @@ -1324,20 +1326,24 @@ class Interface: def on_ok(is_checked): del self.instances[account]['online_dialog']['ssl_error'] if is_checked[0]: + + pem = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, obj.cert).decode('utf-8') + # Check if cert is already in file certs = '' my_ca_certs = configpaths.get('MY_CACERTS') if os.path.isfile(my_ca_certs): with open(my_ca_certs, encoding='utf-8') as f: certs = f.read() - if obj.cert in certs: + if pem in certs: dialogs.ErrorDialog(_('Certificate Already in File'), _('This certificate is already in file %s, so it\'s ' 'not added again.') % my_ca_certs) else: with open(my_ca_certs, 'a', encoding='utf-8') as f: f.write(server + '\n') - f.write(obj.cert + '\n\n') + f.write(pem + '\n\n') if is_checked[1]: ignore_ssl_errors = app.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb1b6f605a0d7422bb1e12e8258f63d9ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb1b6f605a0d7422bb1e12e8258f63d9ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove print statement
by Philipp Hörist 09 Jul '18

09 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 828d7457 by Philipp Hörist at 2018-07-09T19:52:57+02:00 Remove print statement - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1268,7 +1268,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._get_posh_file(self._hostname) self._posh_requested = True cert_hash256 = self._calculate_cert_sha256(cert) - print(cert_hash256) + if cert_hash256 in self._posh_hashes: # Ignore this error if this cert is # verifyed with POSH View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828d74570ad93c3657e291f8e876ec854f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828d74570ad93c3657e291f8e876ec854f… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2018