[cinnamon] Fix desktop file editor

leigh123linux leigh123linux at fedoraproject.org
Wed Mar 5 18:08:28 UTC 2014


commit a088a7b6b92cdf00b7fea94c331df49fdb2c5b2a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Mar 5 18:08:13 2014 +0000

    Fix desktop file editor

 cinnamon-desktop-editor.patch |   11 +++++++++++
 cinnamon.spec                 |    6 +++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-desktop-editor.patch b/cinnamon-desktop-editor.patch
new file mode 100644
index 0000000..77532be
--- /dev/null
+++ b/cinnamon-desktop-editor.patch
@@ -0,0 +1,11 @@
+--- a/files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
++++ b/files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+@@ -101,7 +107,7 @@ class IconPicker(object):
+         else:
+             theme = Gtk.IconTheme.get_default()
+             icon_info = theme.lookup_icon(fn, 64, 0)
+-            icon_info_fn = icon_info.get_filename()
++            icon_info_fn = icon_info.get_filename() if icon_info != None else None
+             if icon_info_fn:
+                 chooser.set_filename(icon_info_fn)
+         filter = Gtk.FileFilter();
diff --git a/cinnamon.spec b/cinnamon.spec
index ecb591d..0adc24c 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        2.0.14
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -34,6 +34,7 @@ Patch8:         upower_calender_fix.patch
 Patch9:         remove_bluetootoh.patch
 %endif
 Patch10:        set_wheel.patch
+Patch11:        cinnamon-desktop-editor.patch
 
 %global clutter_version 1.12.2
 %global cjs_version 1.9.1
@@ -241,6 +242,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Mar 05 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-15
+- Fix desktop file editor
+
 * Thu Feb 20 2014 Kalev Lember <kalevlember at gmail.com> - 2.0.14-14
 - Rebuilt for cogl soname bump
 


More information about the scm-commits mailing list