Bug#461475: gnome-session: prompt about differing x keyboard and gnome keyboard settings

[Jon Dowland]

Package: gnome-session
Version: 2.20.2-1
Severity: normal

I get this on every login:

    The X system keyboard settings differ from your current
    GNOME keyboard settings.

    Expected was model "generic", layout "us" and no
    options, but the the following settings were found:
    model "pc105", layout "gb" and no options.

    Which set would you like to use?

jon at qusp:~$ gconftool-2 -a /desktop/gnome/peripherals/keyboard/kbd.sysbackup
 layouts = [us]
 model = generic
jon at qusp:~$ gconftool-2 -a /desktop/gnome/peripherals/keyboard/kbd
 layouts = []
 model = 
 overrideSettings = true
 options = []

Despite this, in the keyboard preferences dialogue, under
layouts, I have just "United Kingdom" and it is selected as
the default, and standard intl 105 key pc as the model.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-3-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages gnome-session depends on:
ii  gconf2                      2.20.1-2     GNOME configuration database syste
ii  gnome-control-center        1:2.20.1-2   utilities to configure the GNOME d
ii  libatk1.0-0                 1.20.0-1     The ATK accessibility toolkit
ii  libbonobo2-0                2.20.2-1     Bonobo CORBA interfaces library
ii  libc6                       2.7-5        GNU C Library: Shared libraries
ii  libesd0                     0.2.36-3     Enlightened Sound Daemon - Shared 
ii  libgconf2-4                 2.20.1-2     GNOME configuration database syste
ii  libglib2.0-0                2.14.4-2     The GLib library of C routines
ii  libgnome-keyring0           2.20.2-1     GNOME keyring services library
ii  libgnome2-0                 2.20.1.1-1   The GNOME 2 library - runtime file
ii  libgnomeui-0                2.20.1.1-1   The GNOME 2 libraries (User Interf
ii  libgtk2.0-0                 2.12.3-2     The GTK+ graphical user interface 
ii  libice6                     2:1.0.4-1    X11 Inter-Client Exchange library
ii  liborbit2                   1:2.14.7-0.1 libraries for ORBit2 - a CORBA ORB
ii  libpango1.0-0               1.18.3-1     Layout and rendering of internatio
ii  libsm6                      2:1.0.3-1+b1 X11 Session Management library
ii  libwrap0                    7.6.dbs-14   Wietse Venema's TCP wrappers libra
ii  libx11-6                    2:1.0.3-7    X11 client-side library
ii  libxau6                     1:1.0.3-2    X11 authorisation library
ii  libxrandr2                  2:1.2.2-1    X11 RandR extension library

Versions of packages gnome-session recommends:
ii  dbus                          1.1.2-1    simple interprocess messaging syst
ii  gnome-panel                   2.20.2-2   launcher and docking facility for 
ii  metacity                      1:2.20.1-1 A lightweight GTK2 based Window Ma
ii  nautilus                      2.20.0-2   file manager and graphical shell f

-- no debconf information