Author: rmottola Date: Tue Jun 7 18:13:08 2016 New Revision: 39847 URL: http://svn.gna.org/viewcvs/gnustep?rev=39847&view=rev Log: Do not watch for the connection dieing, we suppose it stable being local now
Modified: apps/gworkspace/trunk/ChangeLog apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m Modified: apps/gworkspace/trunk/ChangeLog URL: http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39847&r1=39846&r2=39847&view=diff ============================================================================== --- apps/gworkspace/trunk/ChangeLog (original) +++ apps/gworkspace/trunk/ChangeLog Tue Jun 7 18:13:08 2016 @@ -1,3 +1,9 @@ +2016-06-07 Riccardo Mottola <r...@gnu.org> + + * Inspector/ContentViewers/ImageViewer/ImageViewer.h + * Inspector/ContentViewers/ImageViewer/ImageViewer.m + Do not watch for the connection dieing, we suppose it stable being local now. + 2016-06-01 Riccardo Mottola <r...@gnu.org> * Inspector/ContentViewers/ImageViewer/ImageViewer.m Modified: apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h URL: http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h?rev=39847&r1=39846&r2=39847&view=diff ============================================================================== --- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h (original) +++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.h Tue Jun 7 18:13:08 2016 @@ -1,6 +1,6 @@ /* ImageViewer.h * - * Copyright (C) 2004-2013 Free Software Foundation, Inc. + * Copyright (C) 2004-2016 Free Software Foundation, Inc. * * Author: Enrico Sersale <enr...@imago.ro> * Date: January 2004 @@ -73,13 +73,10 @@ id <ContentInspectorProtocol>inspector; NSFileManager *fm; - NSNotificationCenter *nc; NSWorkspace *ws; } - (void)setResizer:(id)anObject; - -- (void)connectionDidDie:(NSNotification *)notification; - (void)imageReady:(NSDictionary *)imginfo; Modified: apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m URL: http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m?rev=39847&r1=39846&r2=39847&view=diff ============================================================================== --- apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m (original) +++ apps/gworkspace/trunk/Inspector/ContentViewers/ImageViewer/ImageViewer.m Tue Jun 7 18:13:08 2016 @@ -33,8 +33,6 @@ - (void)dealloc { - [nc removeObserver: self]; - DESTROY (resizer); RELEASE (imagePath); RELEASE (image); @@ -130,7 +128,6 @@ inspector = insp; fm = [NSFileManager defaultManager]; - nc = [NSNotificationCenter defaultCenter]; ws = [NSWorkspace sharedWorkspace]; valid = YES; @@ -174,12 +171,7 @@ [NSThread detachNewThreadSelector: @selector(connectWithPorts:) toTarget: [ImageResizer class] - withObject: [NSArray arrayWithObjects: p2, p1, nil]]; - - [nc addObserver: self - selector: @selector(connectionDidDie:) - name: NSConnectionDidDieNotification - object: conn]; + withObject: [NSArray arrayWithObjects: p2, p1, nil]]; } if (!(resizer == nil)) @@ -221,35 +213,6 @@ } -- (void)connectionDidDie:(NSNotification *)notification -{ - id diedconn = [notification object]; - - [nc removeObserver: self - name: NSConnectionDidDieNotification - object: diedconn]; - - if ((diedconn == conn)) { - DESTROY (resizer); - - if ([[self subviews] containsObject: progView]) { - [progView stop]; - [progView removeFromSuperview]; - } - - if (diedconn == conn) { - DESTROY (conn); - } - - DESTROY (imagePath); - - NSRunAlertPanel(nil, - NSLocalizedString(@"resizer connection died.", @""), - NSLocalizedString(@"Continue", @""), - nil, - nil); - } -} - (void)imageReady:(NSDictionary *)imginfo { @@ -382,12 +345,12 @@ - (void)editFile:(id)sender { - NSString *appName; + NSString *appName; NSString *type; [ws getInfoForFile: editPath application: &appName type: &type]; - if (appName) { + if (appName) { NS_DURING { [ws openFile: editPath withApplication: appName]; @@ -410,7 +373,7 @@ NSString *bpath = [[NSBundle bundleForClass: [self class]] bundlePath]; NSString *resPath = [bpath stringByAppendingPathComponent: @"Resources"]; NSArray *languages = [NSUserDefaults userLanguages]; - unsigned i; + NSUInteger i; for (i = 0; i < [languages count]; i++) { NSString *language = [languages objectAtIndex: i]; _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs