Chameleon Applications Commit Details - 57 - Chameleon related Applications (system preferences panels, helper applications)

Date:

2010-01-25 21:40:12 (14 years 2 months ago)

Author:

Commit:

Parents:

Message:

Released version 2.0.b3 that should fix priviledge exec potential problems and also potential problems with differents preferences file version between 1.0 and 2.0 panels

Changes:

M	/trunk/ChameleonPrefPane/bin/OSX105/Chameleon.prefPane.zip
M	/trunk/ChameleonPrefPane/Sources/BootSetupController.mm
M	/trunk/ChameleonPrefPane/bin/OSX106/Chameleon.prefPane.zip
M	/trunk/ChameleonPrefPane/Sources/PropertyList.cpp
M	/trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
M	/trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
M	/trunk/ChameleonPrefPane/bin/version
M	/trunk/ChameleonPrefPane/Sources/BootFlagsController.mm

File differences

-30
31 31
32 32
33 
33
34 34
35 35
36 36
+␊
static const char* const szPropFileName = "com.apple.Boot.plist";␊
␊
static const int CurrentPreferencesFileVersion =  0x01; // for future back compatibility␊
static const int CurrentPreferencesFileVersion =  0x02; // for future back compatibility␊
//--------------------------------------------------------------------------␊
// Static file variables␊
//--------------------------------------------------------------------------␊
 ␊
 static const char* const szPropFileName = "com.apple.Boot.plist";␊
 ␊
-static const int CurrentPreferencesFileVersion =  0x01; // for future back compatibility␊
+static const int CurrentPreferencesFileVersion =  0x02; // for future back compatibility␊
 //--------------------------------------------------------------------------␊
 // Static file variables␊
 //--------------------------------------------------------------------------␊

-39
40 40
41 41
42 
42
43 43
44 44
45 45
+}␊
␊
//--------------------------------------------------------------------------␊
-(void) setDefaultsValues: (NSMutableDictionary*) dict␊
-(void) setDefaultsValues: (NSMutableDictionary*) dict ␊
{␊
}␊
//--------------------------------------------------------------------------␊
 }␊
 ␊
 //--------------------------------------------------------------------------␊
--(void) setDefaultsValues: (NSMutableDictionary*) dict␊
+-(void) setDefaultsValues: (NSMutableDictionary*) dict ␊
 {␊
 }␊
 //--------------------------------------------------------------------------␊

-50
51 51
52 52
53 
54 53
55 54
56 55
... ...
58 57
59 58
60 59
61 
60
61
62 62
63 63
64 64
+␉[dict setObject:[[NSNumber alloc] initWithBool:  false] forKey: keyUseFrozenParts];␊
␉[dict setObject:[[NSString alloc] initWithString:  @""] forKey: keyForceBootConfigPath];␊
}␊
␊
//--------------------------------------------------------------------------␊
-(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict␊
{␊

␉[mSwapHD02 setIntValue: [[dict objectForKey:␉keySwapHD02] intValue]];␊
␉[mFreezeParts setIntValue: [[dict objectForKey: keyUseFrozenParts] intValue] ];␊
␉id obj = [dict objectForKey: keyForceBootConfigPath];␊
␉[mBootConfigPathText setStringValue: obj  ];␊
␉if(obj)␉[mBootConfigPathText setStringValue: obj  ];␊
␉else␉[dict setObject:[[NSString alloc] initWithString:  @""] forKey: keyForceBootConfigPath];␊
␉int val = ([[mBootConfigPathText stringValue] length] >0 ? 1 : 0);␊
␉[mBootConfigPath setIntValue: val];␊
␊
 ...
 ␉[dict setObject:[[NSNumber alloc] initWithBool:  false] forKey: keyUseFrozenParts];␊
 ␉[dict setObject:[[NSString alloc] initWithString:  @""] forKey: keyForceBootConfigPath];␊
 }␊
-␊
 //--------------------------------------------------------------------------␊
 -(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict␊
 {␊
 ␉[mSwapHD02 setIntValue: [[dict objectForKey:␉keySwapHD02] intValue]];␊
 ␉[mFreezeParts setIntValue: [[dict objectForKey: keyUseFrozenParts] intValue] ];␊
 ␉id obj = [dict objectForKey: keyForceBootConfigPath];␊
-␉[mBootConfigPathText setStringValue: obj  ];␊
+␉if(obj)␉[mBootConfigPathText setStringValue: obj  ];␊
+␉else␉[dict setObject:[[NSString alloc] initWithString:  @""] forKey: keyForceBootConfigPath];␊
 ␉int val = ([[mBootConfigPathText stringValue] length] >0 ? 1 : 0);␊
 ␉[mBootConfigPath setIntValue: val];␊
 ␊

-100
101 101
102 102
103 
103
104
104 105
105 106
106 107
... ...
113 114
114 115
115 116
116 
117 
118 
117
118
119
120
121
122
119 123
120 124
121 125
+}␊
␊
//--------------------------------------------------------------------------␊
// Execute a priviledge shell command ␊
// Execute a priviledge shell command : will wait for execution termination␊
//  by calling wait()␊
//--------------------------------------------------------------------------␊
 bool executePrivilegedCmd(AuthorizationRef auth, ␊
␉␉␉␉␉␉␉␉ const char* pathToTool, ␊

␊
␉// Execute Cmd␊
␉OSStatus status = AuthorizationExecuteWithPrivileges(auth, pathToTool,flags, (char**)argv, NULL);␊
␉␊
␉␊
␉// Cleanup mem␊
␉// Wait for the child process of AEWP to terminate:␊
␉int wait_status=0;␊
␉/* pid_t pid = */␊
␉wait(&wait_status);␊
␉// usleep(10000); // 10 ms␊
␉␉// Cleanup mem␊
␉for (int i=0; argv[i]; i++) free ((void*) argv[i]);␊
␊
    return status ? false : true;␊
 ...
 }␊
 ␊
 //--------------------------------------------------------------------------␊
-// Execute a priviledge shell command ␊
+// Execute a priviledge shell command : will wait for execution termination␊
+//  by calling wait()␊
 //--------------------------------------------------------------------------␊
  bool executePrivilegedCmd(AuthorizationRef auth, ␊
 ␉␉␉␉␉␉␉␉ const char* pathToTool, ␊
 ␊
 ␉// Execute Cmd␊
 ␉OSStatus status = AuthorizationExecuteWithPrivileges(auth, pathToTool,flags, (char**)argv, NULL);␊
-␉␊
-␉␊
-␉// Cleanup mem␊
+␉// Wait for the child process of AEWP to terminate:␊
+␉int wait_status=0;␊
+␉/* pid_t pid = */␊
+␉wait(&wait_status);␊
+␉// usleep(10000); // 10 ms␊
+␉␉// Cleanup mem␊
 ␉for (int i=0; argv[i]; i++) free ((void*) argv[i]);␊
 ␊
     return status ? false : true;␊

-85
86 86
87 87
88 
88
89 89
90 90
91 91
+␉␉␉␉␉␉␉␉␉␉␉␉<object class="NSTextFieldCell" key="NSCell" id="98357325">␊
␉␉␉␉␉␉␉␉␉␉␉␉␉<int key="NSCellFlags">72482368</int>␊
␉␉␉␉␉␉␉␉␉␉␉␉␉<int key="NSCellFlags2">138544128</int>␊
␉␉␉␉␉␉␉␉␉␉␉␉␉<string key="NSContents">Version 2.0 b2</string>␊
␉␉␉␉␉␉␉␉␉␉␉␉␉<string key="NSContents">Version 2.0 b3</string>␊
␉␉␉␉␉␉␉␉␉␉␉␉␉<object class="NSFont" key="NSSupport" id="26">␊
␉␉␉␉␉␉␉␉␉␉␉␉␉␉<string key="NSName">LucidaGrande</string>␊
␉␉␉␉␉␉␉␉␉␉␉␉␉␉<double key="NSSize">11</double>␊
 ␉␉␉␉␉␉␉␉␉␉␉␉<object class="NSTextFieldCell" key="NSCell" id="98357325">␊
 ␉␉␉␉␉␉␉␉␉␉␉␉␉<int key="NSCellFlags">72482368</int>␊
 ␉␉␉␉␉␉␉␉␉␉␉␉␉<int key="NSCellFlags2">138544128</int>␊
-␉␉␉␉␉␉␉␉␉␉␉␉␉<string key="NSContents">Version 2.0 b2</string>␊
+␉␉␉␉␉␉␉␉␉␉␉␉␉<string key="NSContents">Version 2.0 b3</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉␉␉<object class="NSFont" key="NSSupport" id="26">␊
 ␉␉␉␉␉␉␉␉␉␉␉␉␉␉<string key="NSName">LucidaGrande</string>␊
 ␉␉␉␉␉␉␉␉␉␉␉␉␉␉<double key="NSSize">11</double>␊

Download the corresponding diff file