From 201c8bd294a19df4cb22cc4db61431485549034c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 24 Mar 2010 20:49:39 +0000
Subject: [PATCH] fix a crash

---
 libgnomekbd-style-ref.patch | 12 ++++++++++++
 libgnomekbd.spec            | 12 ++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 libgnomekbd-style-ref.patch

diff --git a/libgnomekbd-style-ref.patch b/libgnomekbd-style-ref.patch
new file mode 100644
index 0000000..debd30e
--- /dev/null
+++ b/libgnomekbd-style-ref.patch
@@ -0,0 +1,12 @@
+diff -up libgnomekbd-2.29.92/libgnomekbd/gkbd-indicator-config.c.style-ref libgnomekbd-2.29.92/libgnomekbd/gkbd-indicator-config.c
+--- libgnomekbd-2.29.92/libgnomekbd/gkbd-indicator-config.c.style-ref	2010-03-24 16:27:48.752881352 -0400
++++ libgnomekbd-2.29.92/libgnomekbd/gkbd-indicator-config.c	2010-03-24 16:28:07.675886171 -0400
+@@ -174,8 +174,6 @@ gkbd_indicator_config_load_font_from_gco
+ 				      green) / 0x10000,
+ 				     ((double) style->fg[GTK_STATE_NORMAL].
+ 				      blue) / 0x10000);
+-
+-		g_object_unref (style);
+ 	}
+ }
+ 
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 567a935..a06a293 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,15 +1,14 @@
 Name:           libgnomekbd
 Version:        2.29.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
+# VCS: git:git://git.gnome.org/libgnomekbd
 Source0:        http://download.gnome.org/sources/libgnomekbd/2.28/libgnomekbd-%{version}.tar.bz2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  dbus-devel >= 0.92
 BuildRequires:  dbus-glib >= 0.34
 BuildRequires:  GConf2-devel >= 2.14.0
@@ -27,6 +26,8 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=613842
+Patch0: libgnomekbd-style-ref.patch
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -61,7 +62,7 @@ of the keyboard indicator applet.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .style-ref
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -132,6 +133,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Wed Mar 24 2010 Matthias Clasen <mclasen@redhat.com> 2.29.92-2
+- Fix a crash in the keyboard indicator
+
 * Tue Mar 09 2010 Bastien Nocera <bnocera@redhat.com> 2.29.92-1
 - Update to 2.29.92