xserver: Branch 'master' - 2 commits
Julien Cristau
jcristau at kemper.freedesktop.org
Tue Dec 25 17:13:48 PST 2007
config/hal.c | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 009f1e4e55200425de2fe0dbc1f0ac0f431fb4cf
Author: Fatih AÅıcı <fatih at pardus.org.tr>
Date: Tue Dec 25 23:09:49 2007 +0200
Config: Don't forget to add xkb_rules option
diff --git a/config/hal.c b/config/hal.c
index 45238c0..af96fc2 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -221,6 +221,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
goto unwind;
sprintf(config_info, "hal:%s", udi);
+ if (xkb_rules)
+ add_option(&options, "xkb_rules", xkb_rules);
if (xkb_model)
add_option(&options, "xkb_model", xkb_model);
if (xkb_layout)
commit 389e8917f66a489455f1d5c70f44c262717538ad
Author: Fatih AÅıcı <fatih at pardus.org.tr>
Date: Tue Dec 25 22:59:24 2007 +0200
Config: Fix a memory leak
diff --git a/config/hal.c b/config/hal.c
index 4427deb..45238c0 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -251,6 +251,8 @@ unwind:
xfree(xkb_model);
if (xkb_layout)
xfree(xkb_layout);
+ if (xkb_variant)
+ xfree(xkb_variant);
if (xkb_options)
xfree(xkb_options);
if (config_info)
More information about the xorg-commit
mailing list