Skip to content

Commit 07b8503

Browse files
committed
Various changes.
1 parent ce876b7 commit 07b8503

35 files changed

+209
-214
lines changed

AppSupport/AppSupport-Structs.h

+15
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,23 @@
66
*/
77

88
#include <SystemConfiguration/SystemConfiguration.h>
9+
#include <mach/message.h>
910

11+
typedef audit_token_t XXStruct_kUSYWB;
12+
13+
/*
1014
typedef struct {
1115
unsigned _field1[8];
1216
} XXStruct_kUSYWB;
17+
18+
[0] -> audit user ID
19+
[1] -> effective user ID
20+
[2] -> effective group ID
21+
[3] -> real user ID
22+
[4] -> real group ID
23+
[5] -> process ID
24+
[6] -> task or sender's audit session ID
25+
[7] -> task or sender's terminal ID
26+
27+
*/
1328

ChatKit/CKBalloonView.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
@property(copy, nonatomic) NSString* subject;
2929
@property(assign, nonatomic) id delegate;
3030
@property(assign, nonatomic) id tapDelegate;
31-
+(float)fixedHeight;
31+
+(CGFloat)fixedHeight;
3232
+(BOOL)shouldHaveAccessoryDiclosure;
3333
+(CGSize)defaultSize;
34-
+(id)defaultFont;
34+
+(UIFont*)defaultFont;
3535
+(BOOL)showsSubject;
3636
+(CGSize)sizeForMessagePart:(id)messagePart width:(float)width;
3737
+(float)heightForText:(id)text width:(float)width subject:(id)subject;
@@ -89,3 +89,6 @@
8989
-(void)dealloc;
9090
@end
9191

92+
@protocol CKBalloonViewTapDelegate
93+
-(void)didTapBalloon:(CKBalloonView*)view;
94+
@end

ChatKit/CKContentEntryView.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
-(BOOL)textContentViewShouldEndEditing:(id)textContentView;
4444
-(BOOL)textContentView:(id)view shouldChangeSizeForContentSize:(CGSize)contentSize;
4545
-(void)textContentView:(id)view didChangeSize:(CGSize)size;
46-
-(id)supportedPasteboardTypesInTextContentView:(id)textContentView;
46+
-(NSArray*)supportedPasteboardTypesInTextContentView:(id)textContentView;
4747
-(id)documentFragmentForPasteboardItemAtIndex:(int)index inTextContentView:(id)textContentView;
4848
-(void)attachmentsDidChange;
4949
-(void)reflowContent;
@@ -53,7 +53,7 @@
5353
-(void)clearMessage;
5454
-(BOOL)hasContent;
5555
-(void)setMessageComposition:(id)composition;
56-
-(id)messageComposition;
56+
-(CKMessageComposition*)messageComposition;
5757
-(void)setMessageParts:(id)parts;
5858
-(id)messageParts;
5959
-(void)insertMessagePart:(id)part;
@@ -81,3 +81,13 @@
8181
-(BOOL)canPasteObject:(id)object;
8282
@end
8383

84+
@protocol CKContentEntryFieldDelegate
85+
@required
86+
-(BOOL)entryField:(CKContentEntryView*)entryField shouldInsertMediaObject:(CKMediaObject*)mediaObject;
87+
-(void)entryFieldAttachmentsChanged:(CKContentEntryView*)entryField;
88+
-(void)entryFieldSubjectChanged:(CKContentEntryView*)entryField;
89+
-(void)entryFieldDidBecomeActive:(CKContentEntryView*)entryField;
90+
-(BOOL)entryFieldShouldBecomeActive:(CKContentEntryView*)entryField;
91+
-(void)entryFieldContentChanged:(CKContentEntryView*)entryField;
92+
@end
93+

ChatKit/CKMessage.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
-(BOOL)isOutgoing;
5151
-(id)previewText;
5252
-(id)attachmentText:(BOOL)text;
53-
-(id)subject;
54-
-(id)text;
53+
-(NSString*)subject;
54+
-(NSString*)text;
5555
-(unsigned long)height;
5656
-(void)_storeUIFlags:(unsigned long)flags;
5757
-(void)_loadUIFlags;
@@ -72,9 +72,9 @@
7272
-(BOOL)completelyFailedSend;
7373
-(void)reloadFailedSendCount;
7474
-(float)percentComplete;
75-
-(id)sender;
76-
-(id)address;
77-
-(id)alertImageData;
75+
-(CKEntity*)sender;
76+
-(NSString*)address;
77+
-(NSData*)alertImageData;
7878
-(BOOL)isFirstDisplayablePart:(id)part;
7979
-(BOOL)containsDisplayableMessageParts;
8080
-(BOOL)isOnlyDisplayableMessagePart:(id)part;

ChatKit/CKMessageEntryView.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
-(void)fadeToSendingState:(BOOL)sendingState withDuration:(float)duration;
3131
-(void)dealloc;
3232
-(void)send:(id)send;
33-
-(id)entryField;
33+
-(CKContentEntryView*)entryField;
3434
-(CGRect)contentEntryFrame:(BOOL)frame;
3535
-(void)enableSendButton;
3636
-(void)disableSendButton;

ChatKit/CKSMSComposeController.h

+7
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,10 @@
4242
-(void)_addPresetMessagePart:(id)part;
4343
@end
4444

45+
@protocol CKSMSComposeControllerDelegate
46+
@optional
47+
-(void)smsComposeControllerCancelled:(CKSMSComposeController*)controller;
48+
-(BOOL)smsComposeControllerSendStarted:(CKSMSComposeController*)controller;
49+
-(void)smsComposeControllerAppeared:(CKSMSComposeController*)controller;
50+
-(void)smsComposeControllerDataInserted:(CKSMSComposeController*)controller;
51+
@end

ChatKit/CKSMSEntity.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
CKSMSAddressRef _smsAddress;
1616
}
1717
@property(readonly, assign, nonatomic) CKSMSAddressRef smsAddress;
18-
+(id)copyAllSMSEntities;
18+
+(NSArray*)copyAllSMSEntities;
1919
-(void)resetCaches;
2020
-(void)_addToSharedSet;
2121
-(void)_removeFromSharedSet;

ChatKit/CKService.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#import <Foundation/NSObject.h>
77

8-
@class CKConversationList, NSString;
8+
@class CKConversationList, NSString, CKEntity;
99

1010
@interface CKService : NSObject {
1111
NSString* _serviceID;
@@ -39,7 +39,7 @@
3939
-(BOOL)canAcceptMediaObject:(id)object givenMediaObjects:(id)objects;
4040
-(BOOL)canAcceptMediaObjectType:(int)type givenMediaObjects:(id)objects;
4141
-(double)maxTrimDurationForMediaType:(int)mediaType;
42-
-(id)copyEntityForAddressString:(id)addressString;
42+
-(CKEntity*)copyEntityForAddressString:(NSString*)addressString;
4343
-(id)unknownEntity;
4444
-(id)abPropertyTypes;
4545
-(BOOL)isValidAddress:(id)address;

ChatKit/CKSimpleBalloonView.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
@interface CKSimpleBalloonView : CKBalloonView {
1212
NSString* _text;
1313
}
14-
+(float)minimumBubbleHeight;
15-
+(float)heightForText:(id)text width:(float)width includeBuffers:(BOOL)buffers;
14+
+(CGFloat)minimumBubbleHeight;
15+
+(CGFloat)heightForText:(NSString*)text width:(CGFloat)width includeBuffers:(BOOL)buffers;
1616
+(BOOL)showsSubject;
17-
-(id)text;
18-
-(id)subject;
19-
-(void)setText:(id)text;
17+
-(NSString*)text;
18+
-(NSString*)subject;
19+
-(void)setText:(NSString*)text;
2020
-(void)setMessagePart:(id)part;
2121
-(void)setComposition:(id)composition;
2222
-(void)prepareForReuse;
2323
-(void)dealloc;
24-
-(void)setBackgroundColor:(id)color;
24+
-(void)setBackgroundColor:(UIColor*)color;
2525
-(CGRect)subjectBounds;
2626
-(CGRect)textBounds;
2727
-(void)drawRect:(CGRect)rect;

ChatKit/CKTranscriptController.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@
7878
@property(retain, nonatomic) CKMessage* messageToThrow;
7979
@property(retain, nonatomic) CKMessage* smartForwardMessage;
8080
@property(assign, nonatomic) id composeDelegate;
81-
+(id)tableColor;
82-
-(id)initWithNavigationController:(id)navigationController;
81+
+(UIColor*)tableColor;
82+
-(id)initWithNavigationController:(UINavigationController*)navigationController;
8383
-(void)dealloc;
8484
-(void)loadView;
8585
-(BOOL)_canReloadView;
8686
-(void)viewWillAppear:(BOOL)view;
8787
-(void)viewDidAppear:(BOOL)view;
8888
-(void)viewWillDisappear:(BOOL)view;
8989
-(void)viewDidDisappear:(BOOL)view;
90-
-(BOOL)shouldAutorotateToInterfaceOrientation:(int)interfaceOrientation;
90+
-(BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
9191
-(void)_getRotationContentSettings:(XXStruct_TF$i3B*)settings;
9292
-(void)willRotateToInterfaceOrientation:(int)interfaceOrientation duration:(double)duration;
9393
-(void)willAnimateRotationToInterfaceOrientation:(int)interfaceOrientation duration:(double)duration;

ChatKit/ChatKit-Structs.h

+23-6
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,33 @@
88
#import <UIKit/UIKit.h>
99
#import <GraphicsServices/GSEvent.h>
1010
#import <UIKit/UIKit-Structs.h>
11+
#import <CoreGraphics/CoreGraphics.h>
12+
#import <AddressBook/AddressBook.h>
1113

1214
typedef struct __CKSMSRecord* CKSMSRecordRef;
1315

14-
typedef struct {
15-
int _field1;
16-
int _field2;
17-
} XXStruct_K5nmsA;
18-
1916
typedef struct __CKSMSAddress* CKSMSAddressRef;
2017

2118
typedef struct CGImageSource* CGImageSourceRef;
2219

23-
20+
#if __cplusplus
21+
extern "C" {
22+
#endif
23+
24+
BOOL isEmoji(unichar character);
25+
26+
CGFloat CKGetMaxPreviewImageDimensionLength(); // == 129
27+
UIColor* CKGetTextEntryBackgroundColor();
28+
NSString* CKLocalizedSMSActionString();
29+
NSString* CKLocalizedMMSActionString(NSString* who);
30+
31+
BOOL CKDeviceSupportsVideo();
32+
void CKLog(NSString* context, NSString* format, ...);
33+
BOOL CKShouldPlaySMSSounds();
34+
ABAddressBookRef CKGetAddressBook();
35+
BOOL CKMMSEnabled();
36+
BOOL CKShowSubjectEnabled();
37+
38+
#if __cplusplus
39+
}
40+
#endif

ChatKit/DOMEventListener.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,4 @@
44
*/
55

66
#import "NSObject.h"
7-
8-
9-
@protocol DOMEventListener <NSObject>
10-
-(void)handleEvent:(id)event;
11-
@end
12-
7+
#import <WebKit/DOMEventListener.h>

ChatKit/UIModalViewDelegate.h

+1-12
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,4 @@
44
*/
55

66
#import "NSObject.h"
7-
8-
9-
@protocol UIModalViewDelegate <NSObject>
10-
@optional
11-
-(void)modalView:(id)view clickedButtonAtIndex:(int)index;
12-
-(void)modalViewCancel:(id)cancel;
13-
-(void)willPresentModalView:(id)view;
14-
-(void)didPresentModalView:(id)view;
15-
-(void)modalView:(id)view willDismissWithButtonIndex:(int)buttonIndex;
16-
-(void)modalView:(id)view didDismissWithButtonIndex:(int)buttonIndex;
17-
@end
18-
7+
#import <UIKit/UIModalViewDelegate.h>

ChatKit/UITextContentViewDelegate.h

+1-15
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,5 @@
55

66
#import "ChatKit-Structs.h"
77
#import "NSObject.h"
8-
9-
10-
@protocol UITextContentViewDelegate <NSObject>
11-
@optional
12-
-(BOOL)textContentViewShouldBeginEditing:(id)textContentView;
13-
-(BOOL)textContentViewShouldEndEditing:(id)textContentView;
14-
-(void)textContentViewDidBeginEditing:(id)textContentView;
15-
-(void)textContentViewDidEndEditing:(id)textContentView;
16-
-(BOOL)textContentView:(id)view shouldChangeTextInRange:(NSRange)range replacementText:(id)text;
17-
-(void)textContentViewDidChange:(id)textContentView;
18-
-(void)textContentViewDidChangeSelection:(id)textContentView;
19-
-(BOOL)textContentView:(id)view shouldScrollForPendingContentSize:(CGSize)pendingContentSize;
20-
-(BOOL)textContentView:(id)view shouldChangeSizeForContentSize:(CGSize)contentSize;
21-
-(void)textContentView:(id)view didChangeSize:(CGSize)size;
22-
@end
8+
#import <UIKit/UITextContentView.h>
239

JavaScriptCore/wtf/Vector.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,6 @@ namespace WTF {
964964

965965
} // namespace WTF
966966

967-
using WTF::Vector;
967+
// using WTF::Vector;
968968

969969
#endif // WTF_Vector_h

MIME/MIME-Structs.h

+1-13
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,4 @@
55
* Source: /System/Library/PrivateFrameworks/MIME.framework/MIME
66
*/
77

8-
typedef struct {
9-
int _field1;
10-
int _field2;
11-
} XXStruct_K5nmsA;
12-
13-
typedef struct {
14-
unsigned long _field1;
15-
id* _field2;
16-
unsigned long* _field3;
17-
unsigned long _field4[5];
18-
} XXStruct_kFm5bA;
19-
20-
8+
#import <QuartzCore/QuartzCore-Structs.h>

0 commit comments

Comments
 (0)