Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Catch ValueError on Gspell import
by Philipp Hörist 26 Nov '17

26 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b3ef0d61 by Philipp Hörist at 2017-11-26T01:11:19+01:00 Catch ValueError on Gspell import - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -266,7 +266,7 @@ try: HAVE_SPELL = True else: spell_log.info('No dicts available') -except ImportError: +except (ImportError, ValueError): pass gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3ef0d61962d310a95424c12d4eacf4114… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3ef0d61962d310a95424c12d4eacf4114… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor SpellChecker
by Philipp Hörist 25 Nov '17

25 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7692b376 by Philipp Hörist at 2017-11-26T00:44:50+01:00 Refactor SpellChecker - use Gspell instead of GtkSpell, it seems to have alot less problems and needs less code - - - - - 92917c18 by Philipp Hörist at 2017-11-26T00:54:17+01:00 Merge branch 'spell' into 'master' Refactor SpellChecker See merge request gajim/gajim!159 - - - - - 10 changed files: - README.md - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/config.py - gajim/dialogs.py - gajim/features_window.py - − gajim/gtkspell.py - gajim/message_textview.py - win/_base.sh Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - python3-crypto to enable End to end encryption - python3-gnupg to enable GPG encryption - For zeroconf (bonjour) you need dbus-glib, python-avahi -- gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc +- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required. - python3-dbus bindings (>=1.2.0) ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1173,7 +1173,6 @@ class ChatControl(ChatControlBase): self.handlers[i].disconnect(i) del self.handlers[i] self.conv_textview.del_handlers() - self.remove_speller() self.msg_textview.destroy() # PluginSystem: calling shutdown of super class (ChatControlBase) to let # it remove it's GUI extension points ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -32,7 +32,6 @@ import time from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango -from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio @@ -42,7 +41,6 @@ from gajim import message_control from gajim import dialogs from gajim import history_window from gajim import notify -from gajim import gtkspell import re from gajim import emoticons @@ -66,6 +64,9 @@ from gajim.command_system.implementation.middleware import CommandTools from gajim.command_system.implementation import standard from gajim.command_system.implementation import execute +if app.HAVE_SPELL: + from gi.repository import Gspell + ################################################################################ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): @@ -345,8 +346,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.set_emoticon_popover() # Attach speller - self.spell = None - self.spell_handlers = [] + self.spell_checker = None self.set_speller() self.conv_textview.tv.show() @@ -471,44 +471,22 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): image.set_from_pixbuf(icon) def set_speller(self): - if not gtkspell.HAS_GTK_SPELL or not app.config.get('use_speller'): + if not app.HAVE_SPELL or not app.config.get('use_speller'): return - def _on_focus_in(*args): - if self.spell is None: - return - self.spell.attach(self.msg_textview) + gspell_lang = self.get_speller_language() + if gspell_lang is None: + return - def _on_focus_out(*args): - if self.spell is None: - return - if not self.msg_textview.has_text(): - self.spell.detach() + self.spell_checker = Gspell.Checker.new(gspell_lang) + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self.msg_textview.get_buffer()) + spell_buffer.set_spell_checker(self.spell_checker) + spell_view = Gspell.TextView.get_from_gtk_text_view(self.msg_textview) + spell_view.set_inline_spell_checking(False) + spell_view.set_enable_language_menu(True) - lang = self.get_speller_language() - if not lang: - return - try: - self.spell = gtkspell.Spell(self.msg_textview, lang) - self.spell.connect('language_changed', self.on_language_changed) - handler_id = self.msg_textview.connect('focus-in-event', - _on_focus_in) - self.spell_handlers.append(handler_id) - handler_id = self.msg_textview.connect('focus-out-event', - _on_focus_out) - self.spell_handlers.append(handler_id) - except OSError: - dialogs.AspellDictError(lang) - app.config.set('use_speller', False) - - def remove_speller(self): - if self.spell is None: - return - self.spell.detach() - for id_ in self.spell_handlers: - self.msg_textview.disconnect(id_) - self.spell_handlers.remove(id_) - self.spell = None + self.spell_checker.connect('notify::language', self.on_language_changed) def get_speller_language(self): per_type = 'contacts' @@ -521,16 +499,20 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): lang = app.config.get('speller_language') if not lang: lang = app.LANG - return lang or None + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + gspell_lang = Gspell.language_get_default() + return gspell_lang - def on_language_changed(self, spell, lang): + def on_language_changed(self, checker, param): + gspell_lang = checker.get_language() per_type = 'contacts' if self.type_id == message_control.TYPE_GC: per_type = 'rooms' if not app.config.get_per(per_type, self.contact.jid): app.config.add_per(per_type, self.contact.jid) - app.config.set_per( - per_type, self.contact.jid, 'speller_language', lang) + app.config.set_per(per_type, self.contact.jid, + 'speller_language', gspell_lang.get_code()) def on_banner_label_populate_popup(self, label, menu): """ ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -253,6 +253,21 @@ except Exception: glog.info(_('Unable to load idle module')) HAVE_IDLE = False +HAVE_SPELL = False +try: + spell_log = logging.getLogger('gajim.speller') + gi.require_version('Gspell', '1') + from gi.repository import Gspell + langs = Gspell.language_get_available() + for lang in langs: + spell_log.info('%s (%s) dict available', + lang.get_name(), lang.get_code()) + if langs: + HAVE_SPELL = True + else: + spell_log.info('No dicts available') +except ImportError: + pass gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -50,7 +50,6 @@ from gajim import message_control from gajim.chat_control_base import ChatControlBase from gajim import dataforms_widget from gajim import gui_menu_builder -from gajim import gtkspell from gajim.common import helpers from gajim.common import app @@ -66,6 +65,9 @@ try: except (ImportError, ValueError): HAS_GST = False +if app.HAVE_SPELL: + from gi.repository import Gspell + #---------- PreferencesWindow class -------------# class PreferencesWindow: """ @@ -187,7 +189,7 @@ class PreferencesWindow: self.xml.get_object('xhtml_checkbutton').set_active(st) # use speller - if gtkspell.HAS_GTK_SPELL: + if app.HAVE_SPELL: st = app.config.get('use_speller') self.xml.get_object('speller_checkbutton').set_active(st) else: @@ -657,30 +659,22 @@ class PreferencesWindow: if isinstance(ctrl, ChatControlBase): ctrl.set_speller() - def remove_speller(self): - for ctrl in self._get_all_controls(): - if isinstance(ctrl, ChatControlBase): - if ctrl.spell is not None: - ctrl.remove_speller() - def on_speller_checkbutton_toggled(self, widget): active = widget.get_active() app.config.set('use_speller', active) - if active: - lang = app.config.get('speller_language') - if not lang: - lang = app.LANG - - available = gtkspell.test_language(lang) - if not available: - dialogs.AspellDictError(lang) - app.config.set('use_speller', False) - widget.set_active(False) - else: - app.config.set('speller_language', lang) - self.apply_speller() + if not active: + return + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + gspell_lang = Gspell.language_get_default() + if gspell_lang is None: + dialogs.AspellDictError(lang) + app.config.set('use_speller', False) + widget.set_active(False) else: - self.remove_speller() + app.config.set('speller_language', gspell_lang.get_code()) + self.apply_speller() def on_positive_184_ack_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'positive_184_ack') ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -34,6 +34,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib + import os import nbxmpp import time @@ -42,7 +43,6 @@ from gajim import gtkgui_helpers from gajim import vcard from gajim import conversation_textview from gajim import dataforms_widget -from gajim import gtkspell from random import randrange from gajim.common import pep @@ -64,6 +64,9 @@ from gajim.common import dataforms from gajim.common.exceptions import GajimGeneralException from gajim.common.connection_handlers_events import MessageOutgoingEvent +if app.HAVE_SPELL: + from gi.repository import Gspell + import logging log = logging.getLogger('gajim.dialogs') @@ -3077,15 +3080,19 @@ class SingleMessageWindow: else: self.to_entry.set_text(to) - if app.config.get('use_speller') and gtkspell.HAS_GTK_SPELL and action == 'send': - try: - lang = app.config.get('speller_language') - if not lang: - lang = app.LANG - self.spell = gtkspell.Spell(self.message_textview, lang) - self.spell.attach(self.message_textview) - except OSError: + if app.config.get('use_speller') and app.HAVE_SPELL and action == 'send': + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: AspellDictError(lang) + else: + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self.message_textview.get_buffer()) + spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) + spell_view = Gspell.TextView.get_from_gtk_text_view( + self.message_textview) + spell_view.set_inline_spell_checking(True) + spell_view.set_enable_language_menu(True) self.prepare_widgets_for(self.action) ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -63,8 +63,8 @@ class FeaturesWindow: _('On Windows the Windows Credential Vault is used.')), _('Spell Checker'): (self.speller_available, _('Spellchecking of composed messages.'), - _('Requires libgtkspell.'), - _('Requires libgtkspell and libenchant.')), + _('Requires Gspell'), + _('Requires Gspell')), _('Automatic status'): (self.idle_available, _('Ability to measure idle time, in order to set auto status.'), _('Requires libxss library.'), @@ -164,11 +164,7 @@ class FeaturesWindow: return True def speller_available(self): - try: - __import__('gajim.gtkspell') - except ValueError: - return False - return True + return app.HAVE_SPELL def idle_available(self): from gajim.common import sleepy ===================================== gajim/gtkspell.py deleted ===================================== --- a/gajim/gtkspell.py +++ /dev/null @@ -1,104 +0,0 @@ -## src/gtkspell.py -## -## (C) 2008 Thorsten P. 'dGhvcnN0ZW5wIEFUIHltYWlsIGNvbQ==\n'.decode("base64") -## (C) 2015 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from gi.repository import GObject -from gi.repository import Gtk -from gi.repository import GLib -import gi -try: - gi.require_version('GtkSpell', '3.0') - from gi.repository import GtkSpell - HAS_GTK_SPELL = True -except (ImportError, ValueError): - HAS_GTK_SPELL = False - - -def ensure_attached(func): - def f(self, *args, **kwargs): - if self.spell: - func(self, *args, **kwargs) - else: - raise RuntimeError("Spell object is already detached") - return f - - -class Spell(GObject.GObject): - __gsignals__ = { - 'language_changed': (GObject.SignalFlags.RUN_FIRST, None, (str,)) - } - - def __init__(self, textview, language=None, create=True, jid=None, - per_type=None): - GObject.GObject.__init__(self) - if not isinstance(textview, Gtk.TextView): - raise TypeError("Textview must be derived from Gtk.TextView") - spell = GtkSpell.Checker.get_from_text_view(textview) - if create: - if spell: - raise RuntimeError("Textview has already a Spell obj attached") - self.spell = GtkSpell.Checker.new() - - try: - self.spell.set_language(language) - except GLib.GError as error: - if error.domain == 'gtkspell-error-quark': - raise OSError("Unable to set language: '%s'" % language) - - self.spell.connect('language-changed', self.on_language_changed) - - else: - if spell: - self.spell = spell - else: - raise RuntimeError("Textview has no Spell object attached") - - def on_language_changed(self, spell, lang): - self.emit('language_changed', lang) - - @ensure_attached - def set_language(self, language): - if not self.spell.set_language(language): - raise OSError("Unable to set language: '%s'" % language) - - @ensure_attached - def recheck_all(self): - self.spell.recheck_all() - - def detach(self): - if self.spell is not None: - self.spell.detach() - - def attach(self, textview): - spell = GtkSpell.Checker.get_from_text_view(textview) - if spell is None: - print('attached') - self.spell.attach(textview) - - -GObject.type_register(Spell) - - -def test_language(lang): - spell = GtkSpell.Checker.new() - try: - spell.set_language(lang) - except GLib.GError as error: - if error.domain == 'gtkspell-error-quark': - return False - return True ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -30,6 +30,10 @@ from gi.repository import Pango from gajim.common import app from gajim import gtkgui_helpers +if app.HAVE_SPELL: + from gi.repository import Gspell + + class MessageTextView(Gtk.TextView): """ Class for the message textview (where user writes new messages) for @@ -101,6 +105,7 @@ class MessageTextView(Gtk.TextView): def _on_focus_in(self, *args): if not self.has_text(): self.get_buffer().set_text('') + self.toggle_speller(True) def _on_focus_out(self, *args): buf = self.get_buffer() @@ -109,6 +114,12 @@ class MessageTextView(Gtk.TextView): if text == '': buf.insert_with_tags( start, self.PLACEHOLDER, self.placeholder_tag) + self.toggle_speller(False) + + def toggle_speller(self, activate): + if app.HAVE_SPELL and app.config.get('use_speller'): + spell_view = Gspell.TextView.get_from_gtk_text_view(self) + spell_view.set_inline_spell_checking(activate) def remove_placeholder(self): self._on_focus_in() ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -75,7 +75,9 @@ function install_deps { mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ mingw-w64-"${ARCH}"-sqlite3 \ - mingw-w64-"${ARCH}"-goocanvas + mingw-w64-"${ARCH}"-goocanvas \ + mingw-w64-"${ARCH}"-gspell \ + mingw-w64-"${ARCH}"-hunspell build_pip install setuptools_scm @@ -136,6 +138,10 @@ function install_gajim { mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip + # Install language dicts + curl -o "${BUILD_ROOT}"/speller_dicts.zip https://gajim.org/downloads/snap/win/build/speller_dicts.zip + 7z x -o"${MINGW_ROOT}"/share "${BUILD_ROOT}"/speller_dicts.zip + # Install themes # rm -Rf "${MINGW_ROOT}"/etc # rm -Rf "${MINGW_ROOT}"/share/themes @@ -194,7 +200,6 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/ffmpeg rm -Rf "${MINGW_ROOT}"/share/vala rm -Rf "${MINGW_ROOT}"/share/readline - rm -Rf "${MINGW_ROOT}"/share/xml rm -Rf "${MINGW_ROOT}"/share/bash-completion rm -Rf "${MINGW_ROOT}"/share/common-lisp rm -Rf "${MINGW_ROOT}"/share/emacs View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f75dd8bcadf06e6acdf416434496bb1c4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f75dd8bcadf06e6acdf416434496bb1c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Window build
by Philipp Hörist 25 Nov '17

25 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f75dd8bc by Philipp Hörist at 2017-11-25T20:09:25+01:00 Fix Window build New version scheme - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -122,7 +122,7 @@ function install_gajim { build_pip install . QL_VERSION=$(MSYSTEM= build_python -c \ - "import gajim; import sys; sys.stdout.write(gajim.__version__.split('-')[0])") + "import gajim; import sys; sys.stdout.write(gajim.__version__.split('+')[0])") QL_VERSION_DESC=$(MSYSTEM= build_python -c \ "import gajim; import sys; sys.stdout.write(gajim.__version__)") View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f75dd8bcadf06e6acdf416434496bb1c40… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f75dd8bcadf06e6acdf416434496bb1c40… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Also log the offending JID on avatar decoding issue
by Philipp Hörist 25 Nov '17

25 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: cdf4d0ee by Emmanuel Gil Peyrot at 2017-11-25T17:37:48+00:00 Also log the offending JID on avatar decoding issue - - - - - efc14f9d by Philipp Hörist at 2017-11-25T18:44:08+01:00 Merge branch 'better-avatar-error-log' into 'master' Also log the offending JID on avatar decoding issue See merge request gajim/gajim!158 - - - - - 2 changed files: - gajim/common/connection_handlers.py - gajim/vcard.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -474,7 +474,7 @@ class ConnectionVcard: app.nec.push_incoming_event( VcardNotPublishedEvent(None, conn=self)) - def get_vcard_photo(self, vcard): + def _get_vcard_photo(self, vcard, jid): try: photo = vcard['PHOTO']['BINVAL'] except (KeyError, AttributeError): @@ -488,7 +488,7 @@ class ConnectionVcard: try: photo_decoded = base64.b64decode(photo.encode('utf-8')) except binascii.Error as error: - app.log('avatar').warning('Invalid Avatar: %s', error) + app.log('avatar').warning('Invalid avatar for %s: %s', jid, error) return None, None avatar_sha = hashlib.sha1(photo_decoded).hexdigest() @@ -532,7 +532,7 @@ class ConnectionVcard: def _on_own_avatar_received(self, jid, resource, room, vcard): - avatar_sha, photo_decoded = self.get_vcard_photo(vcard) + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) app.log('avatar').info( 'Received own (vCard): %s', avatar_sha) @@ -570,7 +570,7 @@ class ConnectionVcard: """ Called when we receive a vCard Parse the vCard and trigger Events """ - avatar_sha, photo_decoded = self.get_vcard_photo(vcard) + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) app.interface.save_avatar(photo_decoded) # Received vCard from a contact ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -202,7 +202,7 @@ class VcardWindow: except AttributeError: pass - def set_values(self, vcard): + def _set_values(self, vcard, jid): for i in vcard.keys(): if i == 'PHOTO' and self.xml.get_object('information_notebook').\ get_n_pages() > 4: @@ -215,7 +215,7 @@ class VcardWindow: photo_decoded = base64.b64decode( photo_encoded.encode('utf-8')) except binascii.Error as error: - app.log('avatar').warning('Invalid Avatar: %s', error) + app.log('avatar').warning('Invalid avatar for %s: %s', jid, error) continue pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded) if pixbuf is None: @@ -266,7 +266,7 @@ class VcardWindow: def _nec_vcard_received(self, jid, resource, room, vcard): self.clear_values() - self.set_values(vcard) + self._set_values(vcard, jid) def set_os_info(self, obj): if obj.conn.name != self.account: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fc627fc19cc145a86383b221416422709… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fc627fc19cc145a86383b221416422709… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use appmenu only if system supports it
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc627fc1 by Philipp Hörist at 2017-11-24T18:54:30+01:00 Use appmenu only if system supports it - - - - - 3 changed files: - gajim/common/app.py - gajim/gajim.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -28,6 +28,7 @@ ## import os +import sys import logging import locale import uuid @@ -500,3 +501,10 @@ def get_priority(account, show): def log(domain): root = 'gajim.' return logging.getLogger(root + domain) + +def prefers_app_menu(): + if sys.platform == 'darwin': + return True + if sys.platform == 'win32': + return False + return app.prefers_app_menu() ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -215,10 +215,9 @@ class GajimApplication(Gtk.Application): builder.add_from_file(path) menubar = builder.get_object("menubar") appmenu = builder.get_object("appmenu") - if os.name != 'nt': + if app.prefers_app_menu(): self.set_app_menu(appmenu) else: - # Dont set Application Menu for Windows # Add it to the menubar instead menubar.prepend_submenu('Gajim', appmenu) self.set_menubar(menubar) ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -767,9 +767,9 @@ def get_account_menu(account): def build_accounts_menu(): menubar = app.app.get_menubar() # Accounts Submenu - menu_position = 0 - if os.name == 'nt': - menu_position = 1 + menu_position = 1 + if app.prefers_app_menu(): + menu_position = 0 acc_menu = menubar.get_item_link(menu_position, 'submenu') acc_menu.remove_all() @@ -796,9 +796,9 @@ def build_bookmark_menu(account): if not bookmark_menu: return - menu_position = 0 - if os.name == 'nt': - menu_position = 1 + menu_position = 1 + if app.prefers_app_menu(): + menu_position = 0 # Accounts Submenu acc_menu = menubar.get_item_link(menu_position, 'submenu') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc627fc19cc145a86383b221416422709b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc627fc19cc145a86383b221416422709b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Correctly split version string
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 276daa99 by Philipp Hörist at 2017-11-24T16:49:30+01:00 Correctly split version string We changed the version format - - - - - 2 changed files: - gajim/common/optparser.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -57,7 +57,7 @@ class OptionsParser: return False new_version = app.config.get('version') - new_version = new_version.split('-', 1)[0] + new_version = new_version.split('+', 1)[0] seen = set() regex = re.compile(r"(?P<optname>[^.=]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.=]+))?\s=\s(?P<value>.*)") @@ -82,7 +82,7 @@ class OptionsParser: app.config.set_per(optname, key, subname, value) old_version = app.config.get('version') - old_version = old_version.split('-', 1)[0] + old_version = old_version.split('+', 1)[0] self.update_config(old_version, new_version) self.old_values = {} # clean mem ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -509,7 +509,7 @@ class PluginManager(metaclass=Singleton): min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None) - gajim_v = app.config.get('version').split('-', 1)[0] + gajim_v = app.config.get('version').split('+', 1)[0] gajim_v_cmp = parse_version(gajim_v) if min_v and gajim_v_cmp < parse_version(min_v): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/276daa991c25576cd8e4cc2935955fe29f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/276daa991c25576cd8e4cc2935955fe29f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show missing dbus message only on Linux
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9322ed44 by Philipp Hörist at 2017-11-24T16:28:22+01:00 Show missing dbus message only on Linux Mac and Windows dont have dbus available - - - - - 1 changed file: - gajim/common/dbus_support.py Changes: ===================================== gajim/common/dbus_support.py ===================================== --- a/gajim/common/dbus_support.py +++ b/gajim/common/dbus_support.py @@ -24,7 +24,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os +import sys import logging from gajim.common import app @@ -40,7 +40,7 @@ try: DBusGMainLoop(set_as_default=True) except ImportError: supported = False - if not os.name == 'nt': # only say that to non Windows users + if sys.platform == 'linux': # windows and mac have no dbus print(_('D-Bus python bindings are missing in this computer')) print(_('D-Bus capabilities of Gajim cannot be used')) else: @@ -51,7 +51,7 @@ else: supported = True # does user have D-Bus bindings? except dbus.DBusException: supported = False - if not os.name == 'nt': # only say that to non Windows users + if sys.platform == 'linux': # windows and mac have no dbus print(_('D-Bus does not run correctly on this machine')) print(_('D-Bus capabilities of Gajim cannot be used')) except exceptions.SystemBusNotPresent: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9322ed440594c02283b10f6c89c172eb17… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9322ed440594c02283b10f6c89c172eb17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix invalid dev version string
by Philipp Hörist 24 Nov '17

24 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f97b799f by André Apitzsch at 2017-11-23T00:22:40+01:00 Fix invalid dev version string - - - - - 359d327b by Philipp Hörist at 2017-11-24T15:58:34+01:00 Merge branch 'fix_version' into 'master' Fix invalid dev version string See merge request gajim/gajim!157 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -6,7 +6,7 @@ try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, stdout=subprocess.PIPE).communicate()[0] if node: - __version__ += '-' + node.decode('utf-8').strip() + __version__ += '+' + node.decode('utf-8').strip() except Exception: pass View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8d43907b1e75f3bebb59a77cdc6da28f1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8d43907b1e75f3bebb59a77cdc6da28f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Desktop files: add information for translators
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 42275cfb by André Apitzsch at 2017-11-22T22:11:36+01:00 Desktop files: add information for translators - - - - - 8d43907b by Yann Leboulanger at 2017-11-22T22:51:09+01:00 Merge branch 'translators' into 'master' Desktop files: add information for translators See merge request gajim/gajim!156 - - - - - 2 changed files: - data/gajim-remote.desktop.in - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/gajim-remote.desktop.in ===================================== --- a/data/gajim-remote.desktop.in +++ b/data/gajim-remote.desktop.in @@ -1,6 +1,7 @@ [Desktop Entry] Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; Name=Open URI using Gajim +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; Version=1.0 Exec=gajim-remote handle_uri %u ===================================== data/org.gajim.Gajim.desktop.in ===================================== --- a/data/org.gajim.Gajim.desktop.in +++ b/data/org.gajim.Gajim.desktop.in @@ -3,9 +3,11 @@ Categories=Network;InstantMessaging;GTK;GNOME; Name=Gajim GenericName=Jabber IM Client Comment=A GTK+ Jabber client +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; Version=1.0 Exec=gajim +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim StartupNotify=true StartupWMClass=Gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae57d66a6bfdf339a2f661a805e3187de… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae57d66a6bfdf339a2f661a805e3187de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Use os.urandom for random numbers
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 0b77b07b by Philipp Hörist at 2017-11-22T18:03:18+01:00 Use os.urandom for random numbers - - - - - ef78e16c by Yann Leboulanger at 2017-11-22T22:50:11+01:00 Merge branch 'master' into 'master' Use os.urandom for random numbers See merge request gajim/python-nbxmpp!9 - - - - - 3 changed files: - nbxmpp/auth_nb.py - nbxmpp/bosh.py - − nbxmpp/rndg.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -29,6 +29,8 @@ from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from .plugin import PlugIn import sys import re +import os +import binascii import base64 from . import dispatcher_nb import hmac @@ -37,8 +39,6 @@ import hashlib import logging log = logging.getLogger('nbxmpp.auth_nb') -from . import rndg - def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() def C(some): return b':'.join(some) @@ -463,7 +463,7 @@ class SASL(PlugIn): (isinstance(chal['qop'], list) and 'auth' in chal['qop'])): self.resp = {'username': self.username, 'nonce': chal['nonce'], - 'cnonce': '%x' % rndg.getrandbits(196), + 'cnonce': '%x' % int(binascii.hexlify(os.urandom(24)), 16), 'nc': ('00000001'), # ToDo: Is this a tupel or only a string? 'qop': 'auth', 'digest-uri': 'xmpp/' + self._owner.Server, @@ -498,7 +498,7 @@ class SASL(PlugIn): def set_password(self, password): self.password = '' if password is None else password if self.mechanism in ('SCRAM-SHA-1', 'SCRAM-SHA-1-PLUS'): - self.client_nonce = '%x' % rndg.getrandbits(196) + self.client_nonce = '%x' % int(binascii.hexlify(os.urandom(24)), 16) self.scram_soup = 'n=' + self.username + ',r=' + self.client_nonce if self.mechanism == 'SCRAM-SHA-1': if self.channel_binding is None: ===================================== nbxmpp/bosh.py ===================================== --- a/nbxmpp/bosh.py +++ b/nbxmpp/bosh.py @@ -17,7 +17,8 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. - +import os +import binascii import locale from hashlib import sha1 from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ @@ -29,8 +30,6 @@ from .simplexml import Node import logging log = logging.getLogger('nbxmpp.bosh') -from . import rndg - KEY_COUNT = 10 # Fake file descriptor - it's used for setting read_timeout in idlequeue for @@ -486,11 +485,9 @@ class NonBlockingBOSH(NonBlockingTransport): def get_rand_number(): - # with 50-bit random initial rid, session would have to go up - # to 7881299347898368 messages to raise rid over 2**53 # (see http://www.xmpp.org/extensions/xep-0124.html#rids) # it's also used for sequence key initialization - return rndg.getrandbits(50) + return int(binascii.hexlify(os.urandom(6)), 16) class AckChecker(object): ===================================== nbxmpp/rndg.py deleted ===================================== --- a/nbxmpp/rndg.py +++ /dev/null @@ -1,49 +0,0 @@ -## rndg.py -## -## cryptographically secure pseudo-random number generator. -## When possible use OpenSSL PRNG combined with os.random, -## if OpenSSL PRNG is not available, use only os.random. -## -## Copyright (C) 2013 Fedor Brunner <fedor.brunner(a)azet.sk> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -USE_PYOPENSSL = False -try: - import OpenSSL.rand - import binascii, os - USE_PYOPENSSL = True -except ImportError: - import random - -if not USE_PYOPENSSL: - getrandbits = random.SystemRandom().getrandbits -else: - def getrandbits(k): - """getrandbits(k) -> x. Generates a long int with k random bits.""" - if k <= 0: - raise ValueError('number of bits must be greater than zero') - if k != int(k): - raise TypeError('number of bits should be an integer') - - bytes = (k + 7) // 8 # bits / 8 and rounded up - - # Add system entropy to OpenSSL PRNG - OpenSSL.rand.add(os.urandom(bytes), bytes) - # Extract random bytes from OpenSSL PRNG - random_str = OpenSSL.rand.bytes(bytes) - - x = int(binascii.hexlify(random_str), 16) - return x >> (bytes * 8 - k) # trim excess bits View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6807867b231ed7e25fbdbac36… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6807867b231ed7e25fbdbac36… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits