Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] better fix for joining groupchats with uppercase letters. Fixes #9198
by Yann Leboulanger 30 Aug '18

30 Aug '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7d4a9b91 by Yann Leboulanger at 2018-08-30T10:21:43Z better fix for joining groupchats with uppercase letters. Fixes #9198 - - - - - 1 changed file: - gajim/gtk/join_groupchat.py Changes: ===================================== gajim/gtk/join_groupchat.py ===================================== --- a/gajim/gtk/join_groupchat.py +++ b/gajim/gtk/join_groupchat.py @@ -203,7 +203,12 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): return self.room_jid = '%s@%s' % (room, server) - self.room_jid = self.room_jid.lower() + + try: + self.room_jid = helpers.parse_jid(self.room_jid) + except helpers.InvalidFormat as error: + ErrorDialog(_('Invalid JID'), str(error), transient_for=self) + return if app.in_groupchat(account, self.room_jid): # If we already in the groupchat, join_gc_room will bring @@ -223,12 +228,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): ErrorDialog(_('Invalid Nickname'), str(error), transient_for=self) return - try: - helpers.parse_jid(self.room_jid) - except helpers.InvalidFormat as error: - ErrorDialog(_('Invalid JID'), str(error), transient_for=self) - return - if not app.account_is_connected(account): ErrorDialog( _('You are not connected to the server'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d4a9b91c8787ee2bd4821bba6a4aef93d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d4a9b91c8787ee2bd4821bba6a4aef93d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register modules defined by plugins
by Philipp Hörist 28 Aug '18

28 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 931e3f60 by Philipp Hörist at 2018-08-28T21:03:00Z Register modules defined by plugins - - - - - 5 changed files: - gajim/accounts_window.py - gajim/common/connection_handlers.py - gajim/common/modules/__init__.py - gajim/gtk/account_wizard.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -236,6 +236,9 @@ class AccountsWindow(Gtk.ApplicationWindow): else: app.connections[account] = Connection(account) + app.plugin_manager.register_modules_for_account( + app.connections[account]) + # update variables app.interface.instances[account] = { 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -408,6 +408,9 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, self.continue_connect_info = None + # If handlers have been registered + self.handlers_registered = False + app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) @@ -655,9 +658,11 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, for handler in modules.get_handlers(self): con.RegisterHandler(*handler) + self.handlers_registered = True def _unregister_handlers(self): if not self.connection: return for handler in modules.get_handlers(self): self.connection.UnregisterHandler(*handler) + self.handlers_registered = False ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -80,10 +80,27 @@ def register(con, *args, **kwargs): _modules[con.name][name] = instance +def register_single(con, instance, name): + if con.name not in _modules: + raise ValueError('Unknown account name: %s' % con.name) + _modules[con.name][name] = instance + + def unregister(con): + for instance in _modules[con.name].values(): + if hasattr(instance, 'cleanup'): + instance.cleanup() del _modules[con.name] +def unregister_single(con, name): + if con.name not in _modules: + return + if name not in _modules[con.name]: + return + del _modules[con.name][name] + + def get(account, name): try: return _modules[account][name] ===================================== gajim/gtk/account_wizard.py ===================================== --- a/gajim/gtk/account_wizard.py +++ b/gajim/gtk/account_wizard.py @@ -288,6 +288,7 @@ class AccountCreationWizard: 100, self.update_progressbar) # Get form from serveur con = connection.Connection(self.account) + app.plugin_manager.register_modules_for_account(con) app.connections[self.account] = con con.new_account(self.account, config) elif cur_page == 3: ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -38,6 +38,7 @@ import gajim from gajim.common import app from gajim.common import nec from gajim.common import configpaths +from gajim.common import modules from gajim.common.exceptions import PluginsystemError from gajim.plugins.helpers import log, log_calls, Singleton @@ -352,6 +353,38 @@ class PluginManager(metaclass=Singleton): if plugin.encryption_name: del self.encryption_plugins[plugin.encryption_name] + def _register_modules_with_handlers(self, plugin): + if not hasattr(plugin, 'modules'): + return + for con in app.connections.values(): + for module in plugin.modules: + instance, name = module.get_instance(con) + if not module.zeroconf and con.name == 'Local': + continue + modules.register_single(con, instance, name) + + # If handlers have been registered, register the + # plugin handlers. Otherwise this will be done + # automatically on connecting + # in connection_handlers._register_handlers() + if con.handlers_registered: + for handler in instance.handlers: + con.connection.RegisterHandler(*handler) + + def _unregister_modules_with_handlers(self, plugin): + if not hasattr(plugin, 'modules'): + return + for con in app.connections.values(): + for module in plugin.modules: + instance = con.get_module(module.name) + modules.unregister_single(con, module.name) + + # Account is still connected and handlers are registered + # So just unregister the plugin handlers + if con.handlers_registered: + for handler in instance.handlers: + con.connection.UnregisterHandler(*handler) + @log_calls('PluginManager') def activate_plugin(self, plugin): ''' @@ -365,6 +398,7 @@ class PluginManager(metaclass=Singleton): self._handle_all_gui_extension_points_with_plugin(plugin) self._register_events_handlers_in_ged(plugin) self._register_network_events_in_nec(plugin) + self._register_modules_with_handlers(plugin) self.active_plugins.append(plugin) try: @@ -402,6 +436,7 @@ class PluginManager(metaclass=Singleton): self._remove_events_handler_from_ged(plugin) self._remove_network_events_from_nec(plugin) self._remove_name_from_encryption_plugins(plugin) + self._unregister_modules_with_handlers(plugin) # removing plug-in from active plug-ins list plugin.deactivate() @@ -462,6 +497,24 @@ class PluginManager(metaclass=Singleton): except GajimPluginActivateException: pass + def register_modules_for_account(self, con): + ''' + A new account has been added, register modules + of all active plugins + ''' + for plugin in self.plugins: + if not plugin.active: + return + + if not hasattr(plugin, 'modules'): + return + + for module in plugin.modules: + instance, name = module.get_instance(con) + if not module.zeroconf and con.name == 'Local': + continue + modules.register_single(con, instance, name) + def _plugin_is_active_in_global_config(self, plugin): return app.config.get_per('plugins', plugin.short_name, 'active') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/931e3f60ba8bcf707193ca897ede931e89… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/931e3f60ba8bcf707193ca897ede931e89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show avatar in new message notifications
by Philipp Hörist 28 Aug '18

28 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c492e92 by Sophie Herold at 2018-08-28T20:33:12Z Show avatar in new message notifications - - - - - 1 changed file: - gajim/notify.py Changes: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -180,7 +180,6 @@ class Notification: notification.set_title(title) if text is not None: notification.set_body(text) - notification.set_icon(icon_pixbuf) notif_id = None if event_type in (_('Contact Signed In'), _('Contact Signed Out'), _('New Message'), _('New Single Message'), _('New Private Message'), @@ -211,9 +210,14 @@ class Notification: notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), _('New Private Message')): + avatar = app.contacts.get_avatar(account, jid) + if avatar: + icon_pixbuf = avatar notif_id = self._id('new-message', account, jid) + notification.set_icon(icon_pixbuf) notification.set_priority(Gio.NotificationPriority.NORMAL) + app.app.send_notification(notif_id, notification) def withdraw(self, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c492e92da7fdcd4e6a456820ddd697d4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c492e92da7fdcd4e6a456820ddd697d4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Fix empty version result
by Philipp Hörist 26 Aug '18

26 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d57bfcbc by Philipp Hörist at 2018-08-26T08:39:29Z ServerInfo: Fix empty version result Fixes #9311 - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== --- a/gajim/gtk/server_info.py +++ b/gajim/gtk/server_info.py @@ -129,7 +129,7 @@ class ServerInfoDialog(Gtk.Dialog): def _nec_version_result_received(self, obj): if obj.jid != self.hostname: return - self.version = obj.client_info + self.version = obj.client_info or _('Unknown') self.update(self.get_infos, self.info_listbox) def _server_disco_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d57bfcbcad543e47c3c63548f9aa49036e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d57bfcbcad543e47c3c63548f9aa49036e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] ServerInfo: Fix empty version result
by Philipp Hörist 26 Aug '18

26 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6e8f064f by Philipp Hörist at 2018-08-26T08:38:42Z ServerInfo: Fix empty version result Fixes #9311 - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== --- a/gajim/gtk/server_info.py +++ b/gajim/gtk/server_info.py @@ -129,7 +129,7 @@ class ServerInfoDialog(Gtk.Dialog): def _nec_version_result_received(self, obj): if obj.jid != self.hostname: return - self.version = obj.client_info + self.version = obj.client_info or _('Unknown') self.update(self.get_infos, self.info_listbox) def _server_disco_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e8f064fd02bf60f80bd567a5990c05379… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e8f064fd02bf60f80bd567a5990c05379… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 5 commits: Display only emojis the font supports
by Philipp Hörist 25 Aug '18

25 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 2e47f932 by Philipp Hörist at 2018-08-25T07:42:09Z Display only emojis the font supports Fixes #9299 - - - - - 33effbbe by Philipp Hörist at 2018-08-25T07:42:09Z Call link() on correct object - - - - - 163f98f7 by Philipp Hörist at 2018-08-25T07:42:09Z Windows: Fix gstreamer/farstream plugin paths - - - - - 3d477437 by Philipp Hörist at 2018-08-25T07:42:09Z Appveyor: add cssutils dependency - - - - - 0bbcc937 by Philipp Hörist at 2018-08-25T07:42:09Z Fix MUC invite notification Fixes #9309 - - - - - 8 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/jingle_rtp.py - gajim/gtk/emoji_chooser.py - gajim/gui_interface.py - gajim/notify.py - win/_base.sh - win/dev_env.sh Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -32,6 +32,7 @@ import os import sys import logging import uuid +from pathlib import Path from distutils.version import LooseVersion as V from collections import namedtuple @@ -229,8 +230,11 @@ def detect_dependencies(): # FARSTREAM try: if os.name == 'nt': - os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' - os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' + root_path = Path(sys.executable).parents[1] + fs_plugin_path = str(root_path / 'lib' / 'farstream-0.2') + gst_plugin_path = str(root_path / 'lib' / 'gstreamer-1.0') + os.environ['FS_PLUGIN_PATH'] = fs_plugin_path + os.environ['GST_PLUGIN_PATH'] = gst_plugin_path gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1478,11 +1478,7 @@ def version_condition(current_version, required_version): return True def get_available_emoticon_themes(): - emoticons_themes = [] - if sys.platform not in ('win32', 'darwin'): - # Colored emoji fonts only supported on Linux - emoticons_themes.append('font') - + emoticons_themes = ['font'] files = [] dir_iterator = os.scandir(configpaths.get('EMOTICONS')) for folder in dir_iterator: ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -243,7 +243,7 @@ class JingleRTPContent(JingleContent): # Add fallback source self.src_bin = self.get_fallback_src() self.pipeline.add(self.src_bin) - self.src_bin.link(sink_pad) + self.src_bin.get_static_pad('src').link(sink_pad) self.stream_failed_once = True else: reason = nbxmpp.Node('reason') ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -21,6 +21,7 @@ from collections import OrderedDict from gi.repository import Gtk from gi.repository import GLib from gi.repository import GdkPixbuf +from gi.repository import Pango from gajim.common import app from gajim.common import helpers @@ -38,8 +39,9 @@ log = logging.getLogger('gajim.emoji') class Section(Gtk.Box): - def __init__(self, name, search_entry, press_cb): + def __init__(self, name, search_entry, press_cb, chooser): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self._chooser = chooser self._press_cb = press_cb self.pixbuf_generator = None self.heading = Gtk.Label(label=name) @@ -83,22 +85,44 @@ class Section(Gtk.Box): emoji_pixbufs[codepoint] = pixbuf else: if pixbuf is not None: - chooser = self._get_emoji_modifier( - codepoint, pixbuf, attrs) - chooser.flowbox.connect( - 'child-activated', self._press_cb) + chooser = ModifierChooser() + + # Iterate over the variations and add the codepoints + for codepoint_ in variations.keys(): + pixbuf_ = self._get_next_pixbuf() + if pixbuf_ is None: + continue + + if pixbuf_ == 'font': + if not self._chooser._font_supports_codepoint( + codepoint_): + continue + else: + emoji_pixbufs[codepoint_] = pixbuf_ + + # Only codepoints are added which the + # font or theme supports + chooser.add_emoji(codepoint_, pixbuf_) + + # Check if we successfully added codepoints with modifiers + if chooser.has_child: + # If we have children then add a button + # and set the popover + child = EmojiModifierChild( + codepoint, pixbuf, attrs['desc']) + child.button.set_popover(chooser) + chooser.flowbox.connect( + 'child-activated', self._press_cb) + else: + # If no children were added, destroy the chooser + # and add a EmojiChild instead of a EmojiModifierChild + chooser.destroy() + child = EmojiChild(codepoint, pixbuf, attrs['desc']) if pixbuf != 'font': emoji_pixbufs[codepoint] = pixbuf - for codepoint, attrs in variations.items(): - pixbuf = self._get_next_pixbuf() - if pixbuf is None: - continue - chooser.add_emoji(codepoint, pixbuf) - - if pixbuf != 'font': - emoji_pixbufs[codepoint] = pixbuf + self.flowbox.add(child) else: # We dont have a image for the base codepoint # so skip all modifiers of it @@ -112,13 +136,6 @@ class Section(Gtk.Box): emoji.destroy() self.flowbox.foreach(_remove_emoji) - def _get_emoji_modifier(self, codepoint, pixbuf, attrs): - chooser = ModifierChooser() - modifier_button = EmojiModifierChild(codepoint, pixbuf, attrs['desc']) - modifier_button.button.set_popover(chooser) - self.flowbox.add(modifier_button) - return chooser - def _get_next_pixbuf(self): if self.pixbuf_generator is None: return 'font' @@ -193,6 +210,7 @@ class ModifierChooser(Gtk.Popover): def __init__(self): Gtk.Popover.__init__(self) self.set_name('EmoticonPopover') + self._has_child = False self.flowbox = Gtk.FlowBox() self.flowbox.get_style_context().add_class( @@ -202,8 +220,13 @@ class ModifierChooser(Gtk.Popover): self.flowbox.show() self.add(self.flowbox) + @property + def has_child(self): + return self._has_child + def add_emoji(self, codepoint, pixbuf): self.flowbox.add(EmojiChild(codepoint, pixbuf, None)) + self._has_child = True class EmojiChooser(Gtk.Popover): @@ -224,6 +247,7 @@ class EmojiChooser(Gtk.Popover): self.set_name('EmoticonPopover') self._text_widget = None self._load_source_id = None + self._pango_layout = Pango.Layout(self.get_pango_context()) self._builder = get_builder('emoji_chooser.ui') self._search = self._builder.get_object('search') @@ -232,7 +256,7 @@ class EmojiChooser(Gtk.Popover): self._sections = OrderedDict() for name in self._section_names: self._sections[name] = Section( - name, self._search, self._on_emoticon_press) + name, self._search, self._on_emoticon_press, self) section_box = self._builder.get_object('section_box') for section in self._sections.values(): @@ -326,21 +350,35 @@ class EmojiChooser(Gtk.Popover): self._clear_sections() emoji_pixbufs.clear() - factory = self._emoji_factory() + factory = self._emoji_factory(theme == 'font') self._load_source_id = GLib.idle_add(lambda: next(factory, False), priority=GLib.PRIORITY_LOW) - def _emoji_factory(self): + def _emoji_factory(self, font): for codepoint, attrs in emoji_data.items(): if not attrs['fully-qualified']: # We dont add these to the UI continue + if font and not self._font_supports_codepoint(codepoint): + continue + section = self._sections[attrs['group']] yield section.add_emoji(codepoint, attrs) self._load_source_id = None emoji_pixbufs.complete = True + def _font_supports_codepoint(self, codepoint): + self._pango_layout.set_text(codepoint, -1) + if self._pango_layout.get_unknown_glyphs_count(): + return False + if len(codepoint) > 1: + # The font supports each of the codepoints + # Check if the rendered glyph is more than one char + if self._pango_layout.get_size()[0] > 19000: + return False + return True + def _get_next_pixbuf(self, path): src_x = src_y = cur_column = 0 atlas = GdkPixbuf.Pixbuf.new_from_file(path) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -661,8 +661,8 @@ class Interface: text = _('You are invited to {room} by {user}').format( room=obj.room_jid, user=str(obj.from_)) app.notification.popup( - event_type, obj.room_jid, obj.account, 'gc-invitation', - 'gajim-gc_invitation', event_type, text) + event_type, str(obj.from_), obj.account, 'gc-invitation', + 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -153,7 +153,7 @@ class Notification: return gtkgui_helpers.get_iconset_name_for(obj.show) def popup(self, event_type, jid, account, type_='', icon_name=None, - title=None, text=None, timeout=-1): + title=None, text=None, timeout=-1, room_jid=None): """ Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows @@ -206,7 +206,7 @@ class Notification: _('Contact Changed Status')): notif_id = self._id('contact-status-changed', account, jid) elif event_type == _('Groupchat Invitation'): - notif_id = self._id('gc-invitation', account, jid) + notif_id = self._id('gc-invitation', account, room_jid) elif event_type == _('Connection Failed'): notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -97,6 +97,7 @@ keyring python-gnupg python-axolotl qrcode +cssutils " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -30,6 +30,7 @@ docutils qrcode keyring pillow==4.3.0 +cssutils " pip3 install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e8526bb063a9d58c1de94c1d89c05fbe4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e8526bb063a9d58c1de94c1d89c05fbe4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix MUC invite notification
by Philipp Hörist 24 Aug '18

24 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e665ee1f by Philipp Hörist at 2018-08-24T20:03:33Z Fix MUC invite notification Fixes #9309 - - - - - 2 changed files: - gajim/gui_interface.py - gajim/notify.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -661,8 +661,8 @@ class Interface: text = _('You are invited to {room} by {user}').format( room=obj.room_jid, user=str(obj.from_)) app.notification.popup( - event_type, obj.room_jid, obj.account, 'gc-invitation', - 'gajim-gc_invitation', event_type, text) + event_type, str(obj.from_), obj.account, 'gc-invitation', + 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -153,7 +153,7 @@ class Notification: return gtkgui_helpers.get_iconset_name_for(obj.show) def popup(self, event_type, jid, account, type_='', icon_name=None, - title=None, text=None, timeout=-1): + title=None, text=None, timeout=-1, room_jid=None): """ Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows @@ -206,7 +206,7 @@ class Notification: _('Contact Changed Status')): notif_id = self._id('contact-status-changed', account, jid) elif event_type == _('Groupchat Invitation'): - notif_id = self._id('gc-invitation', account, jid) + notif_id = self._id('gc-invitation', account, room_jid) elif event_type == _('Connection Failed'): notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e665ee1fbed235ed6f9575f5808d3ceeaf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e665ee1fbed235ed6f9575f5808d3ceeaf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Appveyor: add cssutils dependency
by Philipp Hörist 23 Aug '18

23 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf64d040 by Philipp Hörist at 2018-08-23T17:48:36Z Appveyor: add cssutils dependency - - - - - 2 changed files: - win/_base.sh - win/dev_env.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -97,6 +97,7 @@ keyring python-gnupg python-axolotl qrcode +cssutils " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -30,6 +30,7 @@ docutils qrcode keyring pillow==4.3.0 +cssutils " pip3 install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf64d040467d6a8d5e3ce1877db62c3f0f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf64d040467d6a8d5e3ce1877db62c3f0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Call link() on correct object
by Philipp Hörist 21 Aug '18

21 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fb4c5a23 by Philipp Hörist at 2018-08-21T16:48:20Z Call link() on correct object - - - - - a087486e by Philipp Hörist at 2018-08-21T17:21:07Z Windows: Fix gstreamer/farstream plugin paths - - - - - 2 changed files: - gajim/common/app.py - gajim/common/jingle_rtp.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -32,6 +32,7 @@ import os import sys import logging import uuid +from pathlib import Path from distutils.version import LooseVersion as V from collections import namedtuple @@ -229,8 +230,11 @@ def detect_dependencies(): # FARSTREAM try: if os.name == 'nt': - os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' - os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' + root_path = Path(sys.executable).parents[1] + fs_plugin_path = str(root_path / 'lib' / 'farstream-0.2') + gst_plugin_path = str(root_path / 'lib' / 'gstreamer-1.0') + os.environ['FS_PLUGIN_PATH'] = fs_plugin_path + os.environ['GST_PLUGIN_PATH'] = gst_plugin_path gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -243,7 +243,7 @@ class JingleRTPContent(JingleContent): # Add fallback source self.src_bin = self.get_fallback_src() self.pipeline.add(self.src_bin) - self.src_bin.link(sink_pad) + self.src_bin.get_static_pad('src').link(sink_pad) self.stream_failed_once = True else: reason = nbxmpp.Node('reason') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fef8cff254434525f0588eff2cbeb8524… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fef8cff254434525f0588eff2cbeb8524… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Display only emojis the font supports
by Philipp Hörist 20 Aug '18

20 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fef8cff2 by Philipp Hörist at 2018-08-20T17:18:07Z Display only emojis the font supports Fixes #9299 - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/emoji_chooser.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1478,11 +1478,7 @@ def version_condition(current_version, required_version): return True def get_available_emoticon_themes(): - emoticons_themes = [] - if sys.platform not in ('win32', 'darwin'): - # Colored emoji fonts only supported on Linux - emoticons_themes.append('font') - + emoticons_themes = ['font'] files = [] dir_iterator = os.scandir(configpaths.get('EMOTICONS')) for folder in dir_iterator: ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -21,6 +21,7 @@ from collections import OrderedDict from gi.repository import Gtk from gi.repository import GLib from gi.repository import GdkPixbuf +from gi.repository import Pango from gajim.common import app from gajim.common import helpers @@ -38,8 +39,9 @@ log = logging.getLogger('gajim.emoji') class Section(Gtk.Box): - def __init__(self, name, search_entry, press_cb): + def __init__(self, name, search_entry, press_cb, chooser): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self._chooser = chooser self._press_cb = press_cb self.pixbuf_generator = None self.heading = Gtk.Label(label=name) @@ -83,22 +85,44 @@ class Section(Gtk.Box): emoji_pixbufs[codepoint] = pixbuf else: if pixbuf is not None: - chooser = self._get_emoji_modifier( - codepoint, pixbuf, attrs) - chooser.flowbox.connect( - 'child-activated', self._press_cb) + chooser = ModifierChooser() + + # Iterate over the variations and add the codepoints + for codepoint_ in variations.keys(): + pixbuf_ = self._get_next_pixbuf() + if pixbuf_ is None: + continue + + if pixbuf_ == 'font': + if not self._chooser._font_supports_codepoint( + codepoint_): + continue + else: + emoji_pixbufs[codepoint_] = pixbuf_ + + # Only codepoints are added which the + # font or theme supports + chooser.add_emoji(codepoint_, pixbuf_) + + # Check if we successfully added codepoints with modifiers + if chooser.has_child: + # If we have children then add a button + # and set the popover + child = EmojiModifierChild( + codepoint, pixbuf, attrs['desc']) + child.button.set_popover(chooser) + chooser.flowbox.connect( + 'child-activated', self._press_cb) + else: + # If no children were added, destroy the chooser + # and add a EmojiChild instead of a EmojiModifierChild + chooser.destroy() + child = EmojiChild(codepoint, pixbuf, attrs['desc']) if pixbuf != 'font': emoji_pixbufs[codepoint] = pixbuf - for codepoint, attrs in variations.items(): - pixbuf = self._get_next_pixbuf() - if pixbuf is None: - continue - chooser.add_emoji(codepoint, pixbuf) - - if pixbuf != 'font': - emoji_pixbufs[codepoint] = pixbuf + self.flowbox.add(child) else: # We dont have a image for the base codepoint # so skip all modifiers of it @@ -112,13 +136,6 @@ class Section(Gtk.Box): emoji.destroy() self.flowbox.foreach(_remove_emoji) - def _get_emoji_modifier(self, codepoint, pixbuf, attrs): - chooser = ModifierChooser() - modifier_button = EmojiModifierChild(codepoint, pixbuf, attrs['desc']) - modifier_button.button.set_popover(chooser) - self.flowbox.add(modifier_button) - return chooser - def _get_next_pixbuf(self): if self.pixbuf_generator is None: return 'font' @@ -193,6 +210,7 @@ class ModifierChooser(Gtk.Popover): def __init__(self): Gtk.Popover.__init__(self) self.set_name('EmoticonPopover') + self._has_child = False self.flowbox = Gtk.FlowBox() self.flowbox.get_style_context().add_class( @@ -202,8 +220,13 @@ class ModifierChooser(Gtk.Popover): self.flowbox.show() self.add(self.flowbox) + @property + def has_child(self): + return self._has_child + def add_emoji(self, codepoint, pixbuf): self.flowbox.add(EmojiChild(codepoint, pixbuf, None)) + self._has_child = True class EmojiChooser(Gtk.Popover): @@ -224,6 +247,7 @@ class EmojiChooser(Gtk.Popover): self.set_name('EmoticonPopover') self._text_widget = None self._load_source_id = None + self._pango_layout = Pango.Layout(self.get_pango_context()) self._builder = get_builder('emoji_chooser.ui') self._search = self._builder.get_object('search') @@ -232,7 +256,7 @@ class EmojiChooser(Gtk.Popover): self._sections = OrderedDict() for name in self._section_names: self._sections[name] = Section( - name, self._search, self._on_emoticon_press) + name, self._search, self._on_emoticon_press, self) section_box = self._builder.get_object('section_box') for section in self._sections.values(): @@ -326,21 +350,35 @@ class EmojiChooser(Gtk.Popover): self._clear_sections() emoji_pixbufs.clear() - factory = self._emoji_factory() + factory = self._emoji_factory(theme == 'font') self._load_source_id = GLib.idle_add(lambda: next(factory, False), priority=GLib.PRIORITY_LOW) - def _emoji_factory(self): + def _emoji_factory(self, font): for codepoint, attrs in emoji_data.items(): if not attrs['fully-qualified']: # We dont add these to the UI continue + if font and not self._font_supports_codepoint(codepoint): + continue + section = self._sections[attrs['group']] yield section.add_emoji(codepoint, attrs) self._load_source_id = None emoji_pixbufs.complete = True + def _font_supports_codepoint(self, codepoint): + self._pango_layout.set_text(codepoint, -1) + if self._pango_layout.get_unknown_glyphs_count(): + return False + if len(codepoint) > 1: + # The font supports each of the codepoints + # Check if the rendered glyph is more than one char + if self._pango_layout.get_size()[0] > 19000: + return False + return True + def _get_next_pixbuf(self, path): src_x = src_y = cur_column = 0 atlas = GdkPixbuf.Pixbuf.new_from_file(path) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fef8cff254434525f0588eff2cbeb8524c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fef8cff254434525f0588eff2cbeb8524c… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits