--- a/ChangeLog	Fri Oct 14 19:58:04 2005 +0000
+++ b/ChangeLog	Sat Oct 15 02:35:28 2005 +0000
@@ -1,3 +1,14 @@
+2005-10-14  Laszlo Peter  <[email protected]>
+
+	* control-center.spec: add patches that stop the mouse and
+	  the keyboard applets crashing.  Most settings still don't
+	  work though.
+	* libgnomeprint.spec: fix crash in papi module when no printers
+	  are defined in printers.conf.
+	* patches/control-center-19-fix-keyboard-dialog.diff: add.
+	* patches/control-center-20-mouse-dialog.diff: add.
+	* patches/libgnomeprint-02-papi-crash.diff: add.
+
 2005-10-14  Laszlo Peter  <[email protected]>
 
 	* firefox.spec: add patch mozilla-config.diff; adds -lxpcom_core to

--- a/control-center.spec	Fri Oct 14 19:58:04 2005 +0000
+++ b/control-center.spec	Sat Oct 15 02:35:28 2005 +0000
@@ -51,6 +51,8 @@
 Patch16:      control-center-16-layout-deletion.diff
 Patch17:      control-center-17-background-crash.diff
 Patch18:      control-center-18-xkb-check-remote-login.diff
+Patch19:      control-center-19-fix-keyboard-dialog.diff
+Patch20:      control-center-20-mouse-dialog.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -123,6 +125,8 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 %ifos linux

--- a/libgnomeprint.spec	Fri Oct 14 19:58:04 2005 +0000
+++ b/libgnomeprint.spec	Sat Oct 15 02:35:28 2005 +0000
@@ -15,6 +15,7 @@
 Summary:      Print Library for the GNOME Desktop
 Source:       http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.12/libgnomeprint-%{version}.tar.bz2
 Patch1:       libgnomeprint-01-Wall.diff
+Patch2        libgnomeprint-02-papi-crash.diff
 Source1:      libgnomeprint-2.2.3.gz
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -63,6 +64,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifos linux
@@ -130,6 +132,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 14 2005 - [email protected]
+- fix crash in papi module when no printers are defined
+
 * Tue Sep 27 2005 - [email protected]
 - Bump to 2.12.1
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-19-fix-keyboard-dialog.diff	Sat Oct 15 02:35:28 2005 +0000
@@ -0,0 +1,12 @@
+--- control-center-2.12.1.orig/capplets/keyboard/gnome-keyboard-properties-xkb.c	2005-10-14 15:22:53.158945000 -0400
++++ control-center-2.12.1/capplets/keyboard/gnome-keyboard-properties-xkb.c	2005-10-14 15:22:20.419499000 -0400
+@@ -69,6 +69,9 @@
+   if (model == NULL)
+     model = initialConfig.model;
+ 
++  if (model == NULL)
++    model = "";
++
+   g_snprintf (ci.name, sizeof (ci.name), "%s", model);
+ 
+   if (XklConfigFindModel (&ci))

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-20-mouse-dialog.diff	Sat Oct 15 02:35:28 2005 +0000
@@ -0,0 +1,11 @@
+--- control-center-2.12.1/capplets/mouse/gnome-mouse-properties.c.orig	2005-10-14 17:56:32.344485000 -0400
++++ control-center-2.12.1/capplets/mouse/gnome-mouse-properties.c	2005-10-14 22:19:56.719084000 -0400
+@@ -556,7 +556,7 @@
+ 
+ 	/* we didn't find it; we add it to the end. */
+ 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+-	cursor_text = g_strdup_printf ("<b>%s</b>\n%s", _("Unknown Cursor"), cursor_font);
++	cursor_text = g_strdup_printf ("<b>%s</b>\n%s", _("Unknown Cursor"), (cursor_font?cursor_font:"(null)"));
+ 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ 			    COLUMN_TEXT, cursor_text,
+ 			    COLUMN_FONT_PATH, cursor_font,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgnomeprint-02-papi-crash.diff	Sat Oct 15 02:35:28 2005 +0000
@@ -0,0 +1,14 @@
+--- libgnomeprint-2.12.1.orig/libgnomeprint/modules/papi/gnome-print-papi.c	2005-10-14 22:01:23.721771000 -0400
++++ libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c	2005-10-14 22:01:59.229528000 -0400
+@@ -686,6 +686,11 @@
+ 			return;
+ 		}
+ 
++		if (!printers) {
++			papiServiceDestroy (service);
++			return;
++		}
++
+ 		for (i = 0; printers[i] != NULL; i++)
+ 			;
+