Commits May 2018

commits@gajim.org

1 participants
75 discussions

[Git][gajim/gajim][master] Add dedicated zeroconf menu
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2410121d by Philipp Hörist at 2018-05-21T21:18:38+02:00 Add dedicated zeroconf menu - - - - - 3 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -1,24 +1,19 @@ -# -*- coding: utf-8 -*- -## src/app_actions.py -## -## Copyright (C) 2017 Philipp Hörist <philipp AT hoerist.com> -## -## 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 Gtk +# +# Copyright (C) 2017 Philipp Hörist <philipp AT hoerist.com> +# +# 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 gajim.common import app from gajim.common import helpers @@ -36,263 +31,295 @@ from gajim.history_sync import HistorySyncAssistant from gajim.server_info import ServerInfoDialog -class AppActions(): - ''' Action Callbacks ''' - def __init__(self, application: Gtk.Application): - self.application = application - - # General Actions - - def on_add_contact_jid(self, action, param): - dialogs.AddNewContactWindow(None, param.get_string()) - - # Application Menu Actions - - def on_preferences(self, action, param): - if 'preferences' in interface.instances: - interface.instances['preferences'].window.present() - else: - interface.instances['preferences'] = \ - config.PreferencesWindow() - - def on_plugins(self, action, param): - if 'plugins' in interface.instances: - interface.instances['plugins'].window.present() - else: - interface.instances['plugins'] = gajim.plugins.gui.PluginsWindow() - - def on_accounts(self, action, param): - if 'accounts' in app.interface.instances: - app.interface.instances['accounts'].present() - else: - app.interface.instances['accounts'] = accounts_window.AccountsWindow() - - def on_history_manager(self, action, param): - from gajim.history_manager import HistoryManager - HistoryManager() - - def on_manage_bookmarks(self, action, param): - config.ManageBookmarksWindow() - - def on_quit(self, action, param): - interface.roster.on_quit_request() - - def on_new_chat(self, action, param): - if 'start_chat' in app.interface.instances: - app.interface.instances['start_chat'].present() - else: - app.interface.instances['start_chat'] = dialogs.StartChatDialog() - - # Accounts Actions - - def on_profile(self, action, param): - interface.edit_own_details(param.get_string()) - - def on_activate_bookmark(self, action, param): - dict_ = param.unpack() - account, jid, nick, password = \ - dict_['account'], dict_['jid'], None, None - if 'nick' in dict_: - nick = dict_['nick'] - if 'password' in dict_: - password = dict_['password'] - interface.join_gc_room(account, jid, nick, password) - - def on_send_server_message(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/online' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_service_disco(self, action, param): - account = param.get_string() - server_jid = app.config.get_per('accounts', account, 'hostname') - if server_jid in interface.instances[account]['disco']: - interface.instances[account]['disco'][server_jid].\ - window.present() - else: - try: - # Object will add itself to the window dict - disco.ServiceDiscoveryWindow(account, address_entry=True) - except GajimGeneralException: - pass - - def on_join_gc(self, action, param): - account = param.get_string() - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: - app.interface.raise_dialog('join-while-invisible') +# General Actions + +def on_add_contact_jid(action, param): + dialogs.AddNewContactWindow(None, param.get_string()) + +# Application Menu Actions + + +def on_preferences(action, param): + if 'preferences' in interface.instances: + interface.instances['preferences'].window.present() + else: + interface.instances['preferences'] = \ + config.PreferencesWindow() + + +def on_plugins(action, param): + if 'plugins' in interface.instances: + interface.instances['plugins'].window.present() + else: + interface.instances['plugins'] = gajim.plugins.gui.PluginsWindow() + + +def on_accounts(action, param): + if 'accounts' in app.interface.instances: + app.interface.instances['accounts'].present() + else: + app.interface.instances['accounts'] = accounts_window.AccountsWindow() + + +def on_history_manager(action, param): + from gajim.history_manager import HistoryManager + HistoryManager() + + +def on_manage_bookmarks(action, param): + config.ManageBookmarksWindow() + + +def on_quit(action, param): + interface.roster.on_quit_request() + + +def on_new_chat(action, param): + if 'start_chat' in app.interface.instances: + app.interface.instances['start_chat'].present() + else: + app.interface.instances['start_chat'] = dialogs.StartChatDialog() + +# Accounts Actions + + +def on_profile(action, param): + interface.edit_own_details(param.get_string()) + + +def on_activate_bookmark(action, param): + dict_ = param.unpack() + account, jid, nick, password = \ + dict_['account'], dict_['jid'], None, None + if 'nick' in dict_: + nick = dict_['nick'] + if 'password' in dict_: + password = dict_['password'] + interface.join_gc_room(account, jid, nick, password) + + +def on_send_server_message(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/online' + dialogs.SingleMessageWindow(account, server, 'send') + + +def on_service_disco(action, param): + account = param.get_string() + server_jid = app.config.get_per('accounts', account, 'hostname') + if server_jid in interface.instances[account]['disco']: + interface.instances[account]['disco'][server_jid].\ + window.present() + else: + try: + # Object will add itself to the window dict + disco.ServiceDiscoveryWindow(account, address_entry=True) + except GajimGeneralException: + pass + + +def on_join_gc(action, param): + account = param.get_string() + invisible_show = app.SHOW_LIST.index('invisible') + if app.connections[account].connected == invisible_show: + app.interface.raise_dialog('join-while-invisible') + return + if 'join_gc' in interface.instances[account]: + interface.instances[account]['join_gc'].present() + else: + interface.instances[account]['join_gc'] = \ + dialogs.JoinGroupchatWindow(account, None) + + +def on_add_contact(action, param): + dialogs.AddNewContactWindow(param.get_string()) + + +def on_single_message(action, param): + dialogs.SingleMessageWindow(param.get_string(), action='send') + + +def on_merge_accounts(action, param): + action.set_state(param) + value = param.get_boolean() + app.config.set('mergeaccounts', value) + # Do not merge accounts if only one active + if len(app.connections) >= 2: + app.interface.roster.regroup = value + else: + app.interface.roster.regroup = False + app.interface.roster.setup_and_draw_roster() + + +def on_use_pgp_agent(action, param): + action.set_state(param) + app.config.set('use_gpg_agent', param.get_boolean()) + + +def on_add_account(action, param): + if 'account_creation_wizard' in app.interface.instances: + app.interface.instances['account_creation_wizard'].window.present() + else: + app.interface.instances['account_creation_wizard'] = \ + config.AccountCreationWizardWindow() + + +def on_import_contacts(action, param): + account = param.get_string() + if 'import_contacts' in app.interface.instances: + app.interface.instances['import_contacts'].dialog.present() + else: + app.interface.instances['import_contacts'] = \ + dialogs.SynchroniseSelectAccountDialog(account) + +# Advanced Actions + + +def on_archiving_preferences(action, param): + account = param.get_string() + if 'archiving_preferences' in interface.instances[account]: + interface.instances[account]['archiving_preferences'].window.\ + present() + else: + interface.instances[account]['archiving_preferences'] = \ + dialogs.Archiving313PreferencesWindow(account) + + +def on_history_sync(action, param): + account = param.get_string() + if 'history_sync' in interface.instances[account]: + interface.instances[account]['history_sync'].present() + else: + interface.instances[account]['history_sync'] = \ + HistorySyncAssistant(account, interface.roster.window) + + +def on_privacy_lists(action, param): + account = param.get_string() + if 'privacy_lists' in interface.instances[account]: + interface.instances[account]['privacy_lists'].window.present() + else: + interface.instances[account]['privacy_lists'] = \ + dialogs.PrivacyListsWindow(account) + + +def on_server_info(action, param): + account = param.get_string() + if 'server_info' in interface.instances[account]: + interface.instances[account]['server_info'].present() + else: + interface.instances[account]['server_info'] = \ + ServerInfoDialog(account) + + +def on_xml_console(action, param): + account = param.get_string() + if 'xml_console' in interface.instances[account]: + interface.instances[account]['xml_console'].present() + else: + interface.instances[account]['xml_console'] = \ + dialogs.XMLConsoleWindow(account) + + +def on_manage_proxies(action, param): + if 'manage_proxies' in app.interface.instances: + app.interface.instances['manage_proxies'].window.present() + else: + app.interface.instances['manage_proxies'] = \ + config.ManageProxiesWindow(interface.roster.window) + +# Admin Actions + + +def on_set_motd(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/motd' + dialogs.SingleMessageWindow(account, server, 'send') + + +def on_update_motd(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/motd/update' + dialogs.SingleMessageWindow(account, server, 'send') + + +def on_delete_motd(action, param): + account = param.get_string() + server = app.config.get_per('accounts', account, 'hostname') + server += '/announce/motd/delete' + app.connections[account].send_motd(server) + +# Help Actions + + +def on_contents(action, param): + helpers.launch_browser_mailer( + 'url', 'https://dev.gajim.org/gajim/gajim/wikis') + + +def on_faq(action, param): + helpers.launch_browser_mailer( + 'url', 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') + + +def on_keyboard_shortcuts(action, param): + shortcuts_window.show(app.app.get_active_window()) + + +def on_features(action, param): + features_window.FeaturesWindow() + + +def on_about(action, param): + dialogs.AboutDialog() + +# View Actions + + +def on_file_transfers(action, param): + if interface.instances['file_transfers']. \ + window.get_property('visible'): + interface.instances['file_transfers'].window.present() + else: + interface.instances['file_transfers'].window.show_all() + + +def on_history(action, param): + if 'logs' in interface.instances: + interface.instances['logs'].window.present() + else: + interface.instances['logs'] = history_window.\ + HistoryWindow() + + +def on_open_event(action, param): + dict_ = param.unpack() + app.interface.handle_event( + dict_['account'], dict_['jid'], dict_['type_']) + + +# Other Actions + +def toggle_ipython(action, param): + """ + Show/hide the ipython window + """ + win = app.ipython_window + if win and win.window.is_visible(): + win.present() + else: + app.interface.create_ipython_window() + + +def show_next_pending_event(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 - if 'join_gc' in interface.instances[account]: - interface.instances[account]['join_gc'].present() - else: - interface.instances[account]['join_gc'] = \ - dialogs.JoinGroupchatWindow(account, None) - - def on_add_contact(self, action, param): - dialogs.AddNewContactWindow(param.get_string()) - - def on_single_message(self, action, param): - dialogs.SingleMessageWindow(param.get_string(), action='send') - - def on_merge_accounts(self, action, param): - action.set_state(param) - value = param.get_boolean() - app.config.set('mergeaccounts', value) - if len(app.connections) >= 2: # Do not merge accounts if only one active - app.interface.roster.regroup = value - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - - def on_use_pgp_agent(self, action, param): - action.set_state(param) - app.config.set('use_gpg_agent', param.get_boolean()) - - def on_add_account(self, action, param): - if 'account_creation_wizard' in app.interface.instances: - app.interface.instances['account_creation_wizard'].window.present() - else: - app.interface.instances['account_creation_wizard'] = \ - config.AccountCreationWizardWindow() - - def on_import_contacts(self, action, param): - account = param.get_string() - if 'import_contacts' in app.interface.instances: - app.interface.instances['import_contacts'].dialog.present() - else: - app.interface.instances['import_contacts'] = \ - dialogs.SynchroniseSelectAccountDialog(account) - - # Advanced Actions - - def on_archiving_preferences(self, action, param): - account = param.get_string() - if 'archiving_preferences' in interface.instances[account]: - interface.instances[account]['archiving_preferences'].window.\ - present() - else: - interface.instances[account]['archiving_preferences'] = \ - dialogs.Archiving313PreferencesWindow(account) - - def on_history_sync(self, action, param): - account = param.get_string() - if 'history_sync' in interface.instances[account]: - interface.instances[account]['history_sync'].present() - else: - interface.instances[account]['history_sync'] = \ - HistorySyncAssistant(account, interface.roster.window) - - def on_privacy_lists(self, action, param): - account = param.get_string() - if 'privacy_lists' in interface.instances[account]: - interface.instances[account]['privacy_lists'].window.present() - else: - interface.instances[account]['privacy_lists'] = \ - dialogs.PrivacyListsWindow(account) - - def on_server_info(self, action, param): - account = param.get_string() - if 'server_info' in interface.instances[account]: - interface.instances[account]['server_info'].present() - else: - interface.instances[account]['server_info'] = \ - ServerInfoDialog(account) - - def on_xml_console(self, action, param): - account = param.get_string() - if 'xml_console' in interface.instances[account]: - interface.instances[account]['xml_console'].present() - else: - interface.instances[account]['xml_console'] = \ - dialogs.XMLConsoleWindow(account) - - def on_manage_proxies(self, action, param): - if 'manage_proxies' in app.interface.instances: - app.interface.instances['manage_proxies'].window.present() - else: - app.interface.instances['manage_proxies'] = \ - config.ManageProxiesWindow(interface.roster.window) - - # Admin Actions - - def on_set_motd(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_update_motd(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/update' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_delete_motd(self, action, param): - account = param.get_string() - server = app.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/delete' - app.connections[account].send_motd(server) - - # Help Actions - - def on_contents(self, action, param): - helpers.launch_browser_mailer( - 'url', 'https://dev.gajim.org/gajim/gajim/wikis') - - def on_faq(self, action, param): - helpers.launch_browser_mailer( - 'url', 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') - - def on_keyboard_shortcuts(self, action, param): - shortcuts_window.show(self.application.get_active_window()) - - def on_features(self, action, param): - features_window.FeaturesWindow() - - def on_about(self, action, param): - dialogs.AboutDialog() - - # View Actions - - def on_file_transfers(self, action, param): - if interface.instances['file_transfers']. \ - window.get_property('visible'): - interface.instances['file_transfers'].window.present() - else: - interface.instances['file_transfers'].window.show_all() - - def on_history(self, action, param): - if 'logs' in interface.instances: - interface.instances['logs'].window.present() - else: - interface.instances['logs'] = history_window.\ - HistoryWindow() - - def on_open_event(self, action, param): - dict_ = param.unpack() - app.interface.handle_event(dict_['account'], dict_['jid'], - dict_['type_']) - - - # Other Actions - - def toggle_ipython(self, action, param): - """ - Show/hide the ipython window - """ - win = app.ipython_window - if win and win.window.is_visible(): - 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_) + app.interface.handle_event(account, jid, event.type_) ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -284,37 +284,14 @@ class GajimApplication(Gtk.Application): def add_actions(self): ''' Build Application Actions ''' - from gajim.app_actions import AppActions - action = AppActions(self) - - self.account_actions = [ - ('-start-single-chat', action.on_single_message, 'online', 's'), - ('-join-groupchat', action.on_join_gc, 'online', 's'), - ('-add-contact', action.on_add_contact, 'online', 's'), - ('-services', action.on_service_disco, 'online', 's'), - ('-profile', action.on_profile, 'feature', 's'), - ('-xml-console', action.on_xml_console, 'always', 's'), - ('-server-info', action.on_server_info, 'online', 's'), - ('-archive', action.on_archiving_preferences, 'feature', 's'), - ('-sync-history', action.on_history_sync, 'online', 's'), - ('-privacylists', action.on_privacy_lists, 'feature', 's'), - ('-send-server-message', - action.on_send_server_message, 'online', 's'), - ('-set-motd', action.on_set_motd, 'online', 's'), - ('-update-motd', action.on_update_motd, 'online', 's'), - ('-delete-motd', action.on_delete_motd, 'online', 's'), - ('-activate-bookmark', - action.on_activate_bookmark, 'online', 'a{sv}'), - ('-open-event', action.on_open_event, 'always', 'a{sv}'), - ('-import-contacts', action.on_import_contacts, 'online', 's'), - ] + from gajim import app_actions # General Stateful Actions act = Gio.SimpleAction.new_stateful( 'merge', None, GLib.Variant.new_boolean(app.config.get('mergeaccounts'))) - act.connect('change-state', action.on_merge_accounts) + act.connect('change-state', app_actions.on_merge_accounts) self.add_action(act) act = Gio.SimpleAction.new_stateful( @@ -324,40 +301,38 @@ class GajimApplication(Gtk.Application): # General Actions - self.general_actions = [ - ('quit', action.on_quit), - ('accounts', action.on_accounts), - ('add-account', action.on_add_account), - ('manage-proxies', action.on_manage_proxies), - ('start-chat', action.on_new_chat), - ('bookmarks', action.on_manage_bookmarks), - ('history-manager', action.on_history_manager), - ('preferences', action.on_preferences), - ('plugins', action.on_plugins), - ('file-transfer', action.on_file_transfers), - ('history', action.on_history), - ('shortcuts', action.on_keyboard_shortcuts), - ('features', action.on_features), - ('content', action.on_contents), - ('about', action.on_about), - ('faq', action.on_faq), - ('ipython', action.toggle_ipython), - ('show-next-pending-event', action.show_next_pending_event), + general_actions = [ + ('quit', app_actions.on_quit), + ('accounts', app_actions.on_accounts), + ('add-account', app_actions.on_add_account), + ('manage-proxies', app_actions.on_manage_proxies), + ('start-chat', app_actions.on_new_chat), + ('bookmarks', app_actions.on_manage_bookmarks), + ('history-manager', app_actions.on_history_manager), + ('preferences', app_actions.on_preferences), + ('plugins', app_actions.on_plugins), + ('file-transfer', app_actions.on_file_transfers), + ('history', app_actions.on_history), + ('shortcuts', app_actions.on_keyboard_shortcuts), + ('features', app_actions.on_features), + ('content', app_actions.on_contents), + ('about', app_actions.on_about), + ('faq', app_actions.on_faq), + ('ipython', app_actions.toggle_ipython), + ('show-next-pending-event', app_actions.show_next_pending_event), ] act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) - act.connect("activate", action.on_add_contact_jid) + act.connect("activate", app_actions.on_add_contact_jid) self.add_action(act) - for action in self.general_actions: + for action in general_actions: action_name, func = action act = Gio.SimpleAction.new(action_name, None) act.connect("activate", func) self.add_action(act) accounts_list = sorted(app.config.get_per('accounts')) - if 'Local' in accounts_list: - accounts_list.remove('Local') if not accounts_list: return if len(accounts_list) > 1: @@ -366,10 +341,38 @@ class GajimApplication(Gtk.Application): else: self.add_account_actions(accounts_list[0]) - def add_account_actions(self, account): + def _get_account_actions(self, account): + from gajim import app_actions + if account == 'Local': - return - for action in self.account_actions: + return [ + ('-xml-console', app_actions.on_xml_console, 'always', 's') + ] + + return [ + ('-start-single-chat', app_actions.on_single_message, 'online', 's'), + ('-join-groupchat', app_actions.on_join_gc, 'online', 's'), + ('-add-contact', app_actions.on_add_contact, 'online', 's'), + ('-services', app_actions.on_service_disco, 'online', 's'), + ('-profile', app_actions.on_profile, 'feature', 's'), + ('-xml-console', app_actions.on_xml_console, 'always', 's'), + ('-server-info', app_actions.on_server_info, 'online', 's'), + ('-archive', app_actions.on_archiving_preferences, 'feature', 's'), + ('-sync-history', app_actions.on_history_sync, 'online', 's'), + ('-privacylists', app_actions.on_privacy_lists, 'feature', 's'), + ('-send-server-message', + app_actions.on_send_server_message, 'online', 's'), + ('-set-motd', app_actions.on_set_motd, 'online', 's'), + ('-update-motd', app_actions.on_update_motd, 'online', 's'), + ('-delete-motd', app_actions.on_delete_motd, 'online', 's'), + ('-activate-bookmark', + app_actions.on_activate_bookmark, 'online', 'a{sv}'), + ('-open-event', app_actions.on_open_event, 'always', 'a{sv}'), + ('-import-contacts', app_actions.on_import_contacts, 'online', 's'), + ] + + def add_account_actions(self, account): + for action in self._get_account_actions(account): action_name, func, state, type_ = action action_name = account + action_name if self.lookup_action(action_name): @@ -383,14 +386,12 @@ class GajimApplication(Gtk.Application): self.add_action(act) def remove_account_actions(self, account): - for action in self.account_actions: + for action in self._get_account_actions(account): action_name = account + action[0] self.remove_action(action_name) def set_account_actions_state(self, account, new_state=False): - if account == 'Local': - return - for action in self.account_actions: + for action in self._get_account_actions(account): action_name, _, state, _ = action if not new_state and state in ('online', 'feature'): # We go offline ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -727,25 +727,29 @@ def get_account_menu(account): sub menu: list ''' account_menu = [ - ('-add-contact', _('Add Contact…')), - ('-join-groupchat', _('Join Group Chat')), - ('-profile', _('Profile')), - ('-services', _('Discover Services')), - ('-start-single-chat', _('Send Single Message…')), - (_('Advanced'), [ - ('-archive', _('Archiving Preferences')), - ('-sync-history', _('Synchronise History')), - ('-privacylists', _('Privacy Lists')), - ('-server-info', _('Server Info')), - ('-xml-console', _('XML Console')) - ]), - (_('Admin'), [ - ('-send-server-message', _('Send Server Message…')), - ('-set-motd', _('Set MOTD…')), - ('-update-motd', _('Update MOTD…')), - ('-delete-motd', _('Delete MOTD…')) - ]), - ] + ('-add-contact', _('Add Contact…')), + ('-join-groupchat', _('Join Group Chat')), + ('-profile', _('Profile')), + ('-services', _('Discover Services')), + ('-start-single-chat', _('Send Single Message…')), + (_('Advanced'), [ + ('-archive', _('Archiving Preferences')), + ('-sync-history', _('Synchronise History')), + ('-privacylists', _('Privacy Lists')), + ('-server-info', _('Server Info')), + ('-xml-console', _('XML Console')) + ]), + (_('Admin'), [ + ('-send-server-message', _('Send Server Message…')), + ('-set-motd', _('Set MOTD…')), + ('-update-motd', _('Update MOTD…')), + ('-delete-motd', _('Delete MOTD…')) + ]), + ] + + zeroconf_menu = [ + ('-xml-console', _('XML Console')), + ] def build_menu(preset): menu = Gio.Menu() @@ -769,6 +773,8 @@ def get_account_menu(account): menu.append_submenu(label, submenu) return menu + if account == 'Local': + return build_menu(zeroconf_menu) return build_menu(account_menu) @@ -781,7 +787,7 @@ def build_accounts_menu(): acc_menu = menubar.get_item_link(menu_position, 'submenu') acc_menu.remove_all() - accounts_list = sorted(app.contacts.get_accounts(zeroconf=False)) + accounts_list = sorted(app.contacts.get_accounts()) if not accounts_list: no_accounts = _('No Accounts available') acc_menu.append_item(Gio.MenuItem.new(no_accounts, None)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2410121ddb703245cd1c967087749567f2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2410121ddb703245cd1c967087749567f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise version in desktop.in
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 828ae5bb by Philipp Hörist at 2018-05-21T19:27:38+02:00 Raise version in desktop.in - - - - - 1 changed file: - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== --- a/data/org.gajim.Gajim.desktop.in +++ b/data/org.gajim.Gajim.desktop.in @@ -5,7 +5,7 @@ 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 +Version=1.0.3 Exec=gajim %u #Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828ae5bb42e08e9b5911caad15f0e40ab5… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/828ae5bb42e08e9b5911caad15f0e40ab5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Detect if we run as flatpak
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b3162f40 by Philipp Hörist at 2018-05-21T19:17:47+02:00 Detect if we run as flatpak Fixes #9110 - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -157,7 +157,7 @@ _dependencies = { 'GSPELL': False, 'IDLE': False, 'RUN_AS_FLATPAK': False, - } +} def is_installed(dependency): @@ -296,6 +296,10 @@ def detect_dependencies(): except (ImportError, ValueError): pass + # RUN AS FLATPAK + if os.path.exists('/app/share/run-as-flatpak'): + _dependencies['RUN_AS_FLATPAK'] = True + # Print results for dep, val in _dependencies.items(): log('gajim').info('%-13s %s', dep, val) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3162f400c1777bfaf812fe0492258f7dc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3162f400c1777bfaf812fe0492258f7dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix first start with no accounts
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59cfddc3 by Philipp Hörist at 2018-05-21T18:57:18+02:00 Fix first start with no accounts - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -356,10 +356,10 @@ class GajimApplication(Gtk.Application): self.add_action(act) accounts_list = sorted(app.config.get_per('accounts')) - if not accounts_list: - return if 'Local' in accounts_list: accounts_list.remove('Local') + if not accounts_list: + return if len(accounts_list) > 1: for acc in accounts_list: self.add_account_actions(acc) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59cfddc3ca501726384f63d638a58d145b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59cfddc3ca501726384f63d638a58d145b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont get current version from config
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 714d70cb by Philipp Hörist at 2018-05-21T18:49:06+02:00 Dont get current version from config - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -37,6 +37,7 @@ from collections import namedtuple import nbxmpp +import gajim from gajim.common import config as c_config from gajim.common import configpaths from gajim.common import ged as ged_module @@ -46,7 +47,7 @@ from gajim.common.events import Events interface = None # The actual interface (the gtk one for the moment) thread_interface = lambda *args: None # Interface to run a thread and then a callback config = c_config.Config() -version = config.get('version') +version = gajim.__version__ connections = {} # 'account name': 'account (connection.Connection) instance' avatar_cache = {} ipython_window = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/714d70cb233f6ffd30804142e622a8d769… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/714d70cb233f6ffd30804142e622a8d769… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix log message
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ea721fb by Philipp Hörist at 2018-05-21T18:38:47+02:00 Fix log message Presence without vcard hash is not invalid - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -2250,7 +2250,8 @@ class RoomAvatarReceivedEvent(nec.NetworkIncomingEvent): def generate(self): vcard = self.stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) if vcard is None: - log.warning('Invalid room self presence:\n%s', self.stanza) + app.log('avatar').info( + '%s has no avatar published (vCard)', self.jid) return self.avatar_sha = vcard.getTagData('photo') return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ea721fbf1406b9f5cb10758453ac9f826… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ea721fbf1406b9f5cb10758453ac9f826… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont show encryption methods if not supported
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 764b2753 by Philipp Hörist at 2018-05-21T18:09:44+02:00 Dont show encryption methods if not supported - - - - - 2 changed files: - gajim/chat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -218,7 +218,8 @@ class ChatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( - gui_menu_builder.get_encryption_menu(self.control_id, self.type_id)) + gui_menu_builder.get_encryption_menu( + self.control_id, self.type_id, self.account == 'Local')) self.set_encryption_menu_icon() # restore previous conversation self.restore_conversation() ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -827,7 +827,7 @@ def build_bookmark_menu(account): menu.insert_submenu(1, label, bookmark_menu) -def get_encryption_menu(control_id, type_id): +def get_encryption_menu(control_id, type_id, zeroconf=False): menu = Gio.Menu() menu.append( 'Disabled', 'win.set-encryption-{}::{}'.format(control_id, 'disabled')) @@ -838,6 +838,9 @@ def get_encryption_menu(control_id, type_id): if type_id == 'pm': if not hasattr(plugin, 'allow_privatchat'): continue + if zeroconf: + if not hasattr(plugin, 'allow_zeroconf'): + continue menu_action = 'win.set-encryption-{}::{}'.format( control_id, name) menu.append(name, menu_action) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/764b2753948a23bc777c05265d52f95480… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/764b2753948a23bc777c05265d52f95480… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move module calls into init
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7040ea6b by Philipp Hörist at 2018-05-21T02:39:29+02:00 Move module calls into init On Linux ctypes has not attr windll, move it into the __init__() so it does not get evaluatet on module import - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -145,14 +145,13 @@ class XssIdleMonitor: class WindowsIdleMonitor: - - OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop - CloseDesktop = ctypes.windll.user32.CloseDesktop - SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW - GetTickCount = ctypes.windll.kernel32.GetTickCount - GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo - def __init__(self): + self.OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop + self.CloseDesktop = ctypes.windll.user32.CloseDesktop + self.SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW + self.GetTickCount = ctypes.windll.kernel32.GetTickCount + self.GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + class LASTINPUTINFO(ctypes.Structure): _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7040ea6b2ea7cbee1cab8d58a61185b268… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7040ea6b2ea7cbee1cab8d58a61185b268… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor idle module
by Philipp Hörist 21 May '18

21 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5df74c5 by Philipp Hörist at 2018-05-21T02:32:33+02:00 Refactor idle module - Get rid of sleepy.py, handle everything in idle.py - Introduce one Monitor class that handles everything - - - - - 10 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/const.py - gajim/common/idle.py - − gajim/common/sleepy.py - gajim/config.py - gajim/features_window.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -276,8 +276,8 @@ def detect_dependencies(): # IDLE try: - from gajim.common import sleepy - if sleepy.SUPPORTED: + from gajim.common import idle + if idle.Monitor.is_available(): _dependencies['IDLE'] = True except Exception: pass ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -61,6 +61,7 @@ from gajim.common import app from gajim.common import gpg from gajim.common import passwords from gajim.common import i18n +from gajim.common import idle from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -596,7 +597,7 @@ class CommonConnection: idle_time = None if auto: if app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = int(app.interface.sleeper.getIdleSec()) + idle_sec = idle.Monitor.get_idle_sec() idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) app.nec.push_incoming_event(BeforeChangeShowEvent(None, @@ -2025,8 +2026,8 @@ class Connection(CommonConnection, ConnectionHandlers): if signed: p.setTag(nbxmpp.NS_SIGNED + ' x').setData(signed) if idle_time: - idle = p.setTag('idle', namespace=nbxmpp.NS_IDLE) - idle.setAttr('since', idle_time) + idle_node = p.setTag('idle', namespace=nbxmpp.NS_IDLE) + idle_node.setAttr('since', idle_time) if self.connection: self.connection.send(p) self.priority = priority @@ -2761,11 +2762,11 @@ class Connection(CommonConnection, ConnectionHandlers): self.add_lang(p) if auto: if app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = int(app.interface.sleeper.getIdleSec()) + idle_sec = idle.Monitor.get_idle_sec() idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) - idle = p.setTag('idle', namespace=nbxmpp.NS_IDLE) - idle.setAttr('since', idle_time) + idle_node = p.setTag('idle', namespace=nbxmpp.NS_IDLE) + idle_node.setAttr('since', idle_time) # send instantly so when we go offline, status is sent to gc before we # disconnect from jabber server self.connection.send(p) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -48,6 +48,7 @@ from gajim.common import app from gajim.common import dataforms from gajim.common import jingle_xtls from gajim.common import configpaths +from gajim.common import idle from gajim.common.caps_cache import muc_caps_cache from gajim.common.commands import ConnectionCommands from gajim.common.pubsub import ConnectionPubSub @@ -1730,7 +1731,7 @@ ConnectionHTTPUpload): 'send_idle_time'): iq_obj = obj.stanza.buildReply('result') qp = iq_obj.setQuery() - qp.attrs['seconds'] = int(app.interface.sleeper.getIdleSec()) + qp.attrs['seconds'] = idle.Monitor.get_idle_sec() else: iq_obj = obj.stanza.buildReply('error') err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -106,6 +106,12 @@ class JIDConstant(IntEnum): NORMAL_TYPE = 0 ROOM_TYPE = 1 +@unique +class IdleState(IntEnum): + UNKNOWN = 0 + XA = 1 + AWAY = 2 + AWAKE = 3 SSLError = { 2: _("Unable to get issuer certificate"), ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -1,30 +1,35 @@ -## src/common/idle.py -## -## (C) 2008 Thorsten P. 'dGhvcnN0ZW5wIEFUIHltYWlsIGNvbQ==\n'.decode("base64") -## -## 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/>. +# +# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> +# Copyright (C) 2008 Mateusz Biliński <mateusz AT bilinski.it> +# Copyright (C) 2008 Thorsten P. 'dGhvcnN0ZW5wIEFUIHltYWlsIGNvbQ==\n'.decode("base64") +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# 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/>. +import sys import ctypes import ctypes.util import logging from gi.repository import Gio from gi.repository import GLib -log = logging.getLogger('gajim.c.idle') +from gajim.common.const import IdleState -idle_monitor = None +log = logging.getLogger('gajim.c.idle') class DBusGnomeIdleMonitor: @@ -52,38 +57,41 @@ class DBusGnomeIdleMonitor: def _get_idle_sec_fail(self): (idle_time,) = self.dbus_gnome_proxy.call_sync( - 'GetIdletime', - None, - Gio.DBusCallFlags.NO_AUTO_START, - -1, - None - ) + 'GetIdletime', + None, + Gio.DBusCallFlags.NO_AUTO_START, + -1, + None + ) return int(idle_time / 1000) def get_idle_sec(self): try: self.last_idle_time = self._get_idle_sec_fail() - except GLib.Error as e: + except GLib.Error as error: log.warning( 'org.gnome.Mutter.IdleMonitor.GetIdletime() failed: %s', - repr(e)) + error) return self.last_idle_time - -class XScreenSaverInfo(ctypes.Structure): - _fields_ = [ - ('window', ctypes.c_ulong), - ('state', ctypes.c_int), - ('kind', ctypes.c_int), - ('til_or_since', ctypes.c_ulong), - ('idle', ctypes.c_ulong), - ('eventMask', ctypes.c_ulong) - ] + def is_extended_away(self): + return False class XssIdleMonitor: def __init__(self): + + class XScreenSaverInfo(ctypes.Structure): + _fields_ = [ + ('window', ctypes.c_ulong), + ('state', ctypes.c_int), + ('kind', ctypes.c_int), + ('til_or_since', ctypes.c_ulong), + ('idle', ctypes.c_ulong), + ('eventMask', ctypes.c_ulong) + ] + XScreenSaverInfo_p = ctypes.POINTER(XScreenSaverInfo) display_p = ctypes.c_void_p @@ -91,7 +99,7 @@ class XssIdleMonitor: c_int_p = ctypes.POINTER(ctypes.c_int) libX11path = ctypes.util.find_library('X11') - if libX11path == None: + if libX11path is None: raise OSError('libX11 could not be found.') libX11 = ctypes.cdll.LoadLibrary(libX11path) libX11.XOpenDisplay.restype = display_p @@ -100,60 +108,151 @@ class XssIdleMonitor: libX11.XDefaultRootWindow.argtypes = display_p, libXsspath = ctypes.util.find_library('Xss') - if libXsspath == None: + if libXsspath is None: raise OSError('libXss could not be found.') self.libXss = ctypes.cdll.LoadLibrary(libXsspath) self.libXss.XScreenSaverQueryExtension.argtypes = display_p, c_int_p, c_int_p self.libXss.XScreenSaverAllocInfo.restype = XScreenSaverInfo_p - self.libXss.XScreenSaverQueryInfo.argtypes = (display_p, xid, XScreenSaverInfo_p) + self.libXss.XScreenSaverQueryInfo.argtypes = ( + display_p, xid, XScreenSaverInfo_p) self.dpy_p = libX11.XOpenDisplay(None) - if self.dpy_p == None: + if self.dpy_p is None: raise OSError('Could not open X Display.') _event_basep = ctypes.c_int() _error_basep = ctypes.c_int() - if self.libXss.XScreenSaverQueryExtension(self.dpy_p, ctypes.byref(_event_basep), - ctypes.byref(_error_basep)) == 0: + extension = self.libXss.XScreenSaverQueryExtension( + self.dpy_p, ctypes.byref(_event_basep), ctypes.byref(_error_basep)) + if extension == 0: raise OSError('XScreenSaver Extension not available on display.') self.xss_info_p = self.libXss.XScreenSaverAllocInfo() - if self.xss_info_p == None: + if self.xss_info_p is None: raise OSError('XScreenSaverAllocInfo: Out of Memory.') self.rootwindow = libX11.XDefaultRootWindow(self.dpy_p) def get_idle_sec(self): - if self.libXss.XScreenSaverQueryInfo( - self.dpy_p, - self.rootwindow, - self.xss_info_p) == 0: - return 0 + info = self.libXss.XScreenSaverQueryInfo( + self.dpy_p, self.rootwindow, self.xss_info_p) + if info == 0: + return info + return int(self.xss_info_p.contents.idle / 1000) + + def is_extended_away(self): + return False + + +class WindowsIdleMonitor: + + OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop + CloseDesktop = ctypes.windll.user32.CloseDesktop + SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW + GetTickCount = ctypes.windll.kernel32.GetTickCount + GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + + def __init__(self): + class LASTINPUTINFO(ctypes.Structure): + _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] + + self.lastInputInfo = LASTINPUTINFO() + self.lastInputInfo.cbSize = ctypes.sizeof(self.lastInputInfo) + + def get_idle_sec(self): + self.GetLastInputInfo(ctypes.byref(self.lastInputInfo)) + return float(self.GetTickCount() - self.lastInputInfo.dwTime) / 1000 + + def is_extended_away(self): + # Check if Screen Saver is running + # 0x72 is SPI_GETSCREENSAVERRUNNING + saver_runing = ctypes.c_int(0) + info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) + if info and saver_runing.value: + return True + + # Check if Screen is locked + desk = self.OpenInputDesktop(0, False, 0) + if not desk: + return True + self.CloseDesktop(desk) + + return False + + +class IdleMonitor: + def __init__(self): + self.set_interval() + self._state = IdleState.AWAKE + self._idle_monitor = self._get_idle_monitor() + + def set_interval(self, away_interval=60, xa_interval=120): + log.info('Set interval: away: %s, xa: %s', + away_interval, xa_interval) + self._away_interval = away_interval + self._xa_interval = xa_interval + + def is_available(self): + return self._idle_monitor is not None + + def state(self): + if not self.is_available(): + return IdleState.UNKNOWN + return self._state + + def is_xa(self): + return self.state == IdleState.XA + + def is_away(self): + return self.state == IdleState.AWAY + + def is_awake(self): + return self.state == IdleState.AWAKE + + def is_unknown(self): + return self.state == IdleState.UNKNOWN + + def _get_idle_monitor(self): + if sys.platform == 'win32': + return WindowsIdleMonitor() + + try: + return DBusGnomeIdleMonitor() + except GLib.Error as error: + log.info('Idle time via D-Bus not available: %s', error) + + try: + return XssIdleMonitor() + except OSError as error: + log.info('Idle time via XScreenSaverInfo ' + 'not available: %s', error) + + def get_idle_sec(self): + return self._idle_monitor.get_idle_sec() + + def poll(self): + """ + Check to see if we should change state + """ + if not self.is_available(): + return False + + if self._idle_monitor.is_extended_away(): + log.info('Extended Away: Screensaver or Locked Screen') + self._state = IdleState.XA + return True + + idle_time = self.get_idle_sec() + log.info('Idle time: %s', idle_time) + + # xa is stronger than away so check for xa first + if idle_time > self._xa_interval: + self._state = IdleState.XA + elif idle_time > self._away_interval: + self._state = IdleState.AWAY else: - return int(self.xss_info_p.contents.idle / 1000) - - -def getIdleSec(): - """ - Return the idle time in seconds - """ - if idle_monitor is None: - return 0 - else: - return idle_monitor.get_idle_sec() - -try: - idle_monitor = DBusGnomeIdleMonitor() -except GLib.Error as e: - log.info("Idle time via D-Bus not available: %s", repr(e)) - - try: - idle_monitor = XssIdleMonitor() - except OSError as e: - log.info("Idle time via XScreenSaverInfo not available: %s", repr(e)) - raise Exception('No supported idle monitor found') - -if __name__ == '__main__': - import time - time.sleep(2.1) - print(getIdleSec()) + self._state = IdleState.AWAKE + return True + + +Monitor = IdleMonitor() ===================================== gajim/common/sleepy.py deleted ===================================== --- a/gajim/common/sleepy.py +++ /dev/null @@ -1,147 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/sleepy.py -## -## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Mateusz Biliński <mateusz AT bilinski.it> -## -## 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 gajim.common import app -import os -import logging - -log = logging.getLogger('gajim.c.sleepy') - - -STATE_UNKNOWN = 'OS probably not supported' -STATE_XA = 'extended away' -STATE_AWAY = 'away' -STATE_AWAKE = 'awake' - -SUPPORTED = True -try: - if os.name == 'nt': - import ctypes - - GetTickCount = ctypes.windll.kernel32.GetTickCount - GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo - - class LASTINPUTINFO(ctypes.Structure): - _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] - - lastInputInfo = LASTINPUTINFO() - lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo) - - # one or more of these may not be supported before XP. - OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop - CloseDesktop = ctypes.windll.user32.CloseDesktop - SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW - else: # unix - from gajim.common import idle -except Exception: - log.warning('Unable to load idle module') - SUPPORTED = False - -class SleepyWindows: - def __init__(self, away_interval = 60, xa_interval = 120): - self.away_interval = away_interval - self.xa_interval = xa_interval - self.state = STATE_AWAKE # assume we are awake - - def getIdleSec(self): - GetLastInputInfo(ctypes.byref(lastInputInfo)) - idleDelta = float(GetTickCount() - lastInputInfo.dwTime) / 1000 - return idleDelta - - def poll(self): - """ - Check to see if we should change state - """ - if not SUPPORTED: - return False - - # screen saver, in windows >= XP - saver_runing = ctypes.c_int(0) - # 0x72 is SPI_GETSCREENSAVERRUNNING - if SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) and \ - saver_runing.value: - self.state = STATE_XA - return True - - desk = OpenInputDesktop(0, False, 0) - if not desk: - # Screen locked - self.state = STATE_XA - return True - CloseDesktop(desk) - - idleTime = self.getIdleSec() - - # xa is stronger than away so check for xa first - if idleTime > self.xa_interval: - self.state = STATE_XA - elif idleTime > self.away_interval: - self.state = STATE_AWAY - else: - self.state = STATE_AWAKE - return True - - def getState(self): - return self.state - - def setState(self, val): - self.state = val - -class SleepyUnix: - def __init__(self, away_interval = 60, xa_interval = 120): - global SUPPORTED - self.away_interval = away_interval - self.xa_interval = xa_interval - self.state = STATE_AWAKE # assume we are awake - - def getIdleSec(self): - return idle.getIdleSec() - - def poll(self): - """ - Check to see if we should change state - """ - if not SUPPORTED: - return False - - idleTime = self.getIdleSec() - - # xa is stronger than away so check for xa first - if idleTime > self.xa_interval: - self.state = STATE_XA - elif idleTime > self.away_interval: - self.state = STATE_AWAY - else: - self.state = STATE_AWAKE - return True - - def getState(self): - return self.state - - def setState(self, val): - self.state = val - -if os.name == 'nt': - Sleepy = SleepyWindows -else: - Sleepy = SleepyUnix ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -40,7 +40,7 @@ from gi.repository import GObject from gi.repository import GLib from gajim.common import config as c_config -from gajim.common import sleepy +from gajim.common import idle from gajim.common.i18n import Q_ from gajim import gtkgui_helpers @@ -353,7 +353,7 @@ class PreferencesWindow: self.auto_xa_message_entry.set_text(st) self.auto_xa_message_entry.set_sensitive(app.config.get('autoxa')) - if not sleepy.SUPPORTED: + if not idle.Monitor.is_available(): self.xml.get_object('autoaway_table').set_sensitive(False) # ask_status when online / offline @@ -925,9 +925,8 @@ class PreferencesWindow: def on_auto_away_time_spinbutton_value_changed(self, widget): aat = widget.get_value_as_int() app.config.set('autoawaytime', aat) - app.interface.sleeper = sleepy.Sleepy( - app.config.get('autoawaytime') * 60, - app.config.get('autoxatime') * 60) + idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, + app.config.get('autoxatime') * 60) def on_auto_away_message_entry_changed(self, widget): app.config.set('autoaway_message', widget.get_text()) @@ -939,9 +938,8 @@ class PreferencesWindow: def on_auto_xa_time_spinbutton_value_changed(self, widget): axt = widget.get_value_as_int() app.config.set('autoxatime', axt) - app.interface.sleeper = sleepy.Sleepy( - app.config.get('autoawaytime') * 60, - app.config.get('autoxatime') * 60) + idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, + app.config.get('autoxatime') * 60) def on_auto_xa_message_entry_changed(self, widget): app.config.set('autoxa_message', widget.get_text()) ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -163,8 +163,8 @@ class FeaturesWindow: return app.is_installed('GSPELL') def idle_available(self): - from gajim.common import sleepy - return sleepy.SUPPORTED + from gajim.common import idle + return idle.Monitor.is_available() def pycrypto_available(self): return app.is_installed('PYCRYPTO') @@ -181,4 +181,3 @@ class FeaturesWindow: def gupnp_igd_available(self): return app.is_installed('UPNP') - ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -79,7 +79,7 @@ from gajim.filetransfers_window import FileTransfersWindow from gajim.atom_window import AtomWindow from gajim.session import ChatControlSession -from gajim.common import sleepy +from gajim.common import idle from nbxmpp import idlequeue from nbxmpp import Hashes2 @@ -1114,13 +1114,13 @@ class Interface: app.logger.insert_jid(obj.conn.get_own_jid().getStripped()) account = obj.conn.name app.block_signed_in_notifications[account] = True - state = self.sleeper.getState() connected = obj.conn.connected - if state != sleepy.STATE_UNKNOWN and connected in (2, 3): + + if idle.Monitor.is_unknown() and connected in (2, 3): # we go online or free for chat, so we activate auto status app.sleeper_state[account] = 'online' - elif not ((state == sleepy.STATE_AWAY and connected == 4) or \ - (state == sleepy.STATE_XA and connected == 5)): + elif not ((idle.Monitor.is_away() and connected == 4) or \ + (idle.Monitor.is_xa() and connected == 5)): # If we are autoaway/xa and come back after a disconnection, do # nothing # Else disable autoaway @@ -2239,15 +2239,15 @@ class Interface: """ Check idle status and change that status if needed """ - if not self.sleeper.poll(): + if not idle.Monitor.poll(): # idle detection is not supported in that OS return False # stop looping in vain - state = self.sleeper.getState() + for account in app.connections: if account not in app.sleeper_state or \ not app.sleeper_state[account]: continue - if state == sleepy.STATE_AWAKE: + if idle.Monitor.is_awake(): if app.sleeper_state[account] in ('autoaway', 'autoxa'): # we go online self.roster.send_status(account, 'online', @@ -2261,7 +2261,7 @@ class Interface: app.status_before_autoaway[account]) app.status_before_autoaway[account] = '' app.sleeper_state[account] = 'off' - elif state == sleepy.STATE_AWAY and app.config.get('autoaway'): + elif idle.Monitor.is_away() and app.config.get('autoaway'): if app.sleeper_state[account] == 'online': # we save out online status app.status_before_autoaway[account] = \ @@ -2288,7 +2288,7 @@ class Interface: self.roster.send_status(account, app.SHOW_LIST[connected], app.status_before_autoaway[account], auto=True) app.sleeper_state[account] = 'idle' - elif state == sleepy.STATE_XA and \ + elif idle.Monitor.is_xa() and \ app.sleeper_state[account] in ('online', 'autoaway', 'autoaway-forced') and app.config.get('autoxa'): # we go extended away [we pass True to auto param] @@ -2913,9 +2913,8 @@ class Interface: self.show_vcard_when_connect = [] - self.sleeper = sleepy.Sleepy( - app.config.get('autoawaytime') * 60, # make minutes to seconds - app.config.get('autoxatime') * 60) + idle.Monitor.set_interval(app.config.get('autoawaytime') * 60, + app.config.get('autoxatime') * 60) gtkgui_helpers.make_jabber_state_images() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -46,7 +46,6 @@ import locale from enum import IntEnum, unique -from gajim.common import sleepy from gajim import history_window from gajim import dialogs from gajim import vcard @@ -62,6 +61,7 @@ from gajim.common.const import AvatarSize from gajim.common import app from gajim.common import helpers +from gajim.common import idle from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n if app.is_installed('GEOCLUE'): @@ -2125,8 +2125,7 @@ class RosterWindow: def send_status_continue(self, account, status, txt, auto, to): if app.account_is_connected(account) and not to: - if status == 'online' and app.interface.sleeper.getState() != \ - sleepy.STATE_UNKNOWN: + if status == 'online' and not idle.Monitor.is_unknown(): app.sleeper_state[account] = 'online' elif app.sleeper_state[account] not in ('autoaway', 'autoxa') or \ status == 'offline': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c5df74c509427c96071fd4e1a77c57c7c2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c5df74c509427c96071fd4e1a77c57c7c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Support for idle time under GNOME without X11
by Philipp Hörist 20 May '18

20 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e5d966f by Sophie Herold at 2018-05-20T20:45:46+02:00 Support for idle time under GNOME without X11 * Removes use of most global variables * Adds some some logging * Removes unused close() method for Xss - - - - - 2 changed files: - gajim/common/idle.py - gajim/common/sleepy.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -18,6 +18,58 @@ import ctypes import ctypes.util +import logging +from gi.repository import Gio +from gi.repository import GLib + +log = logging.getLogger('gajim.c.idle') + +idle_monitor = None + + +class DBusGnomeIdleMonitor: + + def __init__(self): + self.last_idle_time = 0 + + log.debug('Connecting to D-Bus') + self.dbus_gnome_proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.NONE, + None, + 'org.gnome.Mutter.IdleMonitor', + '/org/gnome/Mutter/IdleMonitor/Core', + 'org.gnome.Mutter.IdleMonitor', + None + ) + log.debug('D-Bus connected') + + # Only the following call will trigger exceptions if the D-Bus + # interface/method/... does not exist. Using the failing method + # for class init to allow other idle monitors to be used on failure. + self._get_idle_sec_fail() + log.debug('D-Bus call test successful') + + def _get_idle_sec_fail(self): + (idle_time,) = self.dbus_gnome_proxy.call_sync( + 'GetIdletime', + None, + Gio.DBusCallFlags.NO_AUTO_START, + -1, + None + ) + return int(idle_time / 1000) + + def get_idle_sec(self): + try: + self.last_idle_time = self._get_idle_sec_fail() + except GLib.Error as e: + log.warning( + 'org.gnome.Mutter.IdleMonitor.GetIdletime() failed: %s', + repr(e)) + + return self.last_idle_time + class XScreenSaverInfo(ctypes.Structure): _fields_ = [ @@ -28,72 +80,80 @@ class XScreenSaverInfo(ctypes.Structure): ('idle', ctypes.c_ulong), ('eventMask', ctypes.c_ulong) ] -XScreenSaverInfo_p = ctypes.POINTER(XScreenSaverInfo) -display_p = ctypes.c_void_p -xid = ctypes.c_ulong -c_int_p = ctypes.POINTER(ctypes.c_int) -try: - libX11path = ctypes.util.find_library('X11') - if libX11path == None: - raise OSError('libX11 could not be found.') - libX11 = ctypes.cdll.LoadLibrary(libX11path) - libX11.XOpenDisplay.restype = display_p - libX11.XOpenDisplay.argtypes = ctypes.c_char_p, - libX11.XDefaultRootWindow.restype = xid - libX11.XDefaultRootWindow.argtypes = display_p, - - libXsspath = ctypes.util.find_library('Xss') - if libXsspath == None: - raise OSError('libXss could not be found.') - libXss = ctypes.cdll.LoadLibrary(libXsspath) - libXss.XScreenSaverQueryExtension.argtypes = display_p, c_int_p, c_int_p - libXss.XScreenSaverAllocInfo.restype = XScreenSaverInfo_p - libXss.XScreenSaverQueryInfo.argtypes = (display_p, xid, XScreenSaverInfo_p) - - dpy_p = libX11.XOpenDisplay(None) - if dpy_p == None: - raise OSError('Could not open X Display.') - - _event_basep = ctypes.c_int() - _error_basep = ctypes.c_int() - if libXss.XScreenSaverQueryExtension(dpy_p, ctypes.byref(_event_basep), - ctypes.byref(_error_basep)) == 0: - raise OSError('XScreenSaver Extension not available on display.') - - xss_info_p = libXss.XScreenSaverAllocInfo() - if xss_info_p == None: - raise OSError('XScreenSaverAllocInfo: Out of Memory.') - - rootwindow = libX11.XDefaultRootWindow(dpy_p) - xss_available = True -except OSError: - # Logging? - xss_available = False +class XssIdleMonitor: + def __init__(self): + XScreenSaverInfo_p = ctypes.POINTER(XScreenSaverInfo) + + display_p = ctypes.c_void_p + xid = ctypes.c_ulong + c_int_p = ctypes.POINTER(ctypes.c_int) + + libX11path = ctypes.util.find_library('X11') + if libX11path == None: + raise OSError('libX11 could not be found.') + libX11 = ctypes.cdll.LoadLibrary(libX11path) + libX11.XOpenDisplay.restype = display_p + libX11.XOpenDisplay.argtypes = ctypes.c_char_p, + libX11.XDefaultRootWindow.restype = xid + libX11.XDefaultRootWindow.argtypes = display_p, + + libXsspath = ctypes.util.find_library('Xss') + if libXsspath == None: + raise OSError('libXss could not be found.') + self.libXss = ctypes.cdll.LoadLibrary(libXsspath) + self.libXss.XScreenSaverQueryExtension.argtypes = display_p, c_int_p, c_int_p + self.libXss.XScreenSaverAllocInfo.restype = XScreenSaverInfo_p + self.libXss.XScreenSaverQueryInfo.argtypes = (display_p, xid, XScreenSaverInfo_p) + + self.dpy_p = libX11.XOpenDisplay(None) + if self.dpy_p == None: + raise OSError('Could not open X Display.') + + _event_basep = ctypes.c_int() + _error_basep = ctypes.c_int() + if self.libXss.XScreenSaverQueryExtension(self.dpy_p, ctypes.byref(_event_basep), + ctypes.byref(_error_basep)) == 0: + raise OSError('XScreenSaver Extension not available on display.') + + self.xss_info_p = self.libXss.XScreenSaverAllocInfo() + if self.xss_info_p == None: + raise OSError('XScreenSaverAllocInfo: Out of Memory.') + + self.rootwindow = libX11.XDefaultRootWindow(self.dpy_p) + + def get_idle_sec(self): + if self.libXss.XScreenSaverQueryInfo( + self.dpy_p, + self.rootwindow, + self.xss_info_p) == 0: + return 0 + else: + return int(self.xss_info_p.contents.idle / 1000) + def getIdleSec(): - global xss_available """ Return the idle time in seconds """ - if not xss_available: - return 0 - if libXss.XScreenSaverQueryInfo(dpy_p, rootwindow, xss_info_p) == 0: + if idle_monitor is None: return 0 else: - return int(xss_info_p.contents.idle) / 1000 + return idle_monitor.get_idle_sec() -def close(): - global xss_available - if xss_available: - libX11.XFree(xss_info_p) - libX11.XCloseDisplay(dpy_p) - xss_available = False +try: + idle_monitor = DBusGnomeIdleMonitor() +except GLib.Error as e: + log.info("Idle time via D-Bus not available: %s", repr(e)) + + try: + idle_monitor = XssIdleMonitor() + except OSError as e: + log.info("Idle time via XScreenSaverInfo not available: %s", repr(e)) + raise Exception('No supported idle monitor found') if __name__ == '__main__': import time time.sleep(2.1) print(getIdleSec()) - close() - print(getIdleSec()) ===================================== gajim/common/sleepy.py ===================================== --- a/gajim/common/sleepy.py +++ b/gajim/common/sleepy.py @@ -53,9 +53,8 @@ try: SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW else: # unix from gajim.common import idle - idle.xss_available except Exception: - log.debug('Unable to load idle module') + log.warning('Unable to load idle module') SUPPORTED = False class SleepyWindows: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e5d966f1d715f20f112dd9370f6ccd13f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e5d966f1d715f20f112dd9370f6ccd13f… 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 May 2018