[xfwm4] Fix potential crash in xfce4-settings-manager (bugzilla.xfce.org #9108)

[Christoph Wickert]

commit 2e5bbe599beeb339aec0fd001bd043b7c254bdab
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Oct 6 21:57:42 2012 +0200

    Fix potential crash in xfce4-settings-manager (bugzilla.xfce.org #9108)

 xfwm4-4.10.0-wrong-title-alignment.patch |   40 ++++++++++++++++++++++++++++++
 xfwm4.spec                               |   24 ++++++++++++------
 2 files changed, 56 insertions(+), 8 deletions(-)
---
diff --git a/xfwm4-4.10.0-wrong-title-alignment.patch b/xfwm4-4.10.0-wrong-title-alignment.patch
new file mode 100644
index 0000000..12702c2
--- /dev/null
+++ b/xfwm4-4.10.0-wrong-title-alignment.patch
@@ -0,0 +1,40 @@
+From f09ea920648d4414c747d390d7cfb2aed230c1e7 Mon Sep 17 00:00:00 2001
+From: Mike Massonnet <mmassonnet at xfce.org>
+Date: Sun, 15 Jul 2012 17:28:15 +0000
+Subject: Fix crash in settings dialog with wrong title alignment value (bug #9108)
+
+---
+diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
+index 711bce0..212e4e7 100644
+--- a/settings-dialogs/xfwm4-settings.c
++++ b/settings-dialogs/xfwm4-settings.c
+@@ -1591,17 +1591,19 @@ xfwm_settings_title_button_alignment_changed (GtkComboBox *combo,
+   float         align = 0.5f;
+ 
+   model = gtk_combo_box_get_model (combo);
+-  gtk_combo_box_get_active_iter (combo, &iter);
+-  gtk_tree_model_get (model, &iter, 1, &value, -1);
++  if (gtk_combo_box_get_active_iter (combo, &iter))
++    {
++      gtk_tree_model_get (model, &iter, 1, &value, -1);
+ 
+-  if (g_str_equal (value, "left"))
+-    align = 0.0f;
+-  else if (g_str_equal (value, "right"))
+-    align = 1.0f;
++      if (g_str_equal (value, "left"))
++        align = 0.0f;
++      else if (g_str_equal (value, "right"))
++        align = 1.0f;
+ 
+-  gtk_button_set_alignment (GTK_BUTTON (button), align, 0.5f);
++      g_free (value);
++    }
+ 
+-  g_free (value);
++  gtk_button_set_alignment (GTK_BUTTON (button), align, 0.5f);
+ }
+ 
+ 
+--
+cgit v0.9.0.3
diff --git a/xfwm4.spec b/xfwm4.spec
index 9b849dc..24c8363 100644
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -2,7 +2,7 @@
 
 Name:           xfwm4
 Version:        4.10.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Next generation window manager for Xfce
 
 Group:          User Interface/Desktops
@@ -10,12 +10,16 @@ License:        GPLv2+
 URL:            http://www.xfce.org/
 #VCS git:git://git.xfce.org/xfce/xfwm4
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+# Fix window grabbing with gtk3 windows (#845272=
+# Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=8949
+# Upstream fix: http://git.xfce.org/xfce/xfwm4/commit/?id=0b39bbe0
+Patch0:         xfwm4-4.10.0-gtk3-windows.patch
+# Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=9108
+# Upstream fix: http://git.xfce.org/xfce/xfwm4/commit/?id=f09ea920
+Patch1:         xfwm4-4.10.0-wrong-title-alignment.patch
+## Downstream patches:
 # Fix desktop categories
-Patch1:         xfwm4-4.9.0-desktop-fix.patch
-# Fix window grabbing with gtk3 windows
-# Already upstream in commit: 
-# http://git.xfce.org/xfce/xfwm4/patch/?id=0b39bbe0b3b5bf514dea223ec96cd25ea4e1444f
-Patch2:		xfwm4-4.10.0-gtk3-windows.patch
+Patch10:         xfwm4-4.9.0-desktop-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@@ -36,8 +40,9 @@ xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1 -b .gtk3
+%patch1 -p1 -b .title-alignment
+%patch10 -p1 -b .categories
 
 
 %build
@@ -92,6 +97,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Oct 06 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-4
+- Fix potential crash in xfce4-settings-manager (bugzilla.xfce.org #9108)
+
 * Sat Aug 11 2012 Kevin Fenzi <kevin at scrye.com> - 4.10.0-3
 - Add patch to fix grabbing on gtk3 apps. Fixes bug #845272