~ubuntu-branches/ubuntu/hardy/screenlets/hardy

« back to all changes in this revision

Viewing changes to debian/patches/16_fix-option-theme-dialog-crashing.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kjell Braden
  • Date: 2008-04-07 17:05:29 UTC
  • Revision ID: james.westby@ubuntu.com-20080407170529-8e20cl37qk77bg5o
Tags: 0.0.12-0ubuntu4
* This is a bugfix upload. (LP: #213385)
* debian/patches/10-problem-on-create-tmpfile.patch: dropped, didn't fix the
  issue
* new patches from upstream:
  - debian/patches/15_better-daemon-running-check.patch: fix daemon starting
    multiple times (LP: #205526)
  - debian/patches/16_fix-option-theme-dialog-crashing.patch: fix a crash
    occuring in some theme dialogues (LP: #195036)
  - debian/patches/17_fix-crash-on-invalid-archive.patch: fix a crash
    occuring when trying to open broken screenlet packages (LP: #205526)
* new patches from ubuntu:
  - debian/patches/14_no-unnecessary-updates-when-unmapped.patch: don't
    update the screenlets when they are not mapped, thanks criser
    (LP: #211525)
  - debian/patches/18_fix-crashing-on-invalid-sensor-type.patch: fix a crash
    occuring in the sensor applet when a bad device was selected for
    monitoring (LP: #198675)
  - debian/patches/19_fix-creating-tempfile.patch: improve the error
    handling when initializing the tempfile (LP: #197712, #212175)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -Nur -x '*.orig' -x '*~' screenlets-0.0.12/src/lib/options.py screenlets-0.0.12.new/src/lib/options.py
 
2
--- screenlets-0.0.12/src/lib/options.py        2008-02-08 03:46:21.000000000 +0100
 
3
+++ screenlets-0.0.12.new/src/lib/options.py    2008-04-06 19:31:53.000000000 +0200
 
4
@@ -884,6 +884,10 @@
 
5
                        mu = '<b><span weight="ultrabold" size="large">' + name_uc + \
 
6
                        '</span></b> (no info available)'
 
7
                else:
 
8
+                       if attrib[1] == None : attrib[1] = '-'
 
9
+                       if attrib[2] == None : attrib[2] = '-'
 
10
+                       if attrib[3] == None : attrib[3] = '-'
 
11
+                       if attrib[4] == None : attrib[4] = '-'
 
12
                        mu = '<b><span weight="ultrabold" size="large">' + name_uc + \
 
13
                                '</span></b> v' + attrib[4] + '\n<small><span color="#555555' +\
 
14
                                '">' + attrib[2].replace('\\n', '\n') + \