From: grzegol <grzegol@pld-linux.org>
Date: Thu, 29 Jan 2004 23:18:02 +0000 (+0000)
Subject: - fix building with libxklavier-0.97
X-Git-Tag: auto/ac/control-center-2_6_0_3-1~7
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=cfd179f807fef9f88d255f39acbbe7acec133019;p=packages%2Fcontrol-center.git

- fix building with libxklavier-0.97

Changed files:
    control-center-libxklavier.patch -> 1.1
---

diff --git a/control-center-libxklavier.patch b/control-center-libxklavier.patch
new file mode 100644
index 0000000..ac48f6c
--- /dev/null
+++ b/control-center-libxklavier.patch
@@ -0,0 +1,29 @@
+diff -urN aa/control-center-2.5.2/libgswitchit/gswitchit_config.c control-center-2.5.2/libgswitchit/gswitchit_config.c
+--- aa/control-center-2.5.2/libgswitchit/gswitchit_config.c	2004-01-12 20:30:47.000000000 +0100
++++ control-center-2.5.2/libgswitchit/gswitchit_config.c	2004-01-29 23:46:29.523783336 +0100
+@@ -362,7 +362,6 @@
+ 				   gboolean activate,
+ 				   const char *psFileName)
+ {
+-	XkbDescModifierFunc fun = NULL;
+ 	gboolean rv = FALSE;
+ 
+ 	XklConfigRec data;
+@@ -371,7 +370,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 +378,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",