yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-02-03 04:41:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac framework fixes: Propagate server type from plist, and fix precedence of defaults vs. plist

Browse source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@334 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
stuart.morgan 2009-04-29 13:27:16 +00:00
parent ed1f6e754a
commit 73afbc7302
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/client/mac/Framework/Breakpad.mm
View file

@ -388,6 +388,10 @@ Breakpad::~Breakpad() {
//============================================================================= //=============================================================================
bool Breakpad::ExtractParameters(NSDictionary *parameters) { bool Breakpad::ExtractParameters(NSDictionary *parameters) {
NSUserDefaults *stdDefaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *stdDefaults = [NSUserDefaults standardUserDefaults];
NSString *skipConfirm = [stdDefaults stringForKey:@BREAKPAD_SKIP_CONFIRM];
NSString *sendAndExit = [stdDefaults stringForKey:@BREAKPAD_SEND_AND_EXIT];
NSString *serverType = [parameters objectForKey:@BREAKPAD_SERVER_TYPE];
NSString *display = [parameters objectForKey:@BREAKPAD_PRODUCT_DISPLAY]; NSString *display = [parameters objectForKey:@BREAKPAD_PRODUCT_DISPLAY];
NSString *product = [parameters objectForKey:@BREAKPAD_PRODUCT]; NSString *product = [parameters objectForKey:@BREAKPAD_PRODUCT];
NSString *version = [parameters objectForKey:@BREAKPAD_VERSION]; NSString *version = [parameters objectForKey:@BREAKPAD_VERSION];
@ -397,9 +401,7 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
[parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION]; [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
NSString *reporterPathString = NSString *reporterPathString =
[parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION]; [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
NSString *skipConfirm = [parameters objectForKey:@BREAKPAD_SKIP_CONFIRM];
NSString *timeout = [parameters objectForKey:@BREAKPAD_CONFIRM_TIMEOUT]; NSString *timeout = [parameters objectForKey:@BREAKPAD_CONFIRM_TIMEOUT];
NSString *sendAndExit = [parameters objectForKey:@BREAKPAD_SEND_AND_EXIT];
NSArray *logFilePaths = [parameters objectForKey:@BREAKPAD_LOGFILES]; NSArray *logFilePaths = [parameters objectForKey:@BREAKPAD_LOGFILES];
NSString *logFileTailSize = [parameters objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE]; NSString *logFileTailSize = [parameters objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE];
NSString *reportEmail = [parameters objectForKey:@BREAKPAD_EMAIL]; NSString *reportEmail = [parameters objectForKey:@BREAKPAD_EMAIL];
@ -411,14 +413,12 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
[parameters objectForKey:@BREAKPAD_DUMP_DIRECTORY]; [parameters objectForKey:@BREAKPAD_DUMP_DIRECTORY];
NSString *buildId = NSString *buildId =
[parameters objectForKey:@BREAKPAD_BUILD_ID]; [parameters objectForKey:@BREAKPAD_BUILD_ID];
// These may have been set above as user prefs, which take priority.
// If these two are not already set(skipConfirm and sendAndExit can
// come from user defaults and take priority)
if (!skipConfirm) { if (!skipConfirm) {
skipConfirm = [stdDefaults stringForKey:@BREAKPAD_SKIP_CONFIRM]; skipConfirm = [parameters objectForKey:@BREAKPAD_SKIP_CONFIRM];
} }
if (!sendAndExit) { if (!sendAndExit) {
sendAndExit = [stdDefaults stringForKey:@BREAKPAD_SEND_AND_EXIT]; sendAndExit = [parameters objectForKey:@BREAKPAD_SEND_AND_EXIT];
} }
if (!product) if (!product)
@ -533,6 +533,7 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
SimpleStringDictionary &dictionary = *config_params_; SimpleStringDictionary &dictionary = *config_params_;
dictionary.SetKeyValue(BREAKPAD_SERVER_TYPE, [serverType UTF8String]);
dictionary.SetKeyValue(BREAKPAD_PRODUCT_DISPLAY, [display UTF8String]); dictionary.SetKeyValue(BREAKPAD_PRODUCT_DISPLAY, [display UTF8String]);
dictionary.SetKeyValue(BREAKPAD_PRODUCT, [product UTF8String]); dictionary.SetKeyValue(BREAKPAD_PRODUCT, [product UTF8String]);
dictionary.SetKeyValue(BREAKPAD_VERSION, [version UTF8String]); dictionary.SetKeyValue(BREAKPAD_VERSION, [version UTF8String]);

2
src/client/mac/sender/crash_report_sender.m
View file

@ -627,7 +627,7 @@ doCommandBySelector:(SEL)commandSelector {
} }
- (NSDictionary *)dictionaryForServerType:(NSString *)serverType { - (NSDictionary *)dictionaryForServerType:(NSString *)serverType {
if (serverType == nil) { if (serverType == nil || [serverType length] == 0) {
return [serverDictionary_ objectForKey:kDefaultServerType]; return [serverDictionary_ objectForKey:kDefaultServerType];
} }
return [serverDictionary_ objectForKey:serverType]; return [serverDictionary_ objectForKey:serverType];