old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wed Jul 3 13:49:27 2002 Michael Jennings (mej) 

Fixed a bug in libscream that caused remote screen sessions to be
resumed with, e.g., "-e ^Uu_" instead of "-e ^Uu".

Applied a bug fix from Bill Allombert <allomber@math.u-bordeaux.fr>
where I was using the wrong variable for loading the icon file from
disk.

Also fixed a problem where PrintScreen would cause Eterm to exit.
Pointed out by Laurence J. Lane <ljlane@debian.org>.


SVN revision: 6336
This commit is contained in:
Michael Jennings 2002-07-03 17:55:48 +00:00
parent 3649b3a00c
commit 0db3598235
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -4751,3 +4751,15 @@ Fri Jun 28 17:02:57 2002 Michael Jennings (mej)
One too many....
----------------------------------------------------------------------
Wed Jul 3 13:49:27 2002 Michael Jennings (mej)
Fixed a bug in libscream that caused remote screen sessions to be
resumed with, e.g., "-e ^Uu_" instead of "-e ^Uu".
Applied a bug fix from Bill Allombert <allomber@math.u-bordeaux.fr>
where I was using the wrong variable for loading the icon file from
disk.
Also fixed a problem where PrintScreen would cause Eterm to exit.
Pointed out by Laurence J. Lane <ljlane@debian.org>.
----------------------------------------------------------------------

7
src/command.c
View File

@ -1045,15 +1045,16 @@ handle_child_signal(int sig)
/* If the child that exited is the command we spawned, or if the
child exited before fork() returned in the parent, it must be
our immediate child that exited. We exit gracefully. */
if ((pid == cmd_pid && cmd_pid != -1)
|| (pid == -1 && errno == ECHILD && cmd_pid != -1)
|| (pid == 0)) {
if (((pid == cmd_pid) && (cmd_pid != -1))
|| ((pid == -1) && (errno == ECHILD) && (cmd_pid != -1))
|| ((pid == 0) && (cmd_pid != -1) && ((kill(cmd_pid, 0)) < 0))) {
if (Options & Opt_pause) {
paused = 1;
return;
}
exit(EXIT_SUCCESS);
}
errno = save_errno;
D_CMD(("handle_child_signal: installing signal handler\n"));

2
src/libscream.c
View File

@ -1062,7 +1062,7 @@ ns_attach_ssh(_ns_sess ** sp)
{
_ns_sess *sess;
char cmd[NS_MAXCMD + 1];
char esc[] = " -e^___";
char esc[] = " -e^\0\0\0";
char *call, *p;
int ret;

4
src/pixmap.c
View File

@ -2151,9 +2151,9 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
XIconSize *icon_sizes;
int count, i;
temp_im = imlib_load_image_with_error_return(filename, &im_err);
temp_im = imlib_load_image_with_error_return(icon_path, &im_err);
if (temp_im == NULL) {
print_error("Unable to load icon file \"%s\" -- %s\n", filename, imlib_strerror(im_err));
print_error("Unable to load icon file \"%s\" -- %s\n", icon_path, imlib_strerror(im_err));
} else {
/* If we're going to render the image anyway, might as well be nice and give it to the WM in a size it likes. */
if (XGetIconSizes(Xdisplay, Xroot, &icon_sizes, &count)) {