Only in /home/nhudson/cvs/gnome-control-center/libgswitchit/: CVS
Only in /home/nhudson/cvs/gnome-control-center/libgswitchit/: .cvsignore
diff -aur /usr/src/control-center-2.5.2/libgswitchit/gswitchit_config.c /home/nhudson/cvs/gnome-control-center/libgswitchit/gswitchit_config.c
--- /usr/src/control-center-2.5.2/libgswitchit/gswitchit_config.c	2004-01-12 13:30:47.000000000 -0600
+++ /home/nhudson/cvs/gnome-control-center/libgswitchit/gswitchit_config.c	2004-01-21 07:15:02.000000000 -0600
@@ -330,8 +330,9 @@
 							    data);
 				*p2 = NULL;
 			}
-			XklDebug (150, "Adding [%s]/%p and [%s]/%p\n", *p1,
-				  *p1, *p2, *p2);
+			XklDebug (150, "Adding [%s]/%p and [%s]/%p\n", 
+				  *p1 ? *p1 : "(nil)", *p1,
+				  *p2 ? *p2 : "(nil)", *p2);
 			p1++;
 			p2++;
 			theLayout = theLayout->next;
@@ -362,7 +363,6 @@
 				   gboolean activate,
 				   const char *psFileName)
 {
-	XkbDescModifierFunc fun = NULL;
 	gboolean rv = FALSE;
 
 	XklConfigRec data;
@@ -371,7 +371,7 @@
 	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
 
 	if (activate) {
-		rv = XklConfigActivate (&data, fun, NULL);
+		rv = XklConfigActivate (&data, NULL);
 	} else {
 		char *home = getenv ("HOME");
 		char xkmFileName[PATH_MAX];
@@ -379,7 +379,7 @@
 		int status;
 		g_snprintf (xkmFileName, sizeof (xkmFileName),
 			    "%s/.gnome_private/xkbpreview.xkm", home);
-		rv = XklConfigWriteXKMFile (xkmFileName, &data, fun, NULL);
+		rv = XklConfigWriteXKMFile (xkmFileName, &data, NULL);
 		if (rv) {
 			g_snprintf (cmd, sizeof (cmd),
 				    "xkbprint -full -color %s %s",
Only in /home/nhudson/cvs/gnome-control-center/libgswitchit/: .indent.pro
Only in /home/nhudson/cvs/gnome-control-center/libgswitchit/: MAINTAINERS
Only in /usr/src/control-center-2.5.2/libgswitchit/: Makefile
Only in /usr/src/control-center-2.5.2/libgswitchit/: Makefile.in
Only in /home/nhudson/cvs/gnome-control-center/libgswitchit/: README.cvs