Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] setup.py: install all files if build is skipped
by Philipp Hörist 02 Apr '18

02 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ec49e9f by André Apitzsch at 2018-04-02T15:56:28+02:00 setup.py: install all files if build is skipped - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ if sys.version_info < (3, 5): from setuptools import setup, find_packages from setuptools import Command from setuptools.command.build_py import build_py as _build +from setuptools.command.install import install as _install from distutils import log from distutils.util import convert_path, newer @@ -18,6 +19,9 @@ import gajim pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) +MAN_FILES = ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1'] +META_FILES = [('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), + ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')] cwd = os.path.dirname(os.path.realpath(__file__)) build_dir = os.path.join(cwd, "build") @@ -53,7 +57,6 @@ def build_trans(build_cmd): ''' Translate the language files into gajim.mo ''' - data_files = build_cmd.distribution.data_files for lang in ALL_LINGUAS: po_file = os.path.join('po', lang + '.po') mo_file = os.path.join(build_dir, 'mo', lang, 'LC_MESSAGES', 'gajim.mo') @@ -72,7 +75,11 @@ def build_trans(build_cmd): raise SystemExit(msg) log.info('Compiling %s >> %s', po_file, mo_file) - # linux specific piece: + +def install_trans(install_cmd): + data_files = install_cmd.distribution.data_files + for lang in ALL_LINGUAS: + mo_file = os.path.join(build_dir, 'mo', lang, 'LC_MESSAGES', 'gajim.mo') target = 'share/locale/' + lang + '/LC_MESSAGES' data_files.append((target, [mo_file])) @@ -81,14 +88,12 @@ def build_man(build_cmd): ''' Compress Gajim manual files ''' - data_files = build_cmd.distribution.data_files - for man in ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1']: - filename = os.path.join('data', man) - newdir = os.path.join(build_dir, 'man') - if not (os.path.isdir(newdir) or os.path.islink(newdir)): - os.makedirs(newdir) + newdir = os.path.join(build_dir, 'man') + if not (os.path.isdir(newdir) or os.path.islink(newdir)): + os.makedirs(newdir) - import gzip + for man in MAN_FILES: + filename = os.path.join('data', man) man_file_gz = os.path.join(newdir, man + '.gz') if os.path.exists(man_file_gz): if newer(filename, man_file_gz): @@ -97,13 +102,21 @@ def build_man(build_cmd): filename = False if filename: + import gzip # Binary io, so open is OK with open(filename, 'rb') as f_in,\ gzip.open(man_file_gz, 'wb') as f_out: f_out.writelines(f_in) log.info('Compiling %s >> %s', filename, man_file_gz) - target = 'share/man/man1' + +def install_man(install_cmd): + data_files = install_cmd.distribution.data_files + man_dir = os.path.join(build_dir, 'man') + target = 'share/man/man1' + + for man in MAN_FILES: + man_file_gz = os.path.join(man_dir, man + '.gz') data_files.append((target, [man_file_gz])) @@ -111,20 +124,22 @@ def build_intl(build_cmd): ''' Merge translation files into desktop and mime files ''' - data_files = build_cmd.distribution.data_files base = build_dir - merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), - ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')) - - for filename, target, option in merge_files: + for filename, _, option in META_FILES: filenamelocal = convert_path(filename) newfile = os.path.join(base, filenamelocal) newdir = os.path.dirname(newfile) if not(os.path.isdir(newdir) or os.path.islink(newdir)): os.makedirs(newdir) merge(filenamelocal + '.in', newfile, option) - data_files.append((target, [base + '/' + filename])) + + +def install_intl(install_cmd): + data_files = install_cmd.distribution.data_files + + for filename, target, _ in META_FILES: + data_files.append((target, [build_dir + '/' + filename])) def merge(in_file, out_file, option, po_dir='po'): @@ -154,6 +169,15 @@ class build(_build): _build.run(self) +class install(_install): + def run(self): + install_trans(self) + if sys.platform != 'win32': + install_man(self) + install_intl(self) + _install.run(self) + + class test(Command): description = "Run all tests" user_options = [] @@ -243,6 +267,7 @@ setup( ], cmdclass={ 'build_py': build, + 'install': install, 'test': test, 'test_nogui': test_nogui, 'update_po': update_po, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ec49e9f24cc60566c2ec87bc626be8d9d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ec49e9f24cc60566c2ec87bc626be8d9d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix password storage in plain text issue
by Philipp Hörist 02 Apr '18

02 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 672aae9c by André Apitzsch at 2018-04-02T15:50:23+02:00 Fix password storage in plain text issue - - - - - 1 changed file: - gajim/accounts_window.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -686,7 +686,7 @@ class LoginDialog(OptionsDialog): self.connect('destroy', self.on_destroy) def on_password_change(self, new_password, data): - self.get_option('password').entry.set_text(new_password) + passwords.save_password(self.account, new_password) def on_destroy(self, *args): savepass = app.config.get_per('accounts', self.account, 'savepass') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/672aae9c1263840d0494766f94769cb894… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/672aae9c1263840d0494766f94769cb894… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] prepare 1.0.1 release
by Yann Leboulanger 01 Apr '18

01 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: dc3565ee by Yann Leboulanger at 2018-04-01T22:48:42+02:00 prepare 1.0.1 release - - - - - 2 changed files: - ChangeLog - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Gajim 1.0.1 (1 April 2018) + + * Improve MAM support + * Image preview in file chooser dialog + * Groupchat: Set minimize on auto join default True + * Delete bookmark when we destroy a room + * Fix account deletion + * Fix custom font handling + * Fix OpenPGP message decryption + * Fix window position restore on multi-head setups + * Fix scrolling in message window + * Improve Windows build and build for 64 bits + Gajim 1.0.0 (17 March 2018) * Ported to GTK3 / Python3 ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "1.0.0" +__version__ = "1.0.1" try: p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc3565ee32e0b616784af196436fdd147c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc3565ee32e0b616784af196436fdd147c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.0.1
by Yann Leboulanger 01 Apr '18

01 Apr '18

Yann Leboulanger pushed new tag gajim-1.0.1 at gajim / gajim --- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.0.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] prepare 1.0.1 release
by Yann Leboulanger 01 Apr '18

01 Apr '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: c4830bd9 by Yann Leboulanger at 2018-04-01T18:47:34+02:00 prepare 1.0.1 release - - - - - 3 changed files: - ChangeLog - appveyor.yml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Gajim 1.0.1 (1 April 2018) + + * Improve MAM support + * Image preview in file chooser dialog + * Groupchat: Set minimize on auto join default True + * Delete bookmark when we destroy a room + * Fix account deletion + * Fix custom font handling + * Fix OpenPGP message decryption + * Fix window position restore on multi-head setups + * Fix scrolling in message window + * Improve Windows build and build for 64 bits + Gajim 1.0.0 (17 March 2018) * Ported to GTK3 / Python3 ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -30,8 +30,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.0-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.0-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.1-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.1-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "1.0.0" +__version__ = "1.0.1" try: p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c4830bd93c6ec68084425c05965ed07706… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c4830bd93c6ec68084425c05965ed07706… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 2 commits: Decode PGP decrypted messages
by Yann Leboulanger 01 Apr '18

01 Apr '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: cfbb14fe by Philipp Hörist at 2018-04-01T15:49:16+02:00 Decode PGP decrypted messages - - - - - 967f7a40 by Yann Leboulanger at 2018-04-01T15:49:23+02:00 correctly set process name. Fixes #9034 - - - - - 2 changed files: - gajim/common/gpg.py - gajim/gajim.py Changes: ===================================== gajim/common/gpg.py ===================================== --- a/gajim/common/gpg.py +++ b/gajim/common/gpg.py @@ -73,7 +73,7 @@ if app.HAVE_GPG: result = super(GnuPG, self).decrypt(data.encode('utf8'), passphrase=self.passphrase) - return str(result) + return result.data.decode('utf8') def sign(self, str_, keyID): result = super(GnuPG, self).sign(str_.encode('utf8'), keyid=keyID, detach=True, ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -218,7 +218,7 @@ class GajimApplication(Gtk.Application): if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: i18n.direction_mark = '\u200F' - from ctypes import CDLL + from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library import platform @@ -231,7 +231,10 @@ class GajimApplication(Gtk.Application): PR_SET_NAME = 15 if sysname == 'Linux': - libc.prctl(PR_SET_NAME, 'gajim') + proc_name = b'gajim' + buff = create_string_buffer(len(proc_name)+1) + buff.value = proc_name + libc.prctl(PR_SET_NAME, byref(buff), 0, 0, 0) elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0d2be126c05fcc6e4de27bb0b7b68728b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0d2be126c05fcc6e4de27bb0b7b68728b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] update translations
by Yann Leboulanger 01 Apr '18

01 Apr '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: 0d2be126 by Yann Leboulanger at 2018-04-01T13:19:00+00:00 update translations - - - - - 3 changed files: - po/be.po - po/be(a)latin.po - po/bg.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0d2be126c05fcc6e4de27bb0b7b68728b4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0d2be126c05fcc6e4de27bb0b7b68728b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] correctly set process name. Fixes #9034
by Yann Leboulanger 01 Apr '18

01 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0f13b23a by Yann Leboulanger at 2018-04-01T15:05:06+02:00 correctly set process name. Fixes #9034 - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -217,7 +217,7 @@ class GajimApplication(Gtk.Application): if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: i18n.direction_mark = '\u200F' - from ctypes import CDLL + from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library import platform @@ -230,7 +230,10 @@ class GajimApplication(Gtk.Application): PR_SET_NAME = 15 if sysname == 'Linux': - libc.prctl(PR_SET_NAME, 'gajim') + proc_name = b'gajim' + buff = create_string_buffer(len(proc_name)+1) + buff.value = proc_name + libc.prctl(PR_SET_NAME, byref(buff), 0, 0, 0) elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0f13b23a7dd5f4462adcca6b9543b46dcd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0f13b23a7dd5f4462adcca6b9543b46dcd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Decode PGP decrypted messages
by Philipp Hörist 30 Mar '18

30 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e326aabf by Philipp Hörist at 2018-03-31T01:18:28+02:00 Decode PGP decrypted messages - - - - - 1 changed file: - gajim/common/gpg.py Changes: ===================================== gajim/common/gpg.py ===================================== --- a/gajim/common/gpg.py +++ b/gajim/common/gpg.py @@ -73,7 +73,7 @@ if app.HAVE_GPG: result = super(GnuPG, self).decrypt(data.encode('utf8'), passphrase=self.passphrase) - return str(result) + return result.data.decode('utf8') def sign(self, str_, keyID): result = super(GnuPG, self).sign(str_.encode('utf8'), keyid=keyID, detach=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e326aabf5f0e33eb5a12530c6db424cab1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e326aabf5f0e33eb5a12530c6db424cab1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] 12 commits: Dont print status if it has not changed
by Yann Leboulanger 30 Mar '18

30 Mar '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: fa8614e5 by Philipp Hörist at 2018-03-30T23:02:03+02:00 Dont print status if it has not changed Only print the status, if status has changed or the status message Clients announce there idle-time with presences but adding a idle-time does not necessarily mean they went from available -> away Fixes #9001 - - - - - 667f6e7d by Yann Leboulanger at 2018-03-30T23:02:32+02:00 correctly generate css for font that have a space. Fixes #9012 - - - - - c63e0fe4 by Yann Leboulanger at 2018-03-30T23:03:14+02:00 don't traceback on account deletion. Fixes #8960 - - - - - f1c1550d by Yann Leboulanger at 2018-03-30T23:04:09+02:00 ability to fix room name when browsing muc service. See #8994 - - - - - c8bd0f47 by Yann Leboulanger at 2018-03-30T23:04:28+02:00 set a transient_for for join groupchat dialog when needed. Fixes #8994 - - - - - 00632804 by André Apitzsch at 2018-03-30T23:04:42+02:00 Show help lines only once fixes #9018 - - - - - ff64130a by Yann Leboulanger at 2018-03-30T23:04:54+02:00 prevent traceback. Fixes #8936 - - - - - b4d3f138 by Yann Leboulanger at 2018-03-30T23:05:30+02:00 remove bookmark and close muc when destroying the room. Fixes #8862 - - - - - 847e5142 by Yann Leboulanger at 2018-03-30T23:05:58+02:00 don't allow to open several filter dialogs. Fixes #8848 - - - - - a4b53be1 by Philipp Hörist at 2018-03-30T23:08:58+02:00 Provide 64bit installer for Windows - - - - - 0fde312c by Philipp Hörist at 2018-03-30T23:09:17+02:00 Remove not supported methods Methods have been remove in from IPython since 2016 https://github.com/ipython/ipython/commit/b7d03ed6b16013973b82c4725c79c30ac… Fixes #9023 - - - - - c643b0de by Yann Leboulanger at 2018-03-30T23:09:52+02:00 update plugin installer sha256 for flatpak - - - - - 17 changed files: - appveyor.yml - gajim/command_system/framework.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/helpers.py - gajim/dev/ipython_view.py - gajim/dialogs.py - gajim/disco.py - gajim/groupchat_control.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/roster_window.py - org.gajim.Gajim.json - win/_base.sh - win/build.sh - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,12 @@ environment: matrix: + - MSYSTEM: MINGW64 + MSYS_ARCH: "x86_64" + ARCH: "64bit" + - MSYSTEM: MINGW32 + MSYS_ARCH: "i686" + ARCH: "32bit" branches: only: @@ -22,10 +28,10 @@ build_script: C:\msys64\usr\bin\sh.exe --login -c $command } - bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim' - bash 'C:/msys64/home/appveyor/gajim/win/build.sh' - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.0-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.0-$($env:TIME_STRING).exe" + bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" + bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.0-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.0-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== gajim/command_system/framework.py ===================================== --- a/gajim/command_system/framework.py +++ b/gajim/command_system/framework.py @@ -142,7 +142,7 @@ class CommandProcessor(object): def list_commands(self): commands = list_commands(self.COMMAND_HOST) commands = dict(commands) - return sorted(list(commands.values()), key=lambda k: k.__repr__()) + return sorted(set(commands.values()), key=lambda k: k.__repr__()) class Command(object): ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -695,6 +695,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.privacy_rules_requested = False self.streamError = '' self.secret_hmac = str(random.random())[2:].encode('utf-8') + self.removing_account = False self.sm = Smacks(self) # Stream Management @@ -869,6 +870,8 @@ class Connection(CommonConnection, ConnectionHandlers): def _connection_lost(self): log.debug('_connection_lost') self.disconnect(on_purpose = False) + if self.removing_account: + return app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Connection with account "%s" has been lost') % self.name, msg=_('Reconnect manually.'))) @@ -2728,6 +2731,13 @@ class Connection(CommonConnection, ConnectionHandlers): if jid: destroy.setAttr('jid', jid) self.connection.send(iq) + i = 0 + for bm in self.bookmarks: + if bm['jid'] == room_jid: + del self.bookmarks[i] + break + i += 1 + self.store_bookmarks() def send_gc_status(self, nick, jid, show, status, auto=False): if not app.account_is_connected(self.name): @@ -2890,6 +2900,7 @@ class Connection(CommonConnection, ConnectionHandlers): # on_remove_success as a class property as pass it as an argument def _on_unregister_account_connect(con): self.on_connect_auth = None + self.removing_account = True if app.account_is_connected(self.name): hostname = app.config.get_per('accounts', self.name, 'hostname') iq = nbxmpp.Iq(typ='set', to=hostname) @@ -2908,6 +2919,7 @@ class Connection(CommonConnection, ConnectionHandlers): con.SendAndWaitForResponse(iq) return on_remove_success(False) + self.removing_account = False if self.connected == 0: self.on_connect_auth = _on_unregister_account_connect self.connect_and_auth() ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -851,10 +851,9 @@ class ConnectionHandlersBase: obj.contact.contact_name = obj.contact_nickname obj.need_redraw = True - if obj.old_show == obj.new_show and obj.contact.status == \ - obj.status and obj.contact.priority == obj.prio and \ - obj.contact.idle_time == obj.idle_time: # no change - return True + elif obj.old_show != obj.new_show or obj.contact.status != \ + obj.status: + obj.need_redraw = True else: obj.contact = app.contacts.get_first_contact_from_jid(account, jid) ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -431,10 +431,8 @@ def get_uf_sub(sub): uf_sub = _('From') elif sub == 'both': uf_sub = _('Both') - elif sub is None: - uf_sub = _('Unknown') else: - uf_sub = sub + uf_sub = _('Unknown') return uf_sub ===================================== gajim/dev/ipython_view.py ===================================== --- a/gajim/dev/ipython_view.py +++ b/gajim/dev/ipython_view.py @@ -211,9 +211,6 @@ class IterableIPShell: self.IP.input_splitter.push(line) self.iter_more = self.IP.input_splitter.push_accepts_more() self.prompt = self.generatePrompt(self.iter_more) - if (self.IP.SyntaxTB.last_syntax_error and - self.IP.autoedit_syntax): - self.IP.edit_syntax_error() if not self.iter_more: if IPython.version_info[0] >= 2: source_raw = self.IP.input_splitter.raw_reset() ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2364,7 +2364,8 @@ class SubscriptionRequestWindow(Gtk.ApplicationWindow): self.destroy() class JoinGroupchatWindow(Gtk.ApplicationWindow): - def __init__(self, account, room_jid, password=None, automatic=None): + def __init__(self, account, room_jid, password=None, automatic=None, + transient_for=None): Gtk.ApplicationWindow.__init__(self) self.set_name('JoinGroupchat') self.set_application(app.app) @@ -2372,13 +2373,20 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.set_resizable(False) self.set_position(Gtk.WindowPosition.CENTER) self.set_title(_('Join Groupchat')) + if transient_for: + self.set_transient_for(transient_for) self.automatic = automatic self.password = password self.requested_jid = None self.room_jid = room_jid self.account = account - self.minimal_mode = room_jid is not None + self.minimal_mode = 0 # 2: very mini, 1: with room, 0: show all + if room_jid is not None: + if '@' in room_jid: + self.minimal_mode = 2 + else: + self.minimal_mode = 1 glade_objects = ['grid', 'nick_entry', 'account_combo', 'jid_label', 'bookmark_switch', 'autojoin_switch', 'headerbar', @@ -2388,6 +2396,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): 'room_label', 'room_entry', 'search_button'] minimal_widgets = ['jid_label'] + room_widgets = ['room_label', 'room_entry'] extended_widgets = ['server_label', 'server_combo', 'recent_label', 'recent_combo', 'room_label', 'room_entry', @@ -2405,9 +2414,12 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.button_box.show() # Show widgets depending on the mode the window is in - if self.minimal_mode: + if self.minimal_mode > 0: for widget in minimal_widgets: getattr(self, widget).show() + if self.minimal_mode == 1: + for widget in room_widgets: + getattr(self, widget).show() self.jid_label.set_text(room_jid) else: for widget in extended_widgets: @@ -2426,7 +2438,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.connect('key-press-event', self._on_key_press_event) self.connect('destroy', self._on_destroy) - if not self.minimal_mode: + if self.minimal_mode == 0: app.ged.register_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) app.ged.register_event_handler('agent-info-error-received', ged.GUI1, @@ -2439,7 +2451,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Select first account self.account_combo.set_active(0) - if not self.minimal_mode: + if self.minimal_mode == 0: self.recent_combo.set_active(0) if self.password is not None: @@ -2453,8 +2465,8 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Show password field if we are in extended mode or # The MUC is passwordprotected - if not self.minimal_mode or muc_caps_cache.supports( - room_jid, 'muc_passwordprotected'): + if self.minimal_mode == 0 or muc_caps_cache.supports( + room_jid, 'muc_passwordprotected'): self.password_entry.show() self.password_label.show() @@ -2509,8 +2521,11 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): account = self.account_combo.get_active_text() nickname = self.nick_entry.get_text() - if not self.minimal_mode: - server = self.server_combo.get_active_text() + if self.minimal_mode < 2: + if self.minimal_mode == 0: + server = self.server_combo.get_active_text() + else: # mode 1 + server = self.room_jid room = self.room_entry.get_text() if room == '': ErrorDialog(_('Invalid Room'), @@ -2581,7 +2596,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): account, name, self.room_jid, autojoin, 1, password, nickname) def _on_destroy(self, *args): - if not self.minimal_mode: + if self.minimal_mode == 0: del app.interface.instances[self.account]['join_gc'] app.ged.remove_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) @@ -3554,6 +3569,7 @@ class XMLConsoleWindow(Gtk.Window): self.stream = True self.incoming = True self.outgoing = True + self.filter_dialog = None glade_objects = ['textview', 'input', 'scrolled_input', 'headerbar', 'scrolled', 'actionbar', 'paned', 'box', 'menubutton'] @@ -3674,6 +3690,9 @@ class XMLConsoleWindow(Gtk.Window): self.menubutton.hide() def on_filter_options(self, *args): + if self.filter_dialog: + self.filter_dialog.present() + return options = [ Option(OptionKind.SWITCH, 'Presence', OptionType.VALUE, self.presence, @@ -3697,8 +3716,13 @@ class XMLConsoleWindow(Gtk.Window): callback=self.on_option, data='outgoing'), ] - OptionsDialog(self, 'Filter', Gtk.DialogFlags.DESTROY_WITH_PARENT, - options, self.account) + self.filter_dialog = OptionsDialog(self, 'Filter', + Gtk.DialogFlags.DESTROY_WITH_PARENT, + options, self.account) + self.filter_dialog.connect('destroy', self.on_filter_destroyed) + + def on_filter_destroyed(self, win): + self.filter_dialog = None def on_clear(self, *args): buffer_ = self.textview.get_buffer().set_text('') ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -1400,7 +1400,8 @@ class ToplevelAgentBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - app.interface.join_gc_minimal(self.account, service) + app.interface.join_gc_minimal(self.account, service, + transient_for=self.window.window) def update_actions(self): if self.execute_button: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -631,7 +631,6 @@ class GroupchatControl(ChatControlBase): 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( online and app.connections[self.account].httpupload) - win.lookup_action('send-file-' + self.control_id).set_enabled( httpupload.get_enabled()) @@ -691,6 +690,10 @@ class GroupchatControl(ChatControlBase): return app.connections[self.account].destroy_gc_room( self.room_jid, reason, jid) + gui_menu_builder.build_bookmark_menu(self.account) + self.force_non_minimizable = True + self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) + self.force_non_minimizable = False # Ask for a reason dialogs.DoubleInputDialog(_('Destroying %s') % '\u200E' + \ ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -878,7 +878,7 @@ def add_css_font(): unit = "pt" if Gtk.check_version(3, 22, 0) is None else "px" css = """ .font_custom {{ - font-family: {family}; + font-family: "{family}"; font-size: {size}{unit}; font-weight: {weight}; }}""".format( ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1818,7 +1818,8 @@ class Interface: ctrl.scroll_to_end() - def join_gc_minimal(self, account, room_jid, password=None): + def join_gc_minimal(self, account, room_jid, password=None, + transient_for=None): if account is not None: if app.in_groupchat(account, room_jid): # If we already in the groupchat, join_gc_room will bring @@ -1855,7 +1856,8 @@ class Interface: dialogs.ErrorDialog(_('JID is not a Groupchat'), transient_for=app.app.get_active_window()) return - dialogs.JoinGroupchatWindow(account, room_jid, password=password) + dialogs.JoinGroupchatWindow(account, room_jid, password=password, + transient_for=transient_for) disco_account = connected_accounts[0] if account is None else account app.connections[disco_account].discoverMUC( ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2574,7 +2574,7 @@ class RosterWindow: self.draw_contact(jid, account) self.draw_group(_('Transports'), account) - if obj.contact: + if obj.contact and obj.need_redraw: self.chg_contact_status(obj.contact, obj.show, obj.status, account) if obj.popup: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -359,7 +359,7 @@ { "type": "archive", "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", - "sha256": "a4ee63a4b7fd213236f30f23ff0535d63bad2fd276363d4ac8d320da63d4d09c", + "sha256": "3b0c40b22596da54c0eea7f7571c83b61619996ebe6c00b304d7fa5278aaefbb", "dest": "gajim/data/plugins/plugin_installer" } ] ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -11,8 +11,6 @@ DIR="$( cd "$( dirname "$0" )" && pwd )" cd "${DIR}" # CONFIG START - -ARCH="i686" PYTHON_VERSION="3" BUILD_VERSION="0" @@ -25,15 +23,20 @@ MINGW="mingw32" QL_VERSION="0.0.0" QL_VERSION_DESC="UNKNOWN" +function set_arch { + ARCH="$1" + if [ "$1" == "x86_64" ]; then + MINGW="mingw64" + fi +} + function set_build_root { - BUILD_ROOT="$1" + 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" } -set_build_root "${DIR}/_build_root" - function build_pacman { pacman --root "${BUILD_ROOT}" "$@" } @@ -114,8 +117,6 @@ pillow==4.3.0 } function install_gajim { - [ -z "$1" ] && (echo "Missing arg"; exit 1) - rm -Rf "${PACKAGE_DIR}"/gajim* cd .. @@ -302,6 +303,6 @@ function move_ssl_libs { } function build_installer { - (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim.nsi) - (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim-portable.nsi) + (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi) + (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) } ===================================== win/build.sh ===================================== --- a/win/build.sh +++ b/win/build.sh @@ -10,12 +10,12 @@ DIR="$( cd "$( dirname "$0" )" && pwd )" source "$DIR"/_base.sh function main { - local GIT_TAG=${1:-"master"} - + set_arch "$1" + set_build_root install_pre_deps create_root install_deps - install_gajim "$GIT_TAG" + install_gajim cleanup_install move_ssl_libs build_installer ===================================== win/misc/gajim-portable.nsi ===================================== --- a/win/misc/gajim-portable.nsi +++ b/win/misc/gajim-portable.nsi @@ -101,7 +101,7 @@ Section "Gajim" SecGajim SectionIn RO SetOutPath "$INSTDIR" - File /r "mingw32\*.*" + File /r "${ARCH}\*.*" SetOutPath "$INSTDIR\bin" CreateShortCut "$INSTDIR\Gajim-Portable.lnk" "$INSTDIR\bin\Gajim.exe" \ ===================================== win/misc/gajim.nsi ===================================== --- a/win/misc/gajim.nsi +++ b/win/misc/gajim.nsi @@ -146,12 +146,18 @@ LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצ Section "Gajim" SecGajim SectionIn RO - + + Var /GLOBAL arch_name + StrCpy $arch_name "(64-Bit)" + StrCmp ${ARCH} "mingw64" cont + StrCpy $arch_name "(32-Bit)" + cont: + SetOutPath "$INSTDIR" - File /r "mingw32\*.*" + File /r "${ARCH}\*.*" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim ${VERSION} $arch_name" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "${VERSION}" View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a5dd159ad841533f8e07ea90529a7eed9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a5dd159ad841533f8e07ea90529a7eed9… 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