summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-05-09 21:02:49 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-05-09 21:02:49 +0000
commitce281885c344637abb5201862004b66c93eae6b7 (patch)
tree54134281517e9ab4bac484584b9705459a9dc2e8
parent10e80d631ae96ee9e9e9802e7c925c49a43ec6a6 (diff)
downloadgdm-ce281885c344637abb5201862004b66c93eae6b7.tar.gz
Finally fix bug #340960
2006-05-09 Brian Cameron <brian.cameron@sun.com> * config/ssh.desktop.in.in, po/POTFILES.in, utils/Makefile.am: Finally fix bug #340960
-rw-r--r--ChangeLog5
-rw-r--r--config/ssh.desktop.in.in4
-rw-r--r--po/POTFILES.in3
-rw-r--r--utils/Makefile.am7
4 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 31bb7f24..294f4dd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-05-09 Brian Cameron <brian.cameron@sun.com>
+ * config/ssh.desktop.in.in, po/POTFILES.in, utils/Makefile.am:
+ Finally fix bug #340960
+
+2006-05-09 Brian Cameron <brian.cameron@sun.com>
+
* configure.ac: Fix configure so it puts the right string into
ssh.desktop.in.
* gui/greeter/greeter_geometry.c: Backout change made earlier
diff --git a/config/ssh.desktop.in.in b/config/ssh.desktop.in.in
index 8264e074..e2a128fa 100644
--- a/config/ssh.desktop.in.in
+++ b/config/ssh.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Name=Secure Remote connection
-Comment=This session logs you into a remote host using ssh
+_Name=Secure Remote connection
+_Comment=This session logs you into a remote host using ssh
Exec=@GDMSSHSESSIONCMD@
Type=Application
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78066c85..0f3f7805 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,8 +2,9 @@
# Please keep this file in alphabetical order.
config/CDE.desktop.in
config/default.desktop.in
-config/gettextfoo.h
+config/ssh.desktop.in.in
config/gnome.desktop.in
+config/gettextfoo.h
daemon/auth.c
daemon/display.c
daemon/errorgui.c
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 014cbcb6..5c77c0f3 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -11,8 +11,10 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(UTILS_CFLAGS)
+libexec_SCRIPTS = \
+ @GDMSSHSESSION@
+
libexec_PROGRAMS = \
- @GDMSSHSESSION@ \
@GDMASKPASS@ \
@GDMOPEN@ \
@GDMPREFETCH@ \
@@ -22,7 +24,8 @@ if DMX_SUPPORT
bin_PROGRAMS = gdm-dmx-reconnect-proxy
endif
-EXTRA_PROGRAMS = gdmaskpass gdmopen gdmprefetch
+EXTRA_SCRIPTS = gdm-ssh-session
+EXTRA_PROGRAMS = gdmaskpass gdmopen gdmprefetch
gdmaskpass_SOURCES = \
gdmaskpass.c