Author: mlytwyn
Date: Wed Oct 5 00:24:37 2016
New Revision: 40120
URL: http://svn.gna.org/viewcvs/gnustep?rev=40120&view=rev
Log:
Merge GUI with trunk revision 40072
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSOpenPanel.h
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSParagraphStyle.h
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSPasteboard.h
libs/gui/branches/gnustep_testplant_branch/Source/NSPasteboard.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSOpenPanel.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSOpenPanel.h?rev=40120&r1=40119&r2=40120&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSOpenPanel.h
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSOpenPanel.h
Wed Oct 5 00:24:37 2016
@@ -7,9 +7,9 @@
Author: Scott Christley <[email protected]>
Date: 1996
- Author: Daniel Böhringer <[email protected]>
+ Author: Daniel Bhringer <[email protected]>
Date: August 1998
- Source by Daniel Böhringer integrated into Scott Christley's preliminary
+ Source by Daniel Bhringer integrated into Scott Christley's preliminary
implementation by Felipe A. Rodriguez <[email protected]>
Author: Nicola Pero <[email protected]>
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSParagraphStyle.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSParagraphStyle.h?rev=40120&r1=40119&r2=40120&view=diff
==============================================================================
---
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSParagraphStyle.h
(original)
+++
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSParagraphStyle.h
Wed Oct 5 00:24:37 2016
@@ -6,7 +6,7 @@
Copyright (C) 1996,1999 Free Software Foundation, Inc.
- Author: Daniel Böhringer <[email protected]>
+ Author: Daniel Bhringer <[email protected]>
Date: August 1998
Update: Richard Frith-Macdonald <[email protected]> March 1999
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSPasteboard.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSPasteboard.h?rev=40120&r1=40119&r2=40120&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSPasteboard.h
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSPasteboard.h
Wed Oct 5 00:24:37 2016
@@ -175,11 +175,6 @@
*/
APPKIT_EXPORT NSString *NSPasteboardCommunicationException;
-@class NSPasteboard;
-
-// Protocol definitions...
-@protocol NSPasteboardWriting
-@end
@interface NSPasteboard : NSObject
{
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSPasteboard.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSPasteboard.m?rev=40120&r1=40119&r2=40120&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSPasteboard.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSPasteboard.m Wed Oct
5 00:24:37 2016
@@ -1241,7 +1241,7 @@
NS_HANDLER
{
NSLog(@"%s:exception: %@", __PRETTY_FUNCTION__, localException);
-#if 0
+#if 0 // Testplant-MAL-10042016: keeping branch code due to GPBS instability
[NSException raise: NSPasteboardCommunicationException
format: @"%@", [localException reason]];
#endif
@@ -1279,7 +1279,7 @@
NS_HANDLER
{
NSLog(@"%s:exception: %@", __PRETTY_FUNCTION__, localException);
-#if 0
+#if 0 // Testplant-MAL-10042016: keeping branch code due to GPBS instability
[NSException raise: NSPasteboardCommunicationException
format: @"%@", [localException reason]];
#endif
@@ -1940,9 +1940,6 @@
+ (id) _lostServer: (NSNotification*)notification
{
id obj = the_server;
-#if 0
- NSLog(@"%s:notification: %@", __PRETTY_FUNCTION__, notification);
-#endif
the_server = nil;
[[NSNotificationCenter defaultCenter]
@@ -2088,6 +2085,7 @@
object: nil];
#if defined(__MINGW32__)
+ // Testplant-MAL-10042016: keeping branch code
NSTask *task = AUTORELEASE([NSTask new]);
[task setStandardError:[NSFileHandle
fileHandleForWritingAtPath:@"NUL"]];
[task setStandardOutput:[NSFileHandle
fileHandleForWritingAtPath:@"NUL"]];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
