poor message about "the x keyboard settings differ from your current gnome keyboard settings"

[Martin Pool]

I configured my console to use a Dvorak keyboard and then installed ubuntu-desktop. When I log in through gnome I get an error saying that the gnome and x settings are different. (It would be nice if the gnome default automatically matched, but that might be my fault for installing feisty in a nonstandard way.)

The problem is that the message is phrased as "expected was XXX, but the following settings were found: YYY. Which set would you like to use? Use X settings / Keep GNOME settings" It is not clear whether the XXX setting is the current configuration of X or of Gnome. It would be enough to say: "X settings: XXX; GNOME settings YYY" or something.

[Chris Wagner (chris-wagner)]

Oops - I just updated that description because I thought I was the original reporter. :-/

[Markus Kienast (elias1884)]

I fully agree that the phrasing is misleading or at least confusing! I still don't know what I am supposed to click there in order to get things fixed.

[Chris Wagner (chris-wagner)]

I've attached a debdiff that should make the error message a little more clear.

I've subscribed ubuntu-main-sponsors. I know this is a petty change :) ... but I wanted to have some fun and try to make a change/fix that makes it into the distro.

Please let me know if you think this patch is satisfactory, and I will pass it upstream to Gnome.

[Chris Wagner (chris-wagner)]

Ah - and this should take care of #78446, as well.

[Daniel Holbach (dholbach)]

Can you try to attach the patch again? Somehow it was added as text/html and is somewhat unreadable.

[Sebastien Bacher (seb128)]

I've fixed the mimetype for the attachment

[Chris Wagner (chris-wagner)]

Yes, I noticed that it was rendering as HTML in my browser... I thought that it may have simply been on my end. Did I do something wrong when uploading the patch?

Anyway, Sebastien seems to have fixed it. Let me know if you need anything else.

[Daniel Holbach (dholbach)]

Can this bug be closed now?

[Chris Wagner (chris-wagner)]

Was the patch applied?

[Sebastien Bacher (seb128)]

no, the patch has not been applied, it should rather be sent upstream we don't wan to do this change in a distribution specific way

[Chris Wagner (chris-wagner)]

Okay -- I sent the patch upstream. Should we unsubscribe ubuntu-sponsors-main, now?

[Sebastien Bacher (seb128)]

let's wait to see what upstream thinks of the change, no need to subscribe sponsors

[Chris Wagner (chris-wagner)]

On Sat, 2007-09-01 at 22:31 +0000, Sebastien Bacher wrote:
> let's wait to see what upstream thinks of the change, no need to
> subscribe sponsors

No need to *subscribe* sponsors? Or, no need to *unsubscribe* sponsors?
I think ubuntu-main-sponsors is already subscribed (?).

[Sebastien Bacher (seb128)]

the sponsors are unsubscribed now

[Sebastien Bacher (seb128)]

The dialog has been removed upstream now

[Sebastien Bacher (seb128)]

gnome-control-center (1:2.21.2-0ubuntu1) hardy; urgency=low

  * New upstream version:
    about-me:
    - Add another string to the list of recognized error returns from passwd
    - Don't get confused when the user does not have a password set and passwd
      immediately asks for the new one
    appearance:
    - Fix build without libXcursor
    - Be more careful when reading background information from GConf and
      make sure we don't choke on NULL values later on
    keyboard:
    - Fix warnings and don't use deprecated signal API from GTK
    - Move layout options to separate popup
    - Rename first tab to "General"
    - Replace text entry and "Choose.." button for keyboard model with a
      single chooser button
    - Don't include keyboard model description in Glade file
    localization:
    - Added (very basic skeleton of) localization capplet
    shell:
    - Remove reference to non-existing background.desktop
    settings daemon:
    - Make composited media popup window sizes scale with the screen size
    common:
    - Remove more redundant info from the theme changed callback
    updated translations
    appearance:
    - Unify "invalid theme" error messages and be a bit more verbose
    - Reword the "theme engine" error message
    - Add support for dragging images from the background list
    - Make theme sorting case insensitive
    - Fix crash if we fail to convert a filename to UTF-8
    - Use NoDisplay=true instead of OnlyShowIn=; (LP: #152453)
    - Return a new theme instead of munging whatever got passed in
    - Take cursor size into account when comparing themes
    - Watch cursor theme/size GConf keys for changes
    - Move cursor size widget initialization to Glade, to allow the slider to
      be updated properly on startup
    - Make the cursor themes delete button works
    - If the parent directory is empty after deleting a theme, delete the
      parent directory too
    - Update cursor size GConf value when the theme changes
    - Reduce number of XCURSOR ifdefs and get rid of the special treatment for
      the default cursor theme
    - Add support for live cursor theme updates
    - Read gettext macro that accidentally got stripped
    - Prevent lots of thumbs from being created with the color scheme of the
      currently active theme
    - Actually remove theme data from the hash when the theme gets deleted
    - Fix the cursor size only being updated if the cursor theme changed too
    - Watch /usr/share/cursors/xorg-x11 for cursor themes
    - Teach the installer to recognize cursor themes and icon themes with
      cursors
    - Check whether there are multiple themes to install up front
    at-properties:
    - Don't use 'Preferences' word for application name
    default applications:
    - Make the accelerators for the A11Y tools page unique
    - Replace mail and multimedia icon names with Tangoified versions
    - Use standard xdg autostart directory instead of GNOME one
    - Replace obsolete 'orca -m' command with new 'orca -e magnifier'
    display:
    - Code cleanup and fix a few leaks
    - fix string capitalization
    fontilus:
    - Drop "GNOME" from the menu item name as recommended...