diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-05-09 20:14:55 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-05-09 20:14:55 +0000 |
| commit | 2ba03c9f26e659adf3fb1c231c18e4b1ee1ac953 (patch) | |
| tree | b1dc4c2708a123b32957c96b0a86c7b92fcafac0 | |
| parent | 30842d72b44554d1823241367b82b59ef8487109 (diff) | |
| download | gdm-2ba03c9f26e659adf3fb1c231c18e4b1ee1ac953.tar.gz | |
Fix configure so it puts the right string into ssh.desktop.in, Backout
2006-05-09 Brian Cameron <brian.cameron@sun.com>
* configure.ac, gui/greeter/greeter_geometry.c: Fix configure
so it puts the right string into ssh.desktop.in,
* gui/greeter/greeter_geometry.c: Backout change made on
05/08, since it was broken.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gui/greeter/greeter_geometry.c | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2006-05-09 Brian Cameron <brian.cameron@sun.com> + * configure.ac, gui/greeter/greeter_geometry.c: Fix configure + so it puts the right string into ssh.desktop.in, + * gui/greeter/greeter_geometry.c: Backout change made on + 05/08, since it was broken. + +2006-05-09 Brian Cameron <brian.cameron@sun.com> + * config/ssh.desktop.in.in: Added new file. * config/ssh.desktop.in: Remove old file. * config/.cvsignore: Added generated ssh.desktop.in file. diff --git a/configure.ac b/configure.ac index d8079a27..e7dae38a 100644 --- a/configure.ac +++ b/configure.ac @@ -864,7 +864,7 @@ fi if test x$enable_secureremote != xno ; then SSHDESKTOP="ssh.desktop" GDMSSHSESSION="gdm-ssh-session" - GDMSSHSESSIONCMD='${libexecdir}/gdm-ssh-session' + GDMSSHSESSIONCMD="${libexecdir}/gdm-ssh-session" fi AC_SUBST(SSHDESKTOP) AC_SUBST(GDMSSHSESSION) diff --git a/gui/greeter/greeter_geometry.c b/gui/greeter/greeter_geometry.c index cadab244..88155ce6 100644 --- a/gui/greeter/greeter_geometry.c +++ b/gui/greeter/greeter_geometry.c @@ -168,10 +168,6 @@ greeter_size_allocate_fixed (GreeterItemInfo *fixed, if (child->item_type != GREETER_ITEM_TYPE_LABEL) fixup_from_anchor (&child_allocation, child->anchor); - if (child_allocation.x + child_allocation.width > allocation->x + allocation->width) - child_allocation.width -= (child_allocation.x + child_allocation.width - - allocation->x - allocation->width); - greeter_item_size_allocate (child, &child_allocation, canvas); |