Author: wlux
Date: Sun Nov 2 23:19:54 2014
New Revision: 38152
URL: http://svn.gna.org/viewcvs/gnustep?rev=38152&view=rev
Log:
Correctly initialize the scripting language used in a remote conversation.
Modified:
libs/steptalk/trunk/ChangeLog
libs/steptalk/trunk/Frameworks/StepTalk/STRemoteConversation.m
Modified: libs/steptalk/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/steptalk/trunk/ChangeLog?rev=38152&r1=38151&r2=38152&view=diff
==============================================================================
--- libs/steptalk/trunk/ChangeLog (original)
+++ libs/steptalk/trunk/ChangeLog Sun Nov 2 23:19:54 2014
@@ -1,3 +1,10 @@
+2014-11-02 Wolfgang Lux <[email protected]>
+
+ * Frameworks/StepTalk/STRemoteConversation.m
+ (-initWithEnvironmentName:host:language:, -open,
+ -setLanguage:, -language): Correctly initialize the scripting
+ language used in a remote conversation.
+
2014-11-02 Wolfgang Lux <[email protected]>
* Frameworks/StepTalk/STRemoteConversation.m (-open): Force use of
Modified: libs/steptalk/trunk/Frameworks/StepTalk/STRemoteConversation.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/steptalk/trunk/Frameworks/StepTalk/STRemoteConversation.m?rev=38152&r1=38151&r2=38152&view=diff
==============================================================================
--- libs/steptalk/trunk/Frameworks/StepTalk/STRemoteConversation.m
(original)
+++ libs/steptalk/trunk/Frameworks/StepTalk/STRemoteConversation.m Sun Nov
2 23:19:54 2014
@@ -25,6 +25,7 @@
return nil;
}
+ languageName = RETAIN(langName);
environmentName = RETAIN(envName);
hostName = RETAIN(host);
@@ -68,6 +69,10 @@
environmentProcess = RETAIN([connection rootProxy]);
proxy = RETAIN([environmentProcess createConversation]);
[proxy setProtocolForProxy:@protocol(STConversation)];
+ if (languageName && ![languageName isEqual:@""])
+ {
+ [proxy setLanguage: languageName];
+ }
[[NSNotificationCenter defaultCenter]
addObserver: self
@@ -101,13 +106,14 @@
- (void)setLanguage:(NSString *)newLanguage
{
+ ASSIGN(languageName, newLanguage);
[proxy setLanguage:newLanguage];
}
/** Return name of the language used in the receiver conversation */
- (NSString *)language
{
- return [proxy language];
+ return proxy != nil ? [proxy language] : languageName;
}
- (STEnvironment *)environment
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
