Skip to content

Commit

Permalink
Fix newly identified build warnings.
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan 'Wolf' Rentzsch <[email protected]>
  • Loading branch information
lapcat authored and rentzsch committed Feb 21, 2009
1 parent cf6dfbb commit 69c0083
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Plugin/CTFMenubarMenuController.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extern NSString* kCTFLoadAllFlashViews;
extern NSString* kCTFLoadFlashViewsForWindow;
extern NSString* kCTFLoadInvisibleFlashViewsForWindow;

extern NSUInteger maxInvisibleDimension;
extern NSInteger maxInvisibleDimension;


@interface CTFMenubarMenuController : NSObject {
Expand Down
6 changes: 3 additions & 3 deletions Plugin/CTFMenubarMenuController.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
NSString* kCTFLoadFlashViewsForWindow = @"CTFLoadFlashViewsForWindow";
NSString* kCTFLoadInvisibleFlashViewsForWindow = @"CTFLoadInvisibleFlashViewsForWindow";

NSUInteger maxInvisibleDimension = 8;
NSInteger maxInvisibleDimension = 8;


static NSString* kApplicationsToInstallMenuInto[] = {
Expand Down Expand Up @@ -85,7 +85,7 @@ - (int) applicationMenuPrefsInsertionLocation
if( indx ) {
insertLocation = [ indx intValue ];
} else {
int showPrefsItem = -1, lastSeenSep = -1;
int showPrefsItem = -1;
int i;
for( i = 0 ; i < count ; ++i ) {
// Put it before the first separator after the preferences item.
Expand Down Expand Up @@ -227,7 +227,7 @@ - (BOOL) _flashViewExistsForKeyWindowWithInvisibleOnly: (BOOL) mustBeInvisible

NSHashEnumerator enumerator = NSEnumerateHashTable( _views );
CTFClickToFlashPlugin* item;
while( item = NSNextHashEnumeratorItem( &enumerator ) ) {
while( ( item = NSNextHashEnumeratorItem( &enumerator ) ) ) {
if( [ item window ] == keyWindow ) {
if( !mustBeInvisible || [ item isConsideredInvisible ] ) {
rslt = YES;
Expand Down
2 changes: 1 addition & 1 deletion Plugin/CTFUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ THE SOFTWARE.
#define CTFForEachObject( Type, varName, container ) \
NSEnumerator* feoEnum_##__LINE__ = [ container objectEnumerator ]; \
Type* varName; \
while( varName = [ feoEnum_##__LINE__ nextObject ] )
while( ( varName = [ feoEnum_##__LINE__ nextObject ] ) )

3 changes: 1 addition & 2 deletions Plugin/CTFsIFRSupport.m
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ - (BOOL) _isSIFRText: (NSDictionary*) arguments
NSString* classValue = [[arguments objectForKey: WebPlugInAttributesKey] objectForKey: @"class"];
NSString* sifrValue = [[arguments objectForKey: WebPlugInAttributesKey] objectForKey: @"sifr"];

if ([classValue isEqualToString: @"sIFR-flash"] || (sifrValue && [sifrValue boolValue]))
return YES;
return [classValue isEqualToString: @"sIFR-flash"] || (sifrValue && [sifrValue boolValue]);
}

@end

0 comments on commit 69c0083

Please sign in to comment.