Skip to content

Import emblem-new from Adwaita

Jan Tojnar requested to merge wip/jtojnar/bundle-icons into master

Emblems are considered deprecated since GNOME 3.32: adwaita-icon-theme@7f3f91f9 and emblem-new has been removed in GNOME 42: adwaita-icon-theme@becf0674

This will cause Meld to complain loudly on vanilla GNOME, even breaking the file tree view:

Traceback (most recent call last):
  File "/nix/store/i9gy3x995nn7js4xipzw01gysq4fh5zz-meld-3.21.1/lib/python3.9/site-packages/meld/ui/emblemcellrenderer.py", line 100, in do_render
    pixbuf = self._get_pixbuf(self.emblem_name, self._emblem_size)
  File "/nix/store/i9gy3x995nn7js4xipzw01gysq4fh5zz-meld-3.21.1/lib/python3.9/site-packages/meld/ui/emblemcellrenderer.py", line 64, in _get_pixbuf
    pixbuf = icon_theme.load_icon(name, size, 0).copy()
gi.repository.GLib.GError: gtk-icon-theme-error-quark: Icon 'emblem-new' not present in theme Adwaita (0)

cairo.Error: Context.restore() without matching Context.save()

emblem-default-symbolic and emblem-symbolic-link are still available.

Let’s bundle it with Meld as suggested.

Merge request reports