diff options
| author | Brian Cameron <Brian.Cameron@sun.com> | 2009-10-26 18:30:43 -0500 |
|---|---|---|
| committer | Brian Cameron <Brian.Cameron@sun.com> | 2009-10-26 18:30:43 -0500 |
| commit | f2b46dd57f3258f2cbd35159ca8bc9d98974ef80 (patch) | |
| tree | 11fa5c01b23aa38bcf6b4eeb8ac04b9376619aa6 | |
| parent | 75e85b769a6548212a7d10500b0487e513f888cb (diff) | |
| download | gdm-f2b46dd57f3258f2cbd35159ca8bc9d98974ef80.tar.gz | |
Some minor fixes. Fix gdmflexiserver --help so that it highlights that the
--command option only supports the VERSION command. Fix the at-spi-registryd-wrapper.desktop.in.in file so that it doesn't hardcode /usr/libexec and instead uses "@LIBEXECDIR@. Minor fix to the docs (metacity instead of Metacity).
| -rw-r--r-- | data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in | 2 | ||||
| -rw-r--r-- | docs/C/gdm.xml | 4 | ||||
| -rw-r--r-- | utils/gdmflexiserver.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in b/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in index 9a4a2cb0..c9f62df0 100644 --- a/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in +++ b/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application _Name=AT SPI Registry Wrapper -Exec=/usr/libexec/at-spi-registryd +Exec=@LIBEXECDIR@/at-spi-registryd OnlyShowIn=GNOME; AutostartCondition=GNOME /desktop/gnome/interface/accessibility X-GNOME-Autostart-Phase=Initialization diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml index 0d573567..56d1360f 100644 --- a/docs/C/gdm.xml +++ b/docs/C/gdm.xml @@ -1050,7 +1050,7 @@ PostSession/ greeter. By default, GDM is shipped with files which will autostart the gdm-simple-greeter login GUI greeter itself, the gnome-power-manager application, the gnome-settings-daemon, and the - Metacity window manager. These programs are needed for the greeter + metacity window manager. These programs are needed for the greeter program to work. In addition, desktop files are provided for starting various AT programs if the configuration values specified in the Accessibility Configuration section below are set. @@ -1959,7 +1959,7 @@ AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled <filename><etc>/X11/sessions/</filename>, <filename><dmconfdir>/Sessions</filename>, <filename><share>/xsessions</filename>, and - <filename><share/gdm/BuiltInSessions</filename>. By default the + <filename><share>/gdm/BuiltInSessions</filename>. By default the <filename><dmconfdir></filename> is set to <filename><etc>/dm/</filename> unless GDM is configured to use a different directory via the "--with-dmconfdir" option. diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c index 293c268b..c02976fc 100644 --- a/utils/gdmflexiserver.c +++ b/utils/gdmflexiserver.c @@ -58,7 +58,7 @@ static char **args_remaining = NULL; /* Keep all config options for compatibility even if they are noops */ GOptionEntry options [] = { - { "command", 'c', 0, G_OPTION_ARG_STRING, &send_command, N_("Ignored - retained for compatibility"), N_("COMMAND") }, + { "command", 'c', 0, G_OPTION_ARG_STRING, &send_command, N_("Only the VERSION command is supported"), N_("COMMAND") }, { "xnest", 'n', 0, G_OPTION_ARG_NONE, &use_xnest, N_("Ignored - retained for compatibility"), NULL }, { "no-lock", 'l', 0, G_OPTION_ARG_NONE, &no_lock, N_("Ignored - retained for compatibility"), NULL }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_in, N_("Debugging output"), NULL }, |