[pkg-cinnamon] Bug#756387: cinnamon-common: cinnamon-settings: Backgrounds shows no choices after wallpapers are added

[Andrew Chadwick]

Package: cinnamon-common
Version: 2.2.14-3
Severity: normal
Tags: upstream patch

Dear Maintainer,

The Backgrounds module in the Cinnamon System Settings program does not show
any wallpaper previews, either by default (which is probably reasonable), or
after the user has clicked on "Add" and added a valid wallaper image (which is
not reasonable). This prevents this settings module from building up a library
of background images, making it entirely useless.

It's fixable by patching /usr/share/cinnamon/cinnamon-settings/bin/imtools.py
to be a bit more careful with its checks - the guts of PIL can't compare Images
with None right now. Currently an exception is caught, printed and discarded by
cs_backgrounds.py when mangling the cached preview thumbnails for display.
Symptom: no wallpapers visible in the list - and 

------------------------8<-------------------------
$ cinnamon-settings
Could not find bluetooth module; is the cinnamon-control-center package installed?
__init__ took 81.983 ms
Loading Backgrounds module
Failed to convert /home/testuser/.cinnamon/backgrounds/Dark_Ivy.jpg: 'NoneType' object has no attribute 'mode'
[...]
------------------------>8-------------------------

and so on dumped the terminal after image files have been added. Patch:

------------------------8<-------------------------
--- imtools.py.BAK	2014-07-29 12:32:57.256599508 +0100
+++ imtools.py	2014-07-29 13:04:51.216999888 +0100
@@ -860,5 +860,5 @@
     """
     # Paste on top
-    if source == mask:
+    if mask and (source == mask):
         if has_alpha(source):
             # invert_alpha = the transparant pixels of the destination
------------------------>8-------------------------


Should cinnamon-common also depend on python-pil? PIL is clearly being pulled
in though some other route by installing cinnamon though. I've not gone digging
through the dependencies to check from where.

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (900, 'testing'), (50, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.14-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages cinnamon-common depends on:
ii  dconf-gsettings-backend [gsettings-backend]  0.20.0-2
ii  gir1.2-meta-muffin-0.0                       2.2.6-2
ii  python                                       2.7.8-1

cinnamon-common recommends no packages.

cinnamon-common suggests no packages.

-- no debconf information