rpms/gok/devel gok-1.0.5-crash.patch,NONE,1.1 gok.spec,1.24,1.25

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13838

Modified Files:
	gok.spec 
Added Files:
	gok-1.0.5-crash.patch 
Log Message:
Fix a crash


gok-1.0.5-crash.patch:
 gok-data.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE gok-1.0.5-crash.patch ---
--- gok-1.0.5/gok/gok-data.c.crash	2005-11-21 23:06:28.000000000 -0500
+++ gok-1.0.5/gok/gok-data.c	2005-11-21 23:07:17.000000000 -0500
@@ -240,10 +240,11 @@
         gok_gconf_get_string (gconf_client, GOK_GCONF_AUX_DICTS, 
 			         &m_AuxDicts);
 
-	gok_gconf_get_string (gconf_client, GOK_GCONF_DOCK_TYPE,
-			      &a_gchar);
-        m_eDockType = gok_data_dock_type_from_string (a_gchar);
-	g_free (a_gchar);
+	if (gok_gconf_get_string (gconf_client, GOK_GCONF_DOCK_TYPE,
+			      &a_gchar)) { 
+            m_eDockType = gok_data_dock_type_from_string (a_gchar);
+	    g_free (a_gchar);
+        }
 
 	gok_gconf_get_string (gconf_client, GOK_GCONF_COMPOSE_KBD_TYPE,
 			      &a_gchar);


Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gok.spec	21 Nov 2005 18:45:17 -0000	1.24
+++ gok.spec	22 Nov 2005 04:12:53 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 1.0.5
-Release: 5
+Release: 6
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -12,6 +12,7 @@
 Patch2: gok-0.10.2-launcher.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=322062
 Patch3: gok-1.0.5-realloc.patch
+Patch4: gok-1.0.5-crash.patch
 
 PreReq:         scrollkeeper >= 0.1.4
 PreReq:		at-spi
@@ -50,6 +51,7 @@
 %setup -q
 %patch2 -p1 -b .launcher
 %patch3 -p1 -b .realloc
+%patch4 -p1 -b .crash
 
 %build
 %configure
@@ -105,6 +107,9 @@
 
 %changelog
 * Mon Nov 21 2005 Matthias Clasen <mclasen at redhat.com>
+- don't crash when getting unexpected values from gconf
+
+* Mon Nov 21 2005 Matthias Clasen <mclasen at redhat.com>
 - fix memory handling errors 
 
 * Fri Nov 18 2005 Bill Nottingham <notting at redhat.com>