Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Add transient argument to Dialogs
by Philipp Hörist 07 Mar '18

07 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3fbce778 by Philipp Hörist at 2018-03-07T19:39:33+01:00 Add transient argument to Dialogs - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -230,7 +230,7 @@ class PassphraseDialog: Class for Passphrase dialog """ def __init__(self, titletext, labeltext, checkbuttontext=None, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('passphrase_dialog.ui') self.window = self.xml.get_object('passphrase_dialog') self.passphrase_entry = self.xml.get_object('passphrase_entry') @@ -248,7 +248,9 @@ class PassphraseDialog: cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.xml.connect_signals(self) - self.window.set_transient_for(app.interface.roster.window) + if transient_for is None: + transient_for = app.app.get_active_window() + self.window.set_transient_for(transient_for) self.window.show_all() self.check = bool(checkbuttontext) @@ -1856,15 +1858,13 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog): """ def __init__(self, pritext, sectext='', radiotext1='', radiotext2='', - on_response_ok=None, on_response_cancel=None, is_modal=True): + on_response_ok=None, on_response_cancel=None, is_modal=True, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - if hasattr(app.interface, 'roster') and app.interface.roster: - parent = app.interface.roster.window - else: - parent = None - HigDialog.__init__(self, parent, Gtk.MessageType.QUESTION, + if transient_for is None: + transient_for = app.app.get_active_window() + HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3fbce778185727fed3bd18d6b28e2b33ca… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3fbce778185727fed3bd18d6b28e2b33ca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Raise correct dialog on account removal
by Philipp Hörist 07 Mar '18

07 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4aeaf6d3 by Philipp Hörist at 2018-03-07T19:29:50+01:00 Raise correct dialog on account removal Fixes #8941 - - - - - ce4d273d by Philipp Hörist at 2018-03-07T19:30:12+01:00 Fix transients on some Dialogs - - - - - 2 changed files: - gajim/accounts_window.py - gajim/config.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -177,7 +177,7 @@ class AccountsWindow(Gtk.ApplicationWindow): def on_remove_account(self, button, account): if app.events.get_events(account): - app.interface.raise_dialog('unread-events-on-remove') + app.interface.raise_dialog('unread-events-on-remove-account') return if app.config.get_per('accounts', account, 'is_zeroconf'): @@ -211,7 +211,8 @@ class AccountsWindow(Gtk.ApplicationWindow): _('You have opened chat in account %s') % account, _('All chat and groupchat windows will be closed. ' 'Do you want to continue?'), - on_response_ok=(remove, account)) + on_response_ok=(remove, account), + transient_for=self) else: remove(account) ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1774,7 +1774,8 @@ class RemoveAccountWindow: self.account = account xml = gtkgui_helpers.get_gtk_builder('remove_account_window.ui') self.window = xml.get_object('remove_account_window') - self.window.set_transient_for(app.interface.roster.window) + active_window = app.app.get_active_window() + self.window.set_transient_for(active_window) self.remove_and_unregister_radiobutton = xml.get_object( 'remove_and_unregister_radiobutton') self.window.set_title(_('Removing %s account') % self.account) @@ -1794,7 +1795,8 @@ class RemoveAccountWindow: dialogs.ErrorDialog( _('Account is disabled'), _('To unregister from a server, account must be ' - 'enabled.')) + 'enabled.'), + transient_for=self.window) return if not app.connections[self.account].password: def on_ok(passphrase, checked): @@ -1808,7 +1810,8 @@ class RemoveAccountWindow: dialogs.PassphraseDialog( _('Password Required'), _('Enter your password for account %s') % self.account, - _('Save password'), ok_handler=on_ok) + _('Save password'), ok_handler=on_ok, + transient_for=self.window) return app.connections[self.account].unregister_account( self._on_remove_success) @@ -1820,7 +1823,8 @@ class RemoveAccountWindow: dialogs.ConfirmationDialog( _('Account "%s" is connected to the server') % self.account, _('If you remove it, the connection will be lost.'), - on_response_ok=remove) + on_response_ok=remove, + transient_for=self.window) else: remove() @@ -1837,7 +1841,8 @@ class RemoveAccountWindow: _('What would you like to do?'), _('Remove only from Gajim'), _('Don\'t remove anything. I\'ll try again later'), - on_response_ok=self.on_remove_responce_ok, is_modal=False) + on_response_ok=self.on_remove_responce_ok, is_modal=False, + transient_for=self.window) return # Close all opened windows app.interface.roster.close_all(self.account, force=True) @@ -2265,7 +2270,8 @@ class AccountCreationWizardWindow: self.xml = gtkgui_helpers.get_gtk_builder( 'account_creation_wizard_window.ui') self.window = self.xml.get_object('account_creation_wizard_window') - self.window.set_transient_for(app.interface.roster.window) + active_window = app.app.get_active_window() + self.window.set_transient_for(active_window) # Connect events from comboboxtext_entry server_comboboxtext = self.xml.get_object('server_comboboxtext') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cba6336e8fb0df174cff41ac46808f526… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cba6336e8fb0df174cff41ac46808f526… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] update SHA256 checksum of plugin_installer plugin. Fixes #8904, #8884
by Yann Leboulanger 07 Mar '18

07 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: cba6336e by Yann Leboulanger at 2018-03-07T14:39:31+01:00 update SHA256 checksum of plugin_installer plugin. Fixes #8904, #8884 - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -360,7 +360,7 @@ { "type": "archive", "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", - "sha256": "7d5dcd9a5e05d214ca85651784bda732aac3b5c363a6e23529e6e777f9d24d42", + "sha256": "a4ee63a4b7fd213236f30f23ff0535d63bad2fd276363d4ac8d320da63d4d09c", "dest": "gajim/data/plugins/plugin_installer" } ] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cba6336e8fb0df174cff41ac46808f5262… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cba6336e8fb0df174cff41ac46808f5262… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add logging to tooltips
by Philipp Hörist 06 Mar '18

06 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9a0faa47 by Philipp Hörist at 2018-03-06T23:16:30+01:00 Add logging to tooltips - - - - - 1 changed file: - gajim/tooltips.py Changes: ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -30,6 +30,7 @@ import os import time +import logging from datetime import datetime from gi.repository import Gtk @@ -43,6 +44,8 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import Q_ +log = logging.getLogger('gajim.tooltips') + class StatusTable: """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9a0faa47c8d356b697c295370032519595… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9a0faa47c8d356b697c295370032519595… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix roster tooltip
by Philipp Hörist 06 Mar '18

06 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ea4ff26 by Philipp Hörist at 2018-03-06T23:12:33+01:00 Fix roster tooltip Fixes #8924 Its not clear at this point why we dont find a contact is None, so log output is added - - - - - 1 changed file: - gajim/tooltips.py Changes: ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -413,6 +413,10 @@ class RosterTooltip(Gtk.Window, StatusTable): # Username/Account/Groupchat self.prim_contact = app.contacts.get_highest_prio_contact_from_contacts( contacts) + if self.prim_contact is None: + log.error('No contact for Roster tooltip found') + log.error('contacts: %s, typ: %s, account: %s', contacts, typ, account) + return self.contact_jid = self.prim_contact.jid name = GLib.markup_escape_text(self.prim_contact.get_shown_name()) name_markup = '<b>{}</b>'.format(name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ea4ff264cfe3bd34ef47cf83fb897bb08… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ea4ff264cfe3bd34ef47cf83fb897bb08… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] prevent traceback when pressing tab in groupchat. Fixes #8933
by Yann Leboulanger 06 Mar '18

06 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 1190b10e by Yann Leboulanger at 2018-03-06T21:59:40+01:00 prevent traceback when pressing tab in groupchat. Fixes #8933 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2395,7 +2395,8 @@ class GroupchatControl(ChatControlBase): list_nick.remove(nick) list_nick.insert(0, nick) - list_nick.remove(self.nick) # Skip self + if self.nick in list_nick: + list_nick.remove(self.nick) # Skip self for nick in list_nick: fjid = self.room_jid + '/' + nick if nick.lower().startswith(begin.lower()) and not \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1190b10ecda695cf7f6d18ca7c75262ed1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1190b10ecda695cf7f6d18ca7c75262ed1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use hide_groupchat_occupants_list option to decide if we show the occupant list or not. Fixes #8922
by Yann Leboulanger 06 Mar '18

06 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 14f3e041 by Yann Leboulanger at 2018-03-06T21:53:38+01:00 Use hide_groupchat_occupants_list option to decide if we show the occupant list or not. Fixes #8922 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -368,8 +368,6 @@ class GroupchatControl(ChatControlBase): self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) - self.widget_set_visible(self.xml.get_object('list_scrolledwindow'), - app.config.get('hide_groupchat_occupants_list')) self._last_selected_contact = None # None or holds jid, account tuple @@ -409,9 +407,10 @@ class GroupchatControl(ChatControlBase): id_ = self.hpaned.connect('notify', self.on_hpaned_notify) self.handlers[id_] = self.hpaned - # Hide the Roster per default - self.hpaned.get_child2().set_no_show_all(True) - self.hpaned.get_child2().hide() + if app.config.get('hide_groupchat_occupants_list'): + # Hide the roster by default + self.hpaned.get_child2().set_no_show_all(True) + self.hpaned.get_child2().hide() # set the position of the current hpaned hpaned_position = app.config.get('gc-hpaned-position') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/14f3e041deb533f3459693b09e08d26497… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/14f3e041deb533f3459693b09e08d26497… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix traceback at end of file transfer. Fixes #8932
by Yann Leboulanger 06 Mar '18

06 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: c40dfe38 by Yann Leboulanger at 2018-03-06T12:10:37+01:00 fix traceback at end of file transfer. Fixes #8932 - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -423,7 +423,7 @@ class SocksQueue: connections with 1 """ if idx != -1: - for key in self.senders.keys(): + for key in list(self.senders.keys()): if idx in key: self.remove_sender_by_key(key, do_disconnect=do_disconnect) if not remove_all: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c40dfe38178a0fc84d97ac414840f7f330… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c40dfe38178a0fc84d97ac414840f7f330… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix standalone htmltextview.
by Yann Leboulanger 06 Mar '18

06 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d2eeceb7 by Emmanuel Gil Peyrot at 2018-03-06T11:52:23+01:00 Fix standalone htmltextview. - - - - - 1 changed file: - gajim/htmltextview.py Changes: ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -50,7 +50,7 @@ import urllib if __name__ == '__main__': from gajim.common import i18n import gajim.common.configpaths - app.common.configpaths.gajimpaths.init(None) + gajim.common.configpaths.gajimpaths.init(None) from gajim.common import app from gajim import gtkgui_helpers from gajim.gtkgui_helpers import get_icon_pixmap @@ -1084,16 +1084,21 @@ class HtmlTextView(Gtk.TextView): change_cursor = None if __name__ == '__main__': - from conversation_textview import ConversationTextview - import gajim as gaj + from gajim.conversation_textview import ConversationTextview + from gajim.gui_interface import Interface + from gajim.common import app, logger, caps_cache + app.logger = logger.Logger() + caps_cache.initialize(app.logger) - log = logging.getLogger() - gaj.Interface() + Interface() # create fake app.plugin_manager.gui_extension_point method for tests + def extension_point(*args): + pass def gui_extension_point(*args): pass - app.plugin_manager = gaj.Interface() + app.plugin_manager = Interface() + app.plugin_manager.extension_point = extension_point app.plugin_manager.gui_extension_point = gui_extension_point htmlview = ConversationTextview(None) @@ -1108,7 +1113,7 @@ if __name__ == '__main__': pointer = w.get_device_position(device) x = pointer[1] y = pointer[2] - tags = htmlview.tv.get_iter_at_location(x, y).get_tags() + tags = htmlview.tv.get_iter_at_location(x, y)[1].get_tags() if change_cursor: w.set_cursor(gtkgui_helpers.get_cursor('XTERM')) change_cursor = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d2eeceb7e1ebb3a60bf6613582f915ab58… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d2eeceb7e1ebb3a60bf6613582f915ab58… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Handle geo:-URIs
by Philipp Hörist 06 Mar '18

06 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3e651b2 by Daniel at 2018-03-06T11:21:09+01:00 Handle geo:-URIs - - - - - a92bca40 by Daniel at 2018-03-06T11:21:09+01:00 Use https for OpenStreetMap URIs built from PEP - - - - - 2 changed files: - gajim/chat_control.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -591,7 +591,7 @@ class ChatControl(ChatControlBase): if 'location' in self.contact.pep: location = self.contact.pep['location']._pep_specific_data if ('lat' in location) and ('lon' in location): - uri = 'http://www.openstreetmap.org/?' + \ + uri = 'https://www.openstreetmap.org/?' + \ 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % {'lat': location['lat'], 'lon': location['lon']} helpers.launch_browser_mailer('url', uri) ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -803,6 +803,17 @@ class ConversationTextview(GObject.GObject): self.on_start_chat_activate(None, jid) else: self.on_start_chat_activate(None, word) + # handle geo:-URIs + elif word[:4] == 'geo:': + location = word[4:] + lat, _, lon = location.partition(',') + if lon == '': + return + uri = 'https://www.openstreetmap.org/?' \ + 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % \ + {'lat': lat, 'lon': lon} + helpers.launch_browser_mailer(kind, uri) + # other URIs else: helpers.launch_browser_mailer(kind, word) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e740d12727032bc4bd382c1a128394cac… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e740d12727032bc4bd382c1a128394cac… 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