From 57a5be3272382a006301d8424d88b3d3d7952c46 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: May 06 2016 07:22:54 +0000
Subject: fix cinnamon crash


---

diff --git a/0001-frames.c-don-t-infinite-loop-on-the-variants-GList.-.patch b/0001-frames.c-don-t-infinite-loop-on-the-variants-GList.-.patch
new file mode 100644
index 0000000..d334868
--- /dev/null
+++ b/0001-frames.c-don-t-infinite-loop-on-the-variants-GList.-.patch
@@ -0,0 +1,42 @@
+From 6120bddefd709d3f1611aa2af706fb3c43b5ae22 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Thu, 5 May 2016 20:44:08 -0400
+Subject: [PATCH] frames.c: don't infinite loop on the variants GList.  Make
+ variable names less similar.
+
+---
+ src/ui/frames.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ui/frames.c b/src/ui/frames.c
+index 9afbde5..fe8dabf 100644
+--- a/src/ui/frames.c
++++ b/src/ui/frames.c
+@@ -234,20 +234,20 @@ static void
+ update_style_contexts (MetaFrames *frames)
+ {
+   GtkStyleContext *style;
+-  GList *variants, *variant;
++  GList *variant_list, *variant;
+ 
+   if (frames->normal_style)
+     g_object_unref (frames->normal_style);
+   frames->normal_style = create_style_context (frames, NULL);
+ 
+-  variants = g_hash_table_get_keys (frames->style_variants);
+-  for (variant = variants; variant; variant = variants->next)
++  variant_list = g_hash_table_get_keys (frames->style_variants);
++  for (variant = variant_list; variant; variant = variant->next)
+     {
+       style = create_style_context (frames, (char *)variant->data);
+       g_hash_table_insert (frames->style_variants,
+                            g_strdup (variant->data), style);
+     }
+-  g_list_free (variants);
++  g_list_free (variant_list);
+ }
+ 
+ static void
+-- 
+2.5.5
+
diff --git a/muffin.spec b/muffin.spec
index c05c46c..6f95479 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -2,7 +2,7 @@
 
 Name:          muffin
 Version:       3.0.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
@@ -21,6 +21,7 @@ Source0:       http://leigh123linux.fedorapeople.org/pub/muffin/source/muffin-%{
 # to fix https://bugzilla.redhat.com/show_bug.cgi?id=1082118
 Patch0:        revert_ibus.patch
 Patch1:        remove_muffin_binary.patch
+Patch2:        0001-frames.c-don-t-infinite-loop-on-the-variants-GList.-.patch
 
 BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
 BuildRequires: pkgconfig(sm)
@@ -109,6 +110,9 @@ fi
 %{_mandir}/man1/muffin-*
 
 %changelog
+* Fri May 06 2016 Leigh Scott <leigh123linux@googlemail.com> - 3.0.0-2
+- fix cinnamon crash
+
 * Sun Apr 24 2016 Leigh Scott <leigh123linux@googlemail.com> - 3.0.0-1
 - update to 3.0.0 release