Commits August 2018

commits@gajim.org

1 participants
79 discussions

[Git][gajim/gajim][master] Fix emoji theme fallback
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e128a3f6 by Philipp Hörist at 2018-08-19T19:38:11Z Fix emoji theme fallback - - - - - 1 changed file: - gajim/gtk/emoji_chooser.py Changes: ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -276,10 +276,6 @@ class EmojiChooser(Gtk.Popover): def _get_current_theme(self): theme = app.config.get('emoticons_theme') - if not theme: - log.warning('No emoji theme set') - return - themes = helpers.get_available_emoticon_themes() if theme not in themes: if sys.platform not in ('win32', 'darwin'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e128a3f6760e41ccd0bbcf3679c359d31c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e128a3f6760e41ccd0bbcf3679c359d31c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Fix emoji theme fallback
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 8564edd5 by Philipp Hörist at 2018-08-19T19:37:34Z Fix emoji theme fallback - - - - - 1 changed file: - gajim/gtk/emoji_chooser.py Changes: ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -276,10 +276,6 @@ class EmojiChooser(Gtk.Popover): def _get_current_theme(self): theme = app.config.get('emoticons_theme') - if not theme: - log.warning('No emoji theme set') - return - themes = helpers.get_available_emoticon_themes() if theme not in themes: if sys.platform not in ('win32', 'darwin'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8564edd5f3265bf80e899cd857c66a5cd5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8564edd5f3265bf80e899cd857c66a5cd5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Update Gajim version to 1.0.99
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6a33163d by Philipp Hörist at 2018-08-19T16:09:08Z Update Gajim version to 1.0.99 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.3" +__version__ = "1.0.99" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a33163d429982e6accb84d00d08a7aa03… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a33163d429982e6accb84d00d08a7aa03… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Gajim version to 1.0.99
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ab60762 by Philipp Hörist at 2018-08-19T16:08:00Z Update Gajim version to 1.0.99 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.3" +__version__ = "1.0.99" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ab607629b6ced1b47bebadc75776a24ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ab607629b6ced1b47bebadc75776a24ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move filechoosers into gtk module
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1c69b92d by Philipp Hörist at 2018-08-19T15:47:17Z Move filechoosers into gtk module - - - - - 8 changed files: - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/filechoosers.py → gajim/gtk/filechoosers.py - gajim/gtk/profile.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/gui.py Changes: ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -48,7 +48,7 @@ from gajim.common import helpers from gajim.common.file_props import FilesProp from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) -from gajim.filechoosers import FileSaveDialog, FileChooserDialog +from gajim.gtk.filechoosers import FileSaveDialog, FileChooserDialog from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 import logging log = logging.getLogger('gajim.filetransfer_window') ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -63,7 +63,7 @@ from gajim.common.const import StyleAttr from gajim.chat_control import ChatControl from gajim.chat_control_base import ChatControlBase -from gajim.filechoosers import AvatarChooserDialog +from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk import ErrorDialog from gajim.gtk import InputTextDialog from gajim.gtk import ConfirmationDialogCheck ===================================== gajim/filechoosers.py → gajim/gtk/filechoosers.py ===================================== --- a/gajim/filechoosers.py +++ b/gajim/gtk/filechoosers.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> # # This file is part of Gajim. ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -29,7 +29,7 @@ from gajim import gtkgui_helpers from gajim.gtk import ErrorDialog from gajim.gtk import InformationDialog from gajim.gtk.util import get_builder -from gajim.filechoosers import AvatarChooserDialog +from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.common.const import AvatarSize from gajim.common import app from gajim.common import ged ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -52,7 +52,6 @@ from gajim.common import i18n from gajim.common import app from gajim.common import configpaths from gajim.common.const import PEPEventType, ACTIVITIES, MOODS -from gajim.filechoosers import AvatarSaveDialog gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(configpaths.get('ICONS')) @@ -464,6 +463,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk import FTOverwriteConfirmationDialog + from gajim.gtk.filechoosers import AvatarSaveDialog def on_continue(response, file_path): if response < 0: return ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -70,7 +70,7 @@ from gajim import message_control from gajim.dialog_messages import get_dialog from gajim.dialogs import ProgressWindow -from gajim.filechoosers import FileChooserDialog +from gajim.gtk.filechoosers import FileChooserDialog from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -88,7 +88,7 @@ from gajim.common import helpers from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog -from gajim.filechoosers import FileSaveDialog +from gajim.gtk.filechoosers import FileSaveDialog from gajim import gtkgui_helpers ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -36,7 +36,7 @@ from enum import IntEnum, unique from gajim import gtkgui_helpers from gajim.gtk import WarningDialog from gajim.gtk import YesNoDialog -from gajim.filechoosers import ArchiveChooserDialog +from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.common import app from gajim.common import configpaths from gajim.plugins.helpers import log_calls View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c69b92d8517e672e1b307f69954bb138c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c69b92d8517e672e1b307f69954bb138c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Move filechoosers into gtk module
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: a457a9ac by Philipp Hörist at 2018-08-19T15:44:17Z Move filechoosers into gtk module - - - - - 8 changed files: - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/filechoosers.py → gajim/gtk/filechoosers.py - gajim/gtk/profile.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/gui.py Changes: ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -48,7 +48,7 @@ from gajim.common import helpers from gajim.common.file_props import FilesProp from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) -from gajim.filechoosers import FileSaveDialog, FileChooserDialog +from gajim.gtk.filechoosers import FileSaveDialog, FileChooserDialog from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 import logging log = logging.getLogger('gajim.filetransfer_window') ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -63,7 +63,7 @@ from gajim.common.const import StyleAttr from gajim.chat_control import ChatControl from gajim.chat_control_base import ChatControlBase -from gajim.filechoosers import AvatarChooserDialog +from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk import ErrorDialog from gajim.gtk import InputTextDialog from gajim.gtk import ConfirmationDialogCheck ===================================== gajim/filechoosers.py → gajim/gtk/filechoosers.py ===================================== --- a/gajim/filechoosers.py +++ b/gajim/gtk/filechoosers.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> # # This file is part of Gajim. ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -29,7 +29,7 @@ from gajim import gtkgui_helpers from gajim.gtk import ErrorDialog from gajim.gtk import InformationDialog from gajim.gtk.util import get_builder -from gajim.filechoosers import AvatarChooserDialog +from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.common.const import AvatarSize from gajim.common import app from gajim.common import ged ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -52,7 +52,6 @@ from gajim.common import i18n from gajim.common import app from gajim.common import configpaths from gajim.common.const import PEPEventType, ACTIVITIES, MOODS -from gajim.filechoosers import AvatarSaveDialog gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(configpaths.get('ICONS')) @@ -464,6 +463,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk import FTOverwriteConfirmationDialog + from gajim.gtk.filechoosers import AvatarSaveDialog def on_continue(response, file_path): if response < 0: return ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -70,7 +70,7 @@ from gajim import message_control from gajim.dialog_messages import get_dialog from gajim.dialogs import ProgressWindow -from gajim.filechoosers import FileChooserDialog +from gajim.gtk.filechoosers import FileChooserDialog from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -88,7 +88,7 @@ from gajim.common import helpers from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog -from gajim.filechoosers import FileSaveDialog +from gajim.gtk.filechoosers import FileSaveDialog from gajim import gtkgui_helpers ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -36,7 +36,7 @@ from enum import IntEnum, unique from gajim import gtkgui_helpers from gajim.gtk import WarningDialog from gajim.gtk import YesNoDialog -from gajim.filechoosers import ArchiveChooserDialog +from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.common import app from gajim.common import configpaths from gajim.plugins.helpers import log_calls View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a457a9ac2153deb135274705e80179cf9f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a457a9ac2153deb135274705e80179cf9f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Add reason to MUC service-error kick
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: def4f548 by Philipp Hörist at 2018-08-19T15:02:39Z Add reason to MUC service-error kick - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1828,6 +1828,8 @@ class GroupchatControl(ChatControlBase): s = _('%s kicked us due to an error' % self.room_jid) else: s = _('%s has left due to an error' % nick) + if obj.reason: + s += ' (%s)' % obj.reason self.print_conversation(s, 'info', graphics=False) elif '307' in obj.status_code: if obj.actor is None: # do not print 'kicked by None' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/def4f548c1eed24096d9de7767e456ee49… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/def4f548c1eed24096d9de7767e456ee49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add reason to MUC service-error kick
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f3dd55de by Philipp Hörist at 2018-08-19T15:02:10Z Add reason to MUC service-error kick - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1828,6 +1828,8 @@ class GroupchatControl(ChatControlBase): s = _('%s kicked us due to an error' % self.room_jid) else: s = _('%s has left due to an error' % nick) + if obj.reason: + s += ' (%s)' % obj.reason self.print_conversation(s, 'info', graphics=False) elif '307' in obj.status_code: if obj.actor is None: # do not print 'kicked by None' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f3dd55de3e3eb26b4f022d1d98757ec91c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f3dd55de3e3eb26b4f022d1d98757ec91c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add JID to VcardReceivedEvent
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e3e6f80 by Philipp Hörist at 2018-08-19T14:43:59Z Add JID to VcardReceivedEvent - - - - - 1 changed file: - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -218,7 +218,9 @@ class VCardTemp: app.nicks[self._account] = vcard['FN'] app.nec.push_incoming_event( - VcardReceivedEvent(None, conn=self._con, vcard_dict=vcard)) + VcardReceivedEvent(None, conn=self._con, + vcard_dict=vcard, + jid=jid)) callback(jid, resource, room, vcard, expected_sha) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e3e6f80bbec6cc2437c9a558cbc23b58b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e3e6f80bbec6cc2437c9a558cbc23b58b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Add JID to VcardReceivedEvent
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6f8ffb13 by Philipp Hörist at 2018-08-19T14:43:30Z Add JID to VcardReceivedEvent - - - - - 1 changed file: - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -218,7 +218,9 @@ class VCardTemp: app.nicks[self._account] = vcard['FN'] app.nec.push_incoming_event( - VcardReceivedEvent(None, conn=self._con, vcard_dict=vcard)) + VcardReceivedEvent(None, conn=self._con, + vcard_dict=vcard, + jid=jid)) callback(jid, resource, room, vcard, expected_sha) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f8ffb131a6fabeef221a228725d537837… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f8ffb131a6fabeef221a228725d537837… 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 August 2018