Commits January 2018

commits@gajim.org

1 participants
59 discussions

[Git][gajim/gajim][master] Raise build timeout
by Philipp Hörist 17 Jan '18

17 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a62517d by Philipp Hörist at 2018-01-17T18:21:26+01:00 Raise build timeout - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ install: - cmd: '%MSYS% C:/msys64/home/appveyor/gajim/win/build.sh' # Ugly workaround, because i found no way to tell when mingw32.exe returns - - cmd: timeout 900 + - cmd: timeout 1100 # Push Installer Exe - ps: $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a62517d9a35eafc5e5494e4e2c46665a8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a62517d9a35eafc5e5494e4e2c46665a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove bogus dbus-python dependency from setup.py.
by Yann Leboulanger 16 Jan '18

16 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 59d58ed8 by Emmanuel Gil Peyrot at 2018-01-16T20:14:35+01:00 Remove bogus dbus-python dependency from setup.py. - - - - - 9de76990 by Yann Leboulanger at 2018-01-16T23:12:37+01:00 Merge branch 'fix-setup.py' into 'master' Remove bogus dbus-python dependency from setup.py. See merge request gajim/gajim!189 - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -274,7 +274,6 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'dbus-python;sys_platform=="linux"', 'nbxmpp>=0.6.1', 'pyOpenSSL>=0.12', 'pyasn1', View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b3a805c58a749aae5917733d7b6d02558… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b3a805c58a749aae5917733d7b6d02558… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Make more strings translatable
by Yann Leboulanger 15 Jan '18

15 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 792be245 by Daniel at 2018-01-15T10:51:04+01:00 Make more strings translatable - - - - - b3a805c5 by Yann Leboulanger at 2018-01-15T11:16:26+01:00 Merge branch 'more-translations' into 'master' Make more strings translatable See merge request gajim/gajim!186 - - - - - 15 changed files: - gajim/accounts_window.py - gajim/data/gui/accounts_window.ui - gajim/data/gui/add_new_contact_window.ui - gajim/data/gui/esession_info_window.ui - gajim/data/gui/filetransfers.ui - gajim/data/gui/join_groupchat_window.ui - gajim/data/gui/roster_item_exchange_window.ui - gajim/data/gui/systray_context_menu.ui - gajim/data/gui/voip_call_received_dialog.ui - gajim/data/gui/xml_console_window.ui - gajim/dialogs.py - gajim/gtkgui_helpers.py - gajim/gui_menu_builder.py - gajim/notify.py - gajim/options_dialog.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -37,11 +37,11 @@ class AccountsWindow(Gtk.ApplicationWindow): self.set_titlebar(self.headerbar) menu = Gio.Menu() - menu.append('Merge Accounts', 'app.merge') - menu.append('Use PGP Agent', 'app.agent') + menu.append(_('Merge Accounts'), 'app.merge') + menu.append(_('Use PGP Agent'), 'app.agent') self.menu_button.set_menu_model(menu) - button = get_image_button('list-add-symbolic', 'Add') + button = get_image_button('list-add-symbolic', _('Add')) button.set_action_name('app.add-account') self.actionbar.pack_start(button) @@ -341,7 +341,7 @@ class Account(Gtk.Box): self.add(self.label) if account != app.ZEROCONF_ACC_NAME: - button = get_image_button('list-remove-symbolic', 'Remove') + button = get_image_button('list-remove-symbolic', _('Remove')) button.connect('clicked', parent.on_remove_account, account) self.add(button) ===================================== gajim/data/gui/accounts_window.ui ===================================== --- a/gajim/data/gui/accounts_window.ui +++ b/gajim/data/gui/accounts_window.ui @@ -75,7 +75,7 @@ <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title">Accounts</property> + <property name="title" translatable="yes">Accounts</property> <property name="show_close_button">True</property> <property name="decoration_layout">:close</property> <child> ===================================== gajim/data/gui/add_new_contact_window.ui ===================================== --- a/gajim/data/gui/add_new_contact_window.ui +++ b/gajim/data/gui/add_new_contact_window.ui @@ -207,7 +207,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="activates_default">True</property> - <property name="placeholder_text">Type User ID</property> + <property name="placeholder_text" translatable="yes">Type User ID</property> </object> <packing> <property name="left_attach">1</property> @@ -220,7 +220,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="activates_default">True</property> - <property name="placeholder_text">Type Nickname</property> + <property name="placeholder_text" translatable="yes">Type Nickname</property> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/data/gui/esession_info_window.ui ===================================== --- a/gajim/data/gui/esession_info_window.ui +++ b/gajim/data/gui/esession_info_window.ui @@ -134,7 +134,7 @@ <object class="GtkLabel" id="info_display"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">(ESession info)</property> + <property name="label" translatable="yes">(ESession info)</property> <property name="use_markup">True</property> <property name="wrap">True</property> </object> ===================================== gajim/data/gui/filetransfers.ui ===================================== --- a/gajim/data/gui/filetransfers.ui +++ b/gajim/data/gui/filetransfers.ui @@ -8,7 +8,7 @@ <child> <object class="GtkMenuItem" id="remove_menuitem"> <property name="can_focus">False</property> - <property name="label">_Remove</property> + <property name="label" translatable="yes">_Remove</property> <property name="use_underline">True</property> <signal name="activate" handler="on_remove_menuitem_activate" swapped="no"/> </object> @@ -171,7 +171,7 @@ </child> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">_Cancel</property> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -196,7 +196,7 @@ </child> <child> <object class="GtkButton" id="close_button"> - <property name="label">_Close</property> + <property name="label" translatable="yes">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -309,7 +309,7 @@ <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title">Join Groupchat</property> + <property name="title" translatable="yes">Join Groupchat</property> <child> <object class="GtkButton"> <property name="label">gtk-cancel</property> ===================================== gajim/data/gui/roster_item_exchange_window.ui ===================================== --- a/gajim/data/gui/roster_item_exchange_window.ui +++ b/gajim/data/gui/roster_item_exchange_window.ui @@ -18,7 +18,7 @@ <object class="GtkLabel" id="type_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">someone(a)somewhere.com would like you to add some contacts in your roster.</property> + <property name="label" translatable="yes">someone(a)somewhere.com would like you to add some contacts in your roster.</property> <property name="use_markup">True</property> <property name="justify">center</property> <property name="selectable">True</property> ===================================== gajim/data/gui/systray_context_menu.ui ===================================== --- a/gajim/data/gui/systray_context_menu.ui +++ b/gajim/data/gui/systray_context_menu.ui @@ -72,7 +72,7 @@ <object class="GtkMenuItem" id="preferences_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">_Preferences</property> + <property name="label" translatable="yes">_Preferences</property> <property name="use_underline">True</property> <signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/> </object> @@ -87,7 +87,7 @@ <object class="GtkMenuItem" id="quit_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">_Quit</property> + <property name="label" translatable="yes">_Quit</property> <property name="use_underline">True</property> <signal name="activate" handler="on_quit_menuitem_activate" swapped="no"/> </object> ===================================== gajim/data/gui/voip_call_received_dialog.ui ===================================== --- a/gajim/data/gui/voip_call_received_dialog.ui +++ b/gajim/data/gui/voip_call_received_dialog.ui @@ -12,7 +12,7 @@ <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> <property name="buttons">yes-no</property> - <property name="text"><big>Incoming call</big></property> + <property name="text" translatable="yes"><big>Incoming call</big></property> <property name="use_markup">True</property> <signal name="close" handler="on_voip_call_received_messagedialog_close" swapped="no"/> <signal name="destroy" handler="on_voip_call_received_messagedialog_destroy" swapped="no"/> ===================================== gajim/data/gui/xml_console_window.ui ===================================== --- a/gajim/data/gui/xml_console_window.ui +++ b/gajim/data/gui/xml_console_window.ui @@ -74,7 +74,7 @@ <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title">XML Console</property> + <property name="title" translatable="yes">XML Console</property> <property name="has_subtitle">False</property> <property name="show_close_button">True</property> <child> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3560,21 +3560,21 @@ class XMLConsoleWindow(Gtk.Window): self.paned.set_position(self.paned.get_property('max-position')) button = gtkgui_helpers.get_image_button( - 'edit-clear-all-symbolic', 'Clear') + 'edit-clear-all-symbolic', _('Clear')) button.connect('clicked', self.on_clear) self.actionbar.pack_start(button) button = gtkgui_helpers.get_image_button( - 'applications-system-symbolic', 'Filter') + 'applications-system-symbolic', _('Filter')) button.connect('clicked', self.on_filter_options) self.actionbar.pack_start(button) button = gtkgui_helpers.get_image_button( - 'document-edit-symbolic', 'XML Input', toggle=True) + 'document-edit-symbolic', _('XML Input'), toggle=True) button.connect('toggled', self.on_input) self.actionbar.pack_start(button) - button = gtkgui_helpers.get_image_button('emblem-ok-symbolic', 'Send') + button = gtkgui_helpers.get_image_button('emblem-ok-symbolic', _('Send')) button.connect('clicked', self.on_send) self.actionbar.pack_end(button) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -121,7 +121,7 @@ def get_image_button(icon_name, tooltip, toggle=False): else: button = Gtk.Button.new_from_icon_name( icon_name, Gtk.IconSize.MENU) - button.set_tooltip_text(_(tooltip)) + button.set_tooltip_text(tooltip) return button def get_gtk_builder(file_name, widget=None): ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -724,14 +724,14 @@ def get_account_menu(account): ('-profile', _('Profile')), ('-services', _('Discover Services')), ('-start-single-chat', _('Send Single Message...')), - ('Advanced', [ + (_('Advanced'), [ ('-archive', _('Archiving Preferences')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), ('-server-info', _('Server Info')), ('-xml-console', _('XML Console')) ]), - ('Admin', [ + (_('Admin'), [ ('-send-server-message', _('Send Server Message...')), ('-set-motd', _('Set MOTD...')), ('-update-motd', _('Update MOTD...')), @@ -787,7 +787,7 @@ def build_accounts_menu(): else: acc_menu = get_account_menu(accounts_list[0]) menubar.remove(menu_position) - menubar.insert_submenu(menu_position, 'Accounts', acc_menu) + menubar.insert_submenu(menu_position, _('Accounts'), acc_menu) def build_bookmark_menu(account): ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -100,7 +100,7 @@ text=None, timeout=-1): 'type_': GLib.Variant('s', type_)} variant_dict = GLib.Variant('a{sv}', dict_) action = 'app.{}-open-event'.format(account) - notification.add_button_with_target('Open', action, variant_dict) + notification.add_button_with_target(_('Open'), action, variant_dict) notification.set_default_action_and_target(action, variant_dict) if event_type in (_('New Message'), _('New Single Message'), _('New Private Message')): ===================================== gajim/options_dialog.py ===================================== --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -389,7 +389,7 @@ class FileChooserOption(GenericOption): button.connect('selection-changed', self.on_select) clear_button = gtkgui_helpers.get_image_button( - 'edit-clear-all-symbolic', 'Clear File') + 'edit-clear-all-symbolic', _('Clear File')) clear_button.connect('clicked', lambda *args: button.unselect_all()) self.option_box.pack_start(button, True, True, 0) self.option_box.pack_start(clear_button, False, False, 0) @@ -471,7 +471,7 @@ class ProxyComboOption(GenericOption): self.combo.set_valign(Gtk.Align.CENTER) button = gtkgui_helpers.get_image_button( - 'preferences-system-symbolic', 'Manage Proxies') + 'preferences-system-symbolic', _('Manage Proxies')) button.set_action_name('app.manage-proxies') button.set_valign(Gtk.Align.CENTER) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a01bbb51110a4a904c5ae01ee4796e4d9… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a01bbb51110a4a904c5ae01ee4796e4d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use setuptools' automatic script creation
by Yann Leboulanger 15 Jan '18

15 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7943120b by André Apitzsch at 2018-01-13T22:50:38+01:00 Use setuptools' automatic script creation - - - - - a01bbb51 by Yann Leboulanger at 2018-01-15T10:02:52+01:00 Merge branch 'script' into 'master' Use setuptools' automatic script creation See merge request gajim/gajim!188 - - - - - 8 changed files: - gajim/gajim.py - gajim/gajim_remote.py - gajim/history_manager.py - launch.py - − scripts/gajim - − scripts/gajim-history-manager - − scripts/gajim-remote - setup.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -437,6 +437,14 @@ class GajimApplication(Gtk.Application): self.lookup_action(account + action_name).set_enabled(True) -if __name__ == '__main__': +def main(): + if sys.platform != 'win32': + if os.geteuid() == 0: + sys.exit("You must not launch gajim as root, it is insecure.") + appli = GajimApplication() appli.run(sys.argv) + + +if __name__ == '__main__': + main() ===================================== gajim/gajim_remote.py ===================================== --- a/gajim/gajim_remote.py +++ b/gajim/gajim_remote.py @@ -27,6 +27,7 @@ # gajim-remote help will show you the D-BUS API of Gajim +import os import sys import locale import urllib @@ -500,5 +501,13 @@ class GajimRemote: raise exceptions.ServiceNotAvailable return None -if __name__ == '__main__': + +def main(): + if os.geteuid() == 0: + sys.exit("You must not launch gajim as root, it is insecure.") + GajimRemote() + + +if __name__ == '__main__': + main() ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -30,7 +30,6 @@ import os import sys -import signal import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk @@ -668,7 +667,15 @@ class HistoryManager: path = self.logs_liststore.get_path(iter_) self.logs_listview.scroll_to_cell(path) -if __name__ == '__main__': - signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application + +def main(): + if sys.platform != 'win32': + if os.geteuid() == 0: + sys.exit("You must not launch gajim as root, it is insecure.") + HistoryManager() Gtk.main() + + +if __name__ == '__main__': + main() ===================================== launch.py ===================================== --- a/launch.py +++ b/launch.py @@ -1,12 +1,4 @@ #!/usr/bin/env python3 -import os -import sys - -if sys.platform != 'win32': - if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") - -import gajim.gajim as g - -g.GajimApplication().run(sys.argv) +from gajim import gajim +gajim.main() ===================================== scripts/gajim deleted ===================================== --- a/scripts/gajim +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 -## -## Copyright (C) 2005 Yann Le Boulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import os -import sys - -if sys.platform != 'win32': - if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") - -import gajim.gajim as g - -g.GajimApplication().run(sys.argv) ===================================== scripts/gajim-history-manager deleted ===================================== --- a/scripts/gajim-history-manager +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python3 -## -## Copyright (C) 2005 Yann Le Boulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import os -import sys - -if sys.platform != 'win32': - if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") - -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk -import gajim.history_manager as g - -g.HistoryManager() -Gtk.main() ===================================== scripts/gajim-remote deleted ===================================== --- a/scripts/gajim-remote +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 -## -## Copyright (C) 2005 Yann Le Boulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import os -import sys - -if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") - -import gajim.gajim_remote as g - -g.GajimRemote() ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -261,10 +261,15 @@ setup( 'test_nogui': test_nogui, 'update_po': update_po, }, - scripts=[ - 'scripts/gajim', - 'scripts/gajim-history-manager', - 'scripts/gajim-remote'], + entry_points={ + 'console_scripts': [ + 'gajim-remote = gajim.gajim_remote:main', + ], + 'gui_scripts': [ + 'gajim = gajim.gajim:main', + 'gajim-history-manager = gajim.history_manager:main', + ] + }, packages=find_packages(exclude=["gajim.dev", "test*"]), package_data={'gajim': package_data}, data_files=data_files, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b84cd5b6cf451584f57ce9e7375d35de6… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b84cd5b6cf451584f57ce9e7375d35de6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove some unused imports
by Yann Leboulanger 15 Jan '18

15 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6f025a1d by André Apitzsch at 2018-01-12T00:21:11+01:00 Remove some unused imports - - - - - b84cd5b6 by Yann Leboulanger at 2018-01-15T09:55:25+01:00 Merge branch 'unusedImports' into 'master' Remove some unused imports See merge request gajim/gajim!187 - - - - - 11 changed files: - gajim/app_actions.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/conversation_textview.py - gajim/dataforms_widget.py - gajim/groupchat_control.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/profile_window.py - gajim/roster_window.py - gajim/vcard.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -18,9 +18,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys -import os - from gi.repository import Gtk from gajim.common import app ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -39,22 +39,18 @@ from gajim import gui_menu_builder from gajim import message_control from gajim import dialogs -from gajim.common import logger from gajim.common import app from gajim.common import helpers -from gajim.common import exceptions from gajim.common import ged from gajim.common import i18n from gajim.common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from gajim.common.contacts import GC_Contact from gajim.common.logger import KindConstant from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC -from nbxmpp.protocol import NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 from nbxmpp.protocol import NS_CHATSTATES from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.exceptions import GajimGeneralException from gajim.common.const import AvatarSize from gajim.command_system.implementation.hosts import ChatCommands ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -27,7 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os import time from gi.repository import Gtk from gi.repository import Gdk ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -31,13 +31,11 @@ from threading import Timer # for smooth scrolling from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib import time import os -from gajim import tooltips from gajim import dialogs import queue import urllib @@ -51,7 +49,6 @@ from gajim.common.fuzzyclock import FuzzyClock from gajim import emoticons from gajim.htmltextview import HtmlTextView -from gajim.common.exceptions import GajimGeneralException NOT_SHOWN = 0 ALREADY_RECEIVED = 1 ===================================== gajim/dataforms_widget.py ===================================== --- a/gajim/dataforms_widget.py +++ b/gajim/dataforms_widget.py @@ -33,7 +33,6 @@ from gi.repository import GLib import base64 from gajim import gtkgui_helpers -from gajim import dialogs from gajim.common import dataforms from gajim.common import helpers ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -27,7 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os import time import locale ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -84,7 +84,7 @@ def get_icon_path(icon_name, size=16): except GLib.GError as e: log.error("Unable to find icon %s: %s" % (icon_name, str(e))) -from gajim import vcard + from gajim import dialogs ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -38,7 +38,6 @@ import os import sys import re import time -import math import hashlib from gi.repository import Gtk ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -27,14 +27,11 @@ from gi.repository import Gdk from gi.repository import GLib from gi.repository import GdkPixbuf import base64 -import os import time import logging -import hashlib from gajim import gtkgui_helpers from gajim import dialogs -from gajim import vcard from gajim.common.const import AvatarSize from gajim.common import app ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -43,7 +43,6 @@ import os import sys import time import locale -import hashlib from enum import IntEnum, unique ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -37,10 +37,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf import base64 import binascii -import time -import locale import os -# import logging from gajim import gtkgui_helpers View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/aa6e9e7084a81d4263e12c378ab1fae6c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/aa6e9e7084a81d4263e12c378ab1fae6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] add missing function (removed in cbc2bae8). Fixes #47
by Yann Leboulanger 11 Jan '18

11 Jan '18

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: c228396b by Yann Leboulanger at 2018-01-11T16:32:27+01:00 add missing function (removed in cbc2bae8). Fixes #47 - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -1400,6 +1400,10 @@ class Hashes(Node): hash_ = hl.hexdigest() return hash_ + def addHash(self, hash_, algo): + self.setAttr('algo', algo) + self.setData(hash_) + class Hashes2(Node): """ Hash elements for various XEPs as defined in XEP-300 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c228396b3c64360dead579df26… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c228396b3c64360dead579df26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] improve string and add comment for translators
by Yann Leboulanger 09 Jan '18

09 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: aa6e9e70 by Yann Leboulanger at 2018-01-09T10:31:50+01:00 improve string and add comment for translators - - - - - 2 changed files: - gajim/dialogs.py - gajim/roster_window.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1487,7 +1487,7 @@ class FileChooserDialog(Gtk.FileChooserDialog): class AspellDictError: def __init__(self, lang): ErrorDialog( - _('Dictionary for lang "%s" not available') % lang, + _('Dictionary for language "%s" not available') % lang, _('You have to install the dictionary "%s" to use spellchecking, ' 'or choose another language by setting the speller_language ' 'option.\n\n' ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -4535,6 +4535,7 @@ class RosterWindow: # c_dest is None if jid_dest doesn't belong to account return menu = Gtk.Menu() + #from and to are the names of contacts item = Gtk.MenuItem.new_with_label(_('Send %(from)s to %(to)s') % { 'from': c_source.get_shown_name(), 'to': c_dest.get_shown_name()}) item.set_use_underline(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aa6e9e7084a81d4263e12c378ab1fae6ce… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aa6e9e7084a81d4263e12c378ab1fae6ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Port screensaver listening to GTK dbus
by Yann Leboulanger 08 Jan '18

08 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: e89e7c31 by André Apitzsch at 2018-01-05T23:33:37+01:00 Port screensaver listening to GTK dbus - - - - - 54146ba6 by Yann Leboulanger at 2018-01-08T15:27:34+01:00 Merge branch 'screensaver' into 'master' Port screensaver listening to GTK dbus Closes #8836 See merge request gajim/gajim!183 - - - - - 2 changed files: - gajim/gui_interface.py - + gajim/screensaver_listener.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -54,10 +54,6 @@ except: from gajim.common import app from gajim.common import events -from gajim.common import dbus_support -if dbus_support.supported: - import dbus - from gajim.music_track_listener import MusicTrackListener if app.HAVE_GEOCLUE: @@ -2828,56 +2824,9 @@ class Interface: from gajim import logind_listener - # Handle gnome screensaver - if dbus_support.supported: - def gnome_screensaver_ActiveChanged_cb(active): - if not active: - for account in app.connections: - if app.account_is_connected(account) and \ - app.sleeper_state[account] == 'autoaway-forced': - # We came back online ofter gnome-screensaver - # autoaway - self.roster.send_status(account, 'online', - app.status_before_autoaway[account]) - app.status_before_autoaway[account] = '' - app.sleeper_state[account] = 'online' - return - if not app.config.get('autoaway'): - # Don't go auto away if user disabled the option - return - for account in app.connections: - if account not in app.sleeper_state or \ - not app.sleeper_state[account]: - continue - if app.sleeper_state[account] == 'online': - if not app.account_is_connected(account): - continue - # we save out online status - app.status_before_autoaway[account] = \ - app.connections[account].status - # we go away (no auto status) [we pass True to auto - # param] - auto_message = app.config.get('autoaway_message') - if not auto_message: - auto_message = app.connections[account].status - else: - auto_message = auto_message.replace('$S', - '%(status)s') - auto_message = auto_message.replace('$T', - '%(time)s') - auto_message = auto_message % { - 'status': app.status_before_autoaway[account], - 'time': app.config.get('autoxatime')} - self.roster.send_status(account, 'away', auto_message, - auto=True) - app.sleeper_state[account] = 'autoaway-forced' - - try: - bus = dbus.SessionBus() - bus.add_signal_receiver(gnome_screensaver_ActiveChanged_cb, - 'ActiveChanged', 'org.gnome.ScreenSaver') - except Exception: - pass + # Handle screensaver + if sys.platform == 'linux': + from gajim import screensaver_listener self.show_vcard_when_connect = [] ===================================== gajim/screensaver_listener.py ===================================== --- /dev/null +++ b/gajim/screensaver_listener.py @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- +## gajim/screensaver_listener.py +## +## Copyright (C) 2018 André Apitzsch <git AT apitzsch.eu> +## +## 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 logging + +from gi.repository import Gio, GLib + +from gajim.common import app + +log = logging.getLogger('gajim.screensaver_listener') + + +def signal_received(connection, sender_name, object_path, + interface_name, signal_name, parameters, *user_data): + '''Signal handler for screensaver active change''' + + log.info('Signal received: %s - %s', interface_name, parameters) + + roster = app.interface.roster + + if not parameters[0]: + for account in app.connections: + if app.account_is_connected(account) and \ + app.sleeper_state[account] == 'autoaway-forced': + # We came back online after screensaver + # autoaway + roster.send_status(account, 'online', + app.status_before_autoaway[account]) + app.status_before_autoaway[account] = '' + app.sleeper_state[account] = 'online' + return + if not app.config.get('autoaway'): + # Don't go auto away if user disabled the option + return + for account in app.connections: + if account not in app.sleeper_state or not app.sleeper_state[account]: + continue + if app.sleeper_state[account] == 'online': + if not app.account_is_connected(account): + continue + # we save our online status + app.status_before_autoaway[account] = \ + app.connections[account].status + # we go away (no auto status) [we pass True to auto param] + auto_message = app.config.get('autoaway_message') + if not auto_message: + auto_message = app.connections[account].status + else: + auto_message = auto_message.replace('$S', '%(status)s') + auto_message = auto_message.replace('$T', '%(time)s') + auto_message = auto_message % { + 'status': app.status_before_autoaway[account], + 'time': app.config.get('autoxatime')} + roster.send_status(account, 'away', auto_message, auto=True) + app.sleeper_state[account] = 'autoaway-forced' + + +def appeared(connection, name, name_owner, *user_data): + '''Set up a listener for screensaver signals''' + log.info('%s appeared', name) + connection.signal_subscribe( + 'org.gnome.ScreenSaver', + 'org.gnome.ScreenSaver', + 'ActiveChanged', + '/org/gnome/ScreenSaver', + None, + Gio.DBusSignalFlags.NONE, + signal_received, + None) + + +Gio.bus_watch_name( + Gio.BusType.SESSION, + 'org.gnome.ScreenSaver', + Gio.BusNameWatcherFlags.NONE, + appeared, + None) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/07e251831e6a66f7c39131576cc3935f3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/07e251831e6a66f7c39131576cc3935f3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix string for a better translation
by Yann Leboulanger 08 Jan '18

08 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0ddff9c2 by André Apitzsch at 2018-01-08T00:24:17+01:00 Fix string for a better translation - - - - - 07e25183 by Yann Leboulanger at 2018-01-08T08:03:12+01:00 Merge branch 'trans' into 'master' Fix string for a better translation See merge request gajim/gajim!185 - - - - - 1 changed file: - gajim/server_info.py Changes: ===================================== gajim/server_info.py ===================================== --- a/gajim/server_info.py +++ b/gajim/server_info.py @@ -127,7 +127,8 @@ class ServerInfoDialog(Gtk.Dialog): hours = 0 if seconds >= 3600: hours = delta.seconds // 3600 - self.uptime = _('%s days, %s hours') % (delta.days, hours) + self.uptime = _('%(days)s days, %(hours)s hours') % { + 'days': delta.days, 'hours': hours} self.update(self.get_infos, self.info_listbox) def _nec_version_result_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/71e1613332b1c22340c6633ec69516724… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/71e1613332b1c22340c6633ec69516724… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: xgettext: Additional keyword for translatable strings
by Yann Leboulanger 08 Jan '18

08 Jan '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 9119fbef by André Apitzsch at 2018-01-08T00:08:31+01:00 xgettext: Additional keyword for translatable strings - - - - - 71e16133 by Yann Leboulanger at 2018-01-08T08:01:40+01:00 Merge branch 'gettext' into 'master' xgettext: Additional keyword for translatable strings See merge request gajim/gajim!184 - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ def update_trans(): os.path.join(root, f)) and (f.endswith('.py') or f.endswith('.ui'))] files.append(os.path.join("data", "org.gajim.Gajim.desktop.in")) files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in")) - cmd = 'xgettext --from-code=utf-8 -o %s %s' % ( + cmd = 'xgettext --from-code=utf-8 --keyword=Q_ -o %s %s' % ( template, " ".join(files)) if os.system(cmd) != 0: msg = "ERROR: %s could not be created!\n" % template View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8b2732cf162f7b10f0be4bc253ea99b50… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8b2732cf162f7b10f0be4bc253ea99b50… 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 January 2018