diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-24 13:27:45 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-24 13:27:45 +0800 |
| commit | be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6 (patch) | |
| tree | d280b106176ab3b2f239eb32cee0588b7702cb5e /sysutils | |
| parent | 6a32472c94728587c57be6b65d824d92678381f2 (diff) | |
| download | marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.tar marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.tar.gz marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.tar.bz2 marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.tar.lz marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.tar.xz marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.tar.zst marcuscom-ports-be5f2bbc8f0d08807c6d35ea76fb41f497e10eb6.zip | |
Complete the merge from GNOME CVS to fix the build with the new libxklavier.
The previous patch still had an old function in it.
Reported by: mezz
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3126 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c | 17 | ||||
| -rw-r--r-- | sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c | 17 |
2 files changed, 24 insertions, 10 deletions
diff --git a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c b/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c index 8eeb90fb3..02e95c1e6 100644 --- a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c +++ b/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_config.c @@ -1,5 +1,5 @@ ---- libgswitchit/gswitchit_config.c.orig Tue Nov 23 23:22:30 2004 -+++ libgswitchit/gswitchit_config.c Tue Nov 23 23:29:11 2004 +--- libgswitchit/gswitchit_config.c.orig Thu Oct 14 14:44:52 2004 ++++ libgswitchit/gswitchit_config.c Wed Nov 24 00:26:59 2004 @@ -380,44 +380,6 @@ } @@ -45,13 +45,20 @@ _GSListStrEqual (GSList * l1, GSList * l2) { if (l1 == l2) -@@ -752,7 +714,16 @@ +@@ -752,15 +714,16 @@ gboolean GSwitchItXkbConfigActivate (GSwitchItXkbConfig * xkbConfig) { - return _GSwitchItXkbConfigDoWithSettings (xkbConfig, TRUE, NULL); +-} + gboolean rv = FALSE; -+ + +-gboolean +-GSwitchItXkbConfigDumpSettings (GSwitchItXkbConfig * xkbConfig, +- const char *fileName) +-{ +- return _GSwitchItXkbConfigDoWithSettings (xkbConfig, FALSE, +- fileName); + XklConfigRec data; + XklConfigRecInit (&data); + @@ -62,4 +69,4 @@ + return rv; } - gboolean + void diff --git a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c b/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c index 8eeb90fb3..02e95c1e6 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c +++ b/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_config.c @@ -1,5 +1,5 @@ ---- libgswitchit/gswitchit_config.c.orig Tue Nov 23 23:22:30 2004 -+++ libgswitchit/gswitchit_config.c Tue Nov 23 23:29:11 2004 +--- libgswitchit/gswitchit_config.c.orig Thu Oct 14 14:44:52 2004 ++++ libgswitchit/gswitchit_config.c Wed Nov 24 00:26:59 2004 @@ -380,44 +380,6 @@ } @@ -45,13 +45,20 @@ _GSListStrEqual (GSList * l1, GSList * l2) { if (l1 == l2) -@@ -752,7 +714,16 @@ +@@ -752,15 +714,16 @@ gboolean GSwitchItXkbConfigActivate (GSwitchItXkbConfig * xkbConfig) { - return _GSwitchItXkbConfigDoWithSettings (xkbConfig, TRUE, NULL); +-} + gboolean rv = FALSE; -+ + +-gboolean +-GSwitchItXkbConfigDumpSettings (GSwitchItXkbConfig * xkbConfig, +- const char *fileName) +-{ +- return _GSwitchItXkbConfigDoWithSettings (xkbConfig, FALSE, +- fileName); + XklConfigRec data; + XklConfigRecInit (&data); + @@ -62,4 +69,4 @@ + return rv; } - gboolean + void |