gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-05-30 00:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix DRA-14441

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/ec/trunk@36466 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-04-05 09:56:18 +00:00
parent 5b902f7567
commit cbc73abcf6
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,8 +1,15 @@
2013-04-05 Richard Frith-Macdonald <rfm@gnu.org>
* EcControl.m: Fix to get 'control on <host> ...' to work while
connected to a specific server.
2013-03-22: Niels Grewe <niels.grewe@halbordnung.de>
* EcControl.m: Fix bug that could remove a alerter when it was still
needed.
2013-03-18: Niels Grewe <niels.grewe@halbordnung.de>
* EcAlerter.h
* EcAlerter.m:
Rearrange and expose a few methods so that subclasses can

5
EcCommand.m
View file

@ -1099,8 +1099,9 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
{
NSString *m;
m = cmdLogFormat(LT_ERROR, @"command to unregistered client");
[self information: m
m = [NSString stringWithFormat:
@"command to unregistered client '%@'", t];
[self information: cmdLogFormat(LT_ERROR, m)
from: nil
to: f
type: LT_ERROR];

20
EcControl.m
View file

@ -592,9 +592,8 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
{
connected = YES;
}
/*
* If we have a 'control' command - act as if the console was not
* connected to a host or server.
/* If we have a 'control' command - act as if the console was not
* connected to a host or server.
*/
if (comp(wd, @"control") == 0)
{
@ -694,9 +693,8 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
{
NSArray *hosts;
/*
* Make an array of hosts to work with - the connected host
* or all hosts. If the connected host has gone away - disconnect.
/* Make an array of hosts to work with - the connected host
* or all hosts. If the connected host has gone away - disconnect.
*/
if (hname == nil)
{
@ -734,10 +732,10 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
BOOL foundServer = NO;
int i;
m = nil; /* Let connected host generate messages. */
/*
* Perform operation on connected host (or all hosts if
* not connected to a host).
m = nil; /* Let remote host generate messages. */
/* Perform operation on connected host (or all hosts if
* not connected to a host).
*/
for (i = 0; i < [hosts count]; i++)
{
@ -745,7 +743,7 @@ static NSString* cmdWord(NSArray* a, unsigned int pos)
if ([commands indexOfObjectIdenticalTo: c] != NSNotFound)
{
if ([console cserv] == nil)
if (NO == connected || [console cserv] == nil)
{
foundServer = YES;
NS_DURING