← Back to branch summary

~ubuntu-branches/ubuntu/vivid/cinnamon/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/handle-missing-bindings.patch

  • Committer: Package Import Robot
  • Author(s): Nicolas Bourdaud
  • Date: 2013-03-15 22:39:29 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20130315223929-1fge0g3h4mzpeg4f
Tags: 1.7.2-1
http://bugs.debian.org/694688
http://bugs.debian.org/702239
http://bugs.debian.org/702237
http://bugs.debian.org/702281
* New upstream cinnamon_1.7.2
  - Fix clock text dropshadow. (Closes: #694688)
* Add python-pyinotify dependency. (Closes: #702239)
* Improve cinnamon-screensaver-lock-dialog manpage. (Closes: #702237) 
* Add various missing gir dependencies.
* Handle missing bindings with cinnamon-settings. (Closes: #702281)
  - new patch: handle-missing-bindings.patch (thanks to Stephan Sürken)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/handle-missing-bindings.patch
 
1
Description: Handle case of missing bindings in cs_keyboard.py
 
2
 cinnamon-settings.py crash when gconf settings
 
3
 (/desktop/gnome/keybindings/*/bindings) is missing. Default to "" if
 
4
 missing when happening the settings.
 
5
Author: Stephan Sürken <absurd@olurdix.de>
 
6
Bug-Debian: http://bugs.debian.org/702281
 
7
Forwarded: no
 
8
Last-Update: 2013-03-09
 
9
 
 
10
--- a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
 
11
+++ b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
 
12
@@ -241,7 +241,7 @@
 
13
         self.label = label
 
14
         self.action = action
 
15
         self.entries = []
 
16
-        self.entries.append(binding)
 
17
+        self.entries.append(binding if binding else "")
 
18
 
 
19
     def setBinding(self, index, val):
 
20
         if val is not None: