[xfce4-xkb-plugin] - Fix segfault when adding a second keymap. Thanks to Lionel Le Folgoc (#597207)

[François Cami]

commit 84aa091b8547b4178781d200f46b42cc148ea1fa
Author: François Cami <fcami at fedoraproject.org>
Date:   Thu Nov 25 21:08:48 2010 +0100

    - Fix segfault when adding a second keymap. Thanks to Lionel Le Folgoc (#597207)

 ...lugin-0.5.3.3-fix-segfault-in-kb-selector.patch |   20 ++++++++++++++++++++
 xfce4-xkb-plugin.spec                              |    7 ++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch b/xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch
new file mode 100644
index 0000000..eaaec54
--- /dev/null
+++ b/xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch
@@ -0,0 +1,20 @@
+@@ -, +, @@ 
+ panel-plugin/xkb-settings-dialog.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+--- a/panel-plugin/xkb-settings-dialog.c	
++++ a/panel-plugin/xkb-settings-dialog.c	
+@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb)
+     gint i = 0;
+ 
+     model = GTK_TREE_MODEL (xkb->combo_store);
+-    gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
+-    gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
+-    kbd_config->model = kbdmodel;
++    if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter))
++    {
++        gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
++        kbd_config->model = kbdmodel;
++    }
+ 
+     model = GTK_TREE_MODEL (xkb->toggle_options_store);
+     if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))
diff --git a/xfce4-xkb-plugin.spec b/xfce4-xkb-plugin.spec
index 4d43c40..46d6587 100644
--- a/xfce4-xkb-plugin.spec
+++ b/xfce4-xkb-plugin.spec
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.5.3.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@ Patch1:		xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=525471
 # fix at http://bugzilla.xfce.org/show_bug.cgi?id=6122#c1
 Patch2:		xfce4-xkb-plugin-0.5.3.3-fix-various-segfaults.patch
+Patch3:		xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
@@ -29,6 +30,7 @@ XF86Config file or some other way (e.g. setxkbmap).
 %prep
 %setup -q
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .segfault-in-kb-selector
 # Fedora > 11 has libxklavier 4.0
 %if 0%{?fedora} > 11
 %patch0 -p1 -b .xklavier4
@@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Fri Nov 25 2010 François Cami <fcami at fedoraproject.org> - 0.5.3.3-4
+- Fix segfault when adding a second keymap. Thanks to Lionel Le Folgoc (#597207)
+
 * Fri Feb 12 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-3
 - Fix various segfaults. Thanks to Lionel Le Folgoc (#525471, #547553)