<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[70054] branches/gsoc10-gui/MacPorts_Framework</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/70054">70054</a></dd>
<dt>Author</dt> <dd>tzikis@macports.org</dd>
<dt>Date</dt> <dd>2010-07-28 11:34:36 -0700 (Wed, 28 Jul 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged Juanger's changed</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkBetterAuthorizationSampleLibc">branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkMPInterpreterm">branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkMPMacPortsm">branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkMPMutableDictionarym">branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkMPNotificationsIPCAdditionsm">branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkMPNotificationsm">branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkMPRegistrym">branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m</a></li>
<li><a href="#branchesgsoc10guiMacPorts_FrameworkSimpleLogm">branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branchesgsoc10guiMacPorts_Framework">branches/gsoc10-gui/MacPorts_Framework/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc10guiMacPorts_Framework"></a>
<div class="propset"><h4>Property changes: branches/gsoc10-gui/MacPorts_Framework</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">   + /branches/gsoc09-gui/MacPorts_Framework:50819-65490
</span><span class="cx">/contrib/MacPorts_Framework:69794-69795
</span><a id="branchesgsoc10guiMacPorts_FrameworkBetterAuthorizationSampleLibc"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/BetterAuthorizationSampleLib.c        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -1575,7 +1575,7 @@
</span><span class="cx">     // asl, aslMsg, and kq.
</span><span class="cx">     
</span><span class="cx">     if (errStr != NULL) {
</span><del>-        err = asl_log(asl, aslMsg, ASL_LEVEL_ERR, errStr);
</del><ins>+        err = asl_log(asl, aslMsg, ASL_LEVEL_ERR, &quot;%s&quot;, errStr);
</ins><span class="cx">         assert(err == 0);
</span><span class="cx">     }
</span><span class="cx">     err = asl_log(asl, aslMsg, ASL_LEVEL_INFO, &quot;Shutting down&quot;);
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkMPInterpreterm"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPInterpreter.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -346,8 +346,9 @@
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (unsigned)retainCount {
-    return UINT_MAX;  //denotes an object that cannot be released
</del><ins>+- (NSUInteger)retainCount
+{
+    return NSUIntegerMax;  //denotes an object that cannot be released
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)release {
</span><span class="lines">@@ -544,7 +545,7 @@
</span><span class="cx">         
</span><span class="cx">         
</span><span class="cx">         //In order to make the framework work normally by default ... we do a bare initialization
</span><del>-        //of internalMacPortsAuthRef if the delegate hasn't iniitialzed it already
</del><ins>+        //of internalMacPortsAuthRef if the delegate hasn't initialzed it already
</ins><span class="cx">         if (internalMacPortsAuthRef == NULL) {
</span><span class="cx">                 OSStatus res = AuthorizationCreate (NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &amp;internalMacPortsAuthRef);
</span><span class="cx">                 assert(res == noErr);
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkMPMacPortsm"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPMacPorts.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -115,8 +115,9 @@
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (unsigned)retainCount {
-    return UINT_MAX;  //denotes an object that cannot be released
</del><ins>+- (NSUInteger)retainCount
+{
+    return NSUIntegerMax;  //denotes an object that cannot be released
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)release {
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkMPMutableDictionarym"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPMutableDictionary.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> - (id)init {
</span><span class="cx">         self = [super init];
</span><span class="cx">         if (self != nil) {
</span><del>-                embeddedDictionary = [[NSMutableDictionary alloc] initWithCapacity:0];
</del><ins>+                embeddedDictionary = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:0];
</ins><span class="cx">         }
</span><span class="cx">         return self;
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> - (id)initWithCapacity:(unsigned)numItems {
</span><span class="cx">         self = [super init];
</span><span class="cx">         if (self != nil) {
</span><del>-                embeddedDictionary = [[NSMutableDictionary alloc] initWithCapacity:numItems];
</del><ins>+                embeddedDictionary = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:numItems];
</ins><span class="cx">         }
</span><span class="cx">         return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkMPNotificationsIPCAdditionsm"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPNotifications+IPCAdditions.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx">     result = ClientCheckPacketSize(client, &amp;packet-&gt;fHeader, sizeof(PacketShout));
</span><span class="cx">     if (result) {
</span><span class="cx">         result = ClientCheckPacketID(client, &amp;packet-&gt;fHeader, kPacketIDNone);
</span><del>-                NSLog(@&quot;Packetsize is OK&quot;);
</del><ins>+                //NSLog(@&quot;Packetsize is OK&quot;);
</ins><span class="cx">     }
</span><span class="cx">         else
</span><span class="cx">                 NSLog(@&quot;Packetsize is NOT OK&quot;);
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx">         // The Shout packet is good.  Let's echo it to each listener.
</span><span class="cx">         
</span><span class="cx">     if (result) {
</span><del>-                NSLog(@&quot;PacketID is ok&quot;);
</del><ins>+                //NSLog(@&quot;PacketID is ok&quot;);
</ins><span class="cx">                 
</span><span class="cx">                 
</span><span class="cx">         ClientState  ** allClients;
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkMPNotificationsm"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPNotifications.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx">         return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (unsigned)retainCount {
-        return UINT_MAX;
</del><ins>+- (NSUInteger)retainCount {
+    return NSUIntegerMax;  //denotes an object that cannot be released
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> -(void) release {
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkMPRegistrym"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/MPRegistry.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (unsigned)retainCount {
-    return UINT_MAX;  //denotes an object that cannot be released
</del><ins>+- (NSUInteger)retainCount {
+    return NSUIntegerMax;  //denotes an object that cannot be released
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)release {
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">         NSArray *versions;
</span><span class="cx">         id item;
</span><span class="cx">         raw = [self installedAsArray:name withVersion:version];
</span><del>-        result = [[NSMutableDictionary alloc] initWithCapacity:[raw count]];
</del><ins>+        result = [(NSMutableDictionary *)[NSMutableDictionary alloc] initWithCapacity:[raw count]];
</ins><span class="cx">         rawEnumerator = [raw objectEnumerator];
</span><span class="cx">         while (item = [rawEnumerator nextObject]) {
</span><span class="cx">                 versions = [interpreter arrayFromTclListAsString:item];
</span></span></pre></div>
<a id="branchesgsoc10guiMacPorts_FrameworkSimpleLogm"></a>
<div class="modfile"><h4>Modified: branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m (70053 => 70054)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m        2010-07-28 18:26:49 UTC (rev 70053)
+++ branches/gsoc10-gui/MacPorts_Framework/SimpleLog.m        2010-07-28 18:34:36 UTC (rev 70054)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx">                 
</span><span class="cx">                 if (tclResult == TCL_OK) {
</span><span class="cx">                         if (tclCount &gt; 0) {
</span><del>-                NSLog([NSString stringWithUTF8String:tclElements[0]]);
</del><ins>+                NSLog(@&quot;%@&quot;, [NSString stringWithUTF8String:tclElements[0]]);
</ins><span class="cx">                                 data = [NSMutableString stringWithUTF8String:tclElements[0]];
</span><span class="cx">                                 [data appendString:MPSEPARATOR];
</span><span class="cx">                                 
</span><span class="cx">                                 if(tclCount &gt; 1 &amp;&amp; tclElements[1]) {
</span><del>-                    NSLog([NSString stringWithUTF8String:tclElements[1]]);
</del><ins>+                    NSLog(@&quot;%@&quot;, [NSString stringWithUTF8String:tclElements[1]]);
</ins><span class="cx">                                         [data appendString:[NSString stringWithUTF8String:tclElements[1]]];
</span><span class="cx">                                         [data appendString:MPSEPARATOR];
</span><span class="cx">                                 }
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">                                 }
</span><span class="cx">                                 
</span><span class="cx">                                 if(tclCount &gt; 2 &amp;&amp; tclElements[2]) {
</span><del>-                    NSLog([NSString stringWithUTF8String:tclElements[2]]);
</del><ins>+                    NSLog(@&quot;%@&quot;, [NSString stringWithUTF8String:tclElements[2]]);
</ins><span class="cx">                                         [data appendString:[NSString stringWithUTF8String:tclElements[2]]];
</span><span class="cx">                                         [data appendString:MPSEPARATOR];
</span><span class="cx">                                 }
</span></span></pre>
</div>
</div>

</body>
</html>