From 62164414d6a035be1ca2a071a3dde06912a0fbb2 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 5 Sep 2006 02:12:07 +0000 Subject: [PATCH] Use built-in ability for verifying notifications' objects and update message log a little less often. --- macosx/BarButton.m | 13 +++++-------- .../PrefsWindow.nib/keyedobjects.nib | Bin 36088 -> 36080 bytes macosx/MessageWindowController.m | 2 +- macosx/TorrentCell.m | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/macosx/BarButton.m b/macosx/BarButton.m index 463a43273..fa5495947 100644 --- a/macosx/BarButton.m +++ b/macosx/BarButton.m @@ -48,10 +48,10 @@ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter]; [nc addObserver: self selector: @selector(setForActive:) - name: NSWindowDidBecomeKeyNotification object: nil]; + name: NSWindowDidBecomeKeyNotification object: [self window]]; [nc addObserver: self selector: @selector(setForInactive:) - name: NSWindowDidResignKeyNotification object: nil]; + name: NSWindowDidResignKeyNotification object: [self window]]; [nc addObserver: self selector: @selector(resetBounds:) name: NSViewFrameDidChangeNotification object: nil]; @@ -252,9 +252,6 @@ - (void) setForActive: (NSNotification *) notification { - if ([notification object] != [self window]) - return; - if ([self image] == fButtonSelectedDim) [self setImage: fButtonSelected]; else if ([self image] == fButtonNormalDim) @@ -266,13 +263,13 @@ - (void) setForInactive: (NSNotification *) notification { - if ([notification object] != [self window]) - return; - [self setImage: [self image] == fButtonSelected ? fButtonSelectedDim : fButtonNormalDim]; if (fTrackingTag) + { [self removeTrackingRect: fTrackingTag]; + fTrackingTag = 0; + } } @end diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib index aa982d3be3add17fcf67b6a66a7de10da15343a2..cedbf710655e814bb5dfeb4bffaf87ca16748cff 100644 GIT binary patch delta 5897 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%0A^2 z<$!WnIja0!`CK`noK(J6zE#dB=adV|cgiK@N98Bw7v-vQUHM)4m-2^lHw?o`;pA{a z2v-bO4wr_vh2IbF4DSi=3x5(m7(Nm{7Cs(65k49ICVV=4E_^Y3DSSEnbNFibdiX~8 zR``wzRhKHL6;+Rl)yitBT3xNF)=}%JPpgg8rfPFFO>L#NQQN5<)ECq)YB#lq+Dq-L z_E!g~S*lMBsv$M3MpZ4L>MB!n)e-7wb*!3D$Ey?7$?7z9raDKRr!G{NsDhc_M!HXwqHA>9np?y$F&pMSK8OwDea7QPP?dG(tgx_(tgpd zYS*>jwVT>4?GA<1MFm=sdMKuq>EpC2twC$iy0kuRKpWGhv^i}_)9JIcEp10T&=+VI z+Kpz?o;1;$_M`pjAeu#eG(ZVes7j+$qdH|YmyV#L=~$YeNE7&dV#(`U#u_F zm+PL2O*^+Won`e*v*`j`4Y^i%p7{k;C2{)7IL z{)>K1|4qNC|DoSCkdbUuFx*BZLo})wRgD@(qLxwDsBbhd8XL`w7Dl@9tkKqJZ*(*| z8C{L;Mo*)+(a#uQ3^pXgZ)6*?p&BuR8io-!@{Ezj7-O7a854|rV~R1|m}Sg0<{OKQ zrACqQn(>CQ+9)>G8}Aq;MyavQc;DD*>@oHkpBM*?BgQe~xN*WbnJ~UFP8;Wpi^e76 zvhlNV)wpilFm4%lOlZ1H!K`R{Ol(#*Q_bpTO|y|nlN zb}_q|JE;S3y<>qVVN^_OD#$0QzH#e9Y%@T97xy9UWzHja@cbR+5kIen%A@hiN%>29g zh54m<()`B!);wdLH!qr(%**B#^H=kq=I`cB^Okv=0ftyI6WAln%_=d>9%EHlDyz<( zV6|CYR*yZ!8nVW$X@Wh&TCgU0FAl$$GNhtS{@&2C^YcVm=mR zgvm^0QI^9f(-~vAY&aXq#;|cL!E82x<+CYl8k@mpvAJwMTf~;IWvqy;U@O_1Yz-@B z>)8hOF5ARP*;e)*`+)6YbT8Y-K4$ybA$EivWuLL*>