[PATCH keyboard 4/4] Do not print values of Protocol twice

Peter Hutterer peter.hutterer at who-t.net
Sun Feb 13 16:13:35 PST 2011


On Fri, Feb 11, 2011 at 03:33:00PM +0500, Alexandr Shadchin wrote:
> Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
> ---
>  src/bsd_kbd.c |    1 -
>  src/lnx_kbd.c |    1 -
>  2 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
> index 1e432fd..710470a 100644
> --- a/src/bsd_kbd.c
> +++ b/src/bsd_kbd.c
> @@ -357,7 +357,6 @@ OpenKeyboard(InputInfoPtr pInfo)
>             free(s);
>             return FALSE;
>      }
> -    xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, s);
>      free(s);
>  
>      s = xf86SetStrOption(pInfo->options, "Device", NULL);
> diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
> index 5292f77..e69e1b6 100644
> --- a/src/lnx_kbd.c
> +++ b/src/lnx_kbd.c
> @@ -183,7 +183,6 @@ OpenKeyboard(InputInfoPtr pInfo)
>             return FALSE;
>      }
>  
> -    xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, s);
>      free(s);
>  
>      s = xf86SetStrOption(pInfo->options, "Device", NULL);
> -- 
> 1.7.3.5

I've added "Protocol printed when found in xf86SetStrOption()" to the commit
message so it is clear why the value was printed twice before.

Thanks for the other patches, I merged 1, 3, and 4. please send me an
updated 2.
 
Cheers,
  Peter


More information about the xorg-devel mailing list