Commits February 2018

commits@gajim.org

1 participants
76 discussions

[Git][gajim/gajim][master] Make string translatable
by Philipp Hörist 16 Feb '18

16 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0cdc068 by Philipp Hörist at 2018-02-16T21:36:24+01:00 Make string translatable - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1316,7 +1316,7 @@ class AboutDialog(Gtk.AboutDialog): thanks.append('') thanks.append(_('Last but not least')) thanks.append(_('we would like to thank all the package maintainers.')) - self.add_credit_section('Thanks', thanks) + self.add_credit_section(_('Thanks'), thanks) self.set_translator_credits(_('translator-credits')) self.set_logo_icon_name('org.gajim.Gajim') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d0cdc068032cf282dcd32f862e850e8cdc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d0cdc068032cf282dcd32f862e850e8cdc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusIcon: Set account name correctly
by Philipp Hörist 16 Feb '18

16 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc007fc6 by Philipp Hörist at 2018-02-16T20:55:28+01:00 StatusIcon: Set account name correctly Fixes #8901 - - - - - 1 changed file: - gajim/statusicon.py Changes: ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -244,10 +244,12 @@ class StatusIcon: self.popup_menus.append(account_menu_for_chat_with) for account in accounts_list: + account_label = app.config.get_per( + 'accounts', account, 'account_label') if app.account_is_connected(account): # for chat_with item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) + _('using account %s') % account_label) account_menu_for_chat_with.append(item) item.connect('activate', self.on_new_chat, account) @@ -288,6 +290,8 @@ class StatusIcon: self.popup_menus.append(account_menu_for_single_message) for account in accounts_list: + account_label = app.config.get_per( + 'accounts', account, 'account_label') if app.connections[account].is_zeroconf or \ not app.account_is_connected(account): continue @@ -295,14 +299,14 @@ class StatusIcon: connected_accounts_with_private_storage += 1 # for single message item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) + _('using account %s') % account_label) item.connect('activate', self.on_single_message_menuitem_activate, account) account_menu_for_single_message.append(item) # join gc gc_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) + _('using account %s') % account_label) gc_sub_menu.append(gc_item) gc_menuitem_menu = Gtk.Menu() app.interface.roster.add_bookmarks_list(gc_menuitem_menu, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc007fc68f5eefbdc280d126357c00e579… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc007fc68f5eefbdc280d126357c00e579… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] VCard Window: fix URI
by Philipp Hörist 16 Feb '18

16 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 075ceacf by Philipp Hörist at 2018-02-16T20:48:22+01:00 VCard Window: fix URI Fixes #8902 - - - - - 1 changed file: - gajim/vcard.py Changes: ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -188,7 +188,10 @@ class VcardWindow: if entry_name in ('URL_label', 'EMAIL_WORK_USERID_label', 'EMAIL_HOME_USERID_label'): - widget.set_uri('mailto:' + value) + if entry_name == 'URL_label': + widget.set_uri(value) + else: + widget.set_uri('mailto:' + value) widget.set_label(value) self.xml.get_object(entry_name).show() else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/075ceacf4949910596e6a55f5dc698401b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/075ceacf4949910596e6a55f5dc698401b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Parse uri with message action correctly
by Philipp Hörist 14 Feb '18

14 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4f08b3b by Philipp Hörist at 2018-02-14T21:11:25+01:00 Parse uri with message action correctly Fixes #8894 - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -41,6 +41,8 @@ import sys import os import signal import locale +from urllib.parse import unquote + import gi gi.require_version('GLib', '2.0') gi.require_version('Gio', '2.0') @@ -49,6 +51,7 @@ gi.require_version('Gdk', '3.0') gi.require_version('GObject', '2.0') gi.require_version('Pango', '1.0') from gi.repository import GLib, Gio, Gtk + from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto @@ -269,12 +272,20 @@ class GajimApplication(Gtk.Application): self.interface.join_gc_minimal(None, jid) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) - elif cmd == 'message': + elif cmd.startswith('message'): + attributes = cmd.split(';') + message = None + for key in attributes: + if key.startswith('body'): + try: + message = unquote(key.split('=')[1]) + except Exception: + app.log('uri_handler').error('Invalid URI: %s', cmd) accounts = list(app.connections.keys()) if not accounts: continue if len(accounts) == 1: - app.interface.new_chat_from_jid(accounts[0], jid) + app.interface.new_chat_from_jid(accounts[0], jid, message) else: self.activate_action('start-chat') start_chat_window = app.interface.instances['start_chat'] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4f08b3bfe2ec2256f199736dd7db000cd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4f08b3bfe2ec2256f199736dd7db000cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont show avatars as Window icon
by Philipp Hörist 14 Feb '18

14 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a2caafa7 by Philipp Hörist at 2018-02-14T20:10:56+01:00 Dont show avatars as Window icon Avatars are now Surfaces, Gtk.Window has no method yet to add Surfaces as icons. Transforming them back to pixbufs is not viable because pixbufs cant hold the scale information, and we have no way to set it. This was only used with single chat windows, which is a mode that came out of style and is probably not used often anymore. Fixes #8895 - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -469,31 +469,13 @@ class MessageWindow(object): def show_icon(self): window_mode = app.interface.msg_win_mgr.mode - icon = None - if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_NEVER: - ctrl = self.get_active_control() - if not ctrl: - return - icon = ctrl.get_tab_image(count_unread=False) - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: + icon = 'org.gajim.Gajim' + if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, + MessageWindowMgr.ONE_MSG_WINDOW_NEVER): if self.type_ == 'gc': icon = gtkgui_helpers.get_iconset_name_for('muc-active') - else: - # chat, pm - icon = 'org.gajim.Gajim' - if icon: - if isinstance(icon, GdkPixbuf.Pixbuf): - self.window.set_icon(icon) - elif isinstance(icon, str): - self.window.set_icon_name(icon) - else: - self.window.set_icon(icon.get_pixbuf()) + + self.window.set_icon_name(icon) def show_title(self, urgent=True, control=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a2caafa72c45d3563df310abd7eec4cf9e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a2caafa72c45d3563df310abd7eec4cf9e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Dont show avatars as Window icon
by Philipp Hörist 14 Feb '18

14 Feb '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 4caf1ffe by Philipp Hörist at 2018-02-14T20:09:34+01:00 Dont show avatars as Window icon Avatars are now Surfaces, Gtk.Window has no method yet to add Surfaces as icons. Transforming them back to pixbufs is not viable because pixbufs cant hold the scale information, and we have no way to set it. This was only used with single chat windows, which is a mode that came out of style and is probably not used often anymore. Fixes #8895 - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -469,31 +469,13 @@ class MessageWindow(object): def show_icon(self): window_mode = app.interface.msg_win_mgr.mode - icon = None - if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_NEVER: - ctrl = self.get_active_control() - if not ctrl: - return - icon = ctrl.get_tab_image(count_unread=False) - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: + icon = 'org.gajim.Gajim' + if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, + MessageWindowMgr.ONE_MSG_WINDOW_NEVER): if self.type_ == 'gc': icon = gtkgui_helpers.get_iconset_name_for('muc-active') - else: - # chat, pm - icon = 'org.gajim.Gajim' - if icon: - if isinstance(icon, GdkPixbuf.Pixbuf): - self.window.set_icon(icon) - elif isinstance(icon, str): - self.window.set_icon_name(icon) - else: - self.window.set_icon(icon.get_pixbuf()) + + self.window.set_icon_name(icon) def show_title(self, urgent=True, control=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4caf1ffe59951cf3d2a08b304353626067… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4caf1ffe59951cf3d2a08b304353626067… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Join Groupchat Dialog use_underline for headerbar Join button mnemonic
by Philipp Hörist 14 Feb '18

14 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b8ffae8 by Sebastian Wagner at 2018-02-13T20:49:48+01:00 Join Groupchat Dialog use_underline for headerbar Join button mnemonic https://valadoc.org/gtk+-3.0/Gtk.Button.set_use_underline.html - - - - - 1 changed file: - gajim/data/gui/join_groupchat_window.ui Changes: ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -322,9 +322,10 @@ </child> <child> <object class="GtkButton"> - <property name="label" translatable="yes">Join</property> + <property name="label" translatable="yes">_Join</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="use_underline">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="_on_join_clicked" swapped="no"/> <style> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b8ffae89a0c5a50bbc923232fb456c1a9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8b8ffae89a0c5a50bbc923232fb456c1a9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Fix Windows build
by Philipp Hörist 13 Feb '18

13 Feb '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 617177d9 by Philipp Hörist at 2018-02-14T00:16:06+01:00 Fix Windows build - - - - - 2 changed files: - appveyor.yml - win/_base.sh Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: matrix: - - MSYS: C:/msys64/mingw32 + - MSYSTEM: MINGW32 branches: only: @@ -11,10 +11,9 @@ clone_depth: 1 # init: # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -install: - +build_script: + - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127 - ps: | - $env:MSYSTEM="MINGW32" $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" @@ -23,14 +22,11 @@ install: C:\msys64\usr\bin\sh.exe --login -c $command } - bash 'pacman -Sy --noconfirm git' 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" -build: off - # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -51,9 +51,8 @@ function build_compileall { } function install_pre_deps { - pacman -S --needed --noconfirm p7zip git \ - mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain \ - mingw-w64-i686-python3 + pacman -S --needed --noconfirm p7zip \ + mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain } function create_root { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/617177d9d177a2a94f7c48965329c0f8c3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/617177d9d177a2a94f7c48965329c0f8c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Port show-next-pending-event from gajim-remote
by Philipp Hörist 13 Feb '18

13 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b26ba9aa by Philipp Hörist at 2018-02-13T19:25:01+01:00 Port show-next-pending-event from gajim-remote Delete some already ported methods - - - - - 4 changed files: - gajim/app_actions.py - gajim/gajim.py - gajim/gajim_remote.py - gajim/remote_control.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -286,3 +286,13 @@ class AppActions(): win.present() else: app.interface.create_ipython_window() + + def show_next_pending_event(self, action, param): + """ + Show the window(s) with next pending event in tabbed/group chats + """ + if app.events.get_nb_events(): + account, jid, event = app.events.get_first_systray_event() + if not event: + return + app.interface.handle_event(account, jid, event.type_) ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -96,7 +96,10 @@ class GajimApplication(Gtk.Application): _('Show all warnings')) self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, - _('open ipython shell')) + _('Open IPython shell')) + self.add_main_option('show-next-pending-event', 0, GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Pops up a window with the next pending event')) self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._handle_remote_options) @@ -291,9 +294,14 @@ class GajimApplication(Gtk.Application): # Parse all options that should be executed on a remote instance options = command_line.get_options_dict() - if options.contains('ipython'): - self.activate_action('ipython') - return 0 + remote_commands = ['ipython', + 'show-next-pending-event', + ] + + for cmd in remote_commands: + if options.contains(cmd): + self.activate_action(cmd) + return 0 uri = self._parse_uris(command_line) if uri is not None: @@ -415,6 +423,7 @@ class GajimApplication(Gtk.Application): ('about', action.on_about), ('faq', action.on_faq), ('ipython', action.toggle_ipython), + ('show-next-pending-event', action.show_next_pending_event), ] act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) ===================================== gajim/gajim_remote.py ===================================== --- a/gajim/gajim_remote.py +++ b/gajim/gajim_remote.py @@ -85,14 +85,6 @@ class GajimRemote: _('show help on command'), False) ] ], - 'toggle_roster_appearance': [ - _('Shows or hides the roster window'), - [] - ], - 'show_next_pending_event': [ - _('Pops up a window with the next pending event'), - [] - ], 'list_contacts': [ _('Lists all contacts in roster, one for each line'), [ @@ -257,10 +249,6 @@ class GajimRemote: _('Check if Gajim is running'), [] ], - 'toggle_ipython': [ - _('Shows or hides the ipython window'), - [] - ], } ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -646,50 +646,6 @@ class SignalObject(dbus.service.Object): result.append(item) return result - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def toggle_roster_appearance(self): - """ - Show/hide the roster window - """ - win = app.interface.roster.window - if win.get_property('visible'): - GLib.idle_add(win.hide) - else: - win.present() - # preserve the 'steal focus preservation' - if self._is_first(): - win.window.present() - else: - win.window.present_with_time(int(time())) - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def show_roster(self): - """ - Show the roster window - """ - win = app.interface.roster.window - win.present() - # preserve the 'steal focus preservation' - if self._is_first(): - win.window.present() - else: - win.window.present_with_time(int(time())) - - @dbus.service.method(INTERFACE, in_signature='', out_signature='') - def toggle_ipython(self): - """ - Show/hide the ipython window - """ - win = app.ipython_window - if win: - if win.window.is_visible(): - GLib.idle_add(win.hide) - else: - win.show_all() - win.present() - else: - app.interface.create_ipython_window() - @dbus.service.method(INTERFACE, in_signature='', out_signature='a{ss}') def prefs_list(self): prefs_dict = DBUS_DICT_SS() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b26ba9aa67136a93e03d9bbcb20bb937bc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b26ba9aa67136a93e03d9bbcb20bb937bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Update appveyor.yml
by Philipp Hörist 13 Feb '18

13 Feb '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 7557c8a9 by Philipp Hörist at 2018-02-13T18:47:32+01:00 Update appveyor.yml - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ environment: branches: only: - - master + - gajim_1.0 clone_depth: 1 @@ -26,8 +26,8 @@ install: bash 'pacman -Sy --noconfirm git' 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-Master-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe" + 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" build: off View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7557c8a93662977ce327d820ee5f52421a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7557c8a93662977ce327d820ee5f52421a… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2018