Minor twiddling before releasing 0.0.3

pruten · May 24, 2014 · d5dd738 · d5dd738
1 parent f4f546d
commit d5dd738
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 81 deletions.
diff --git a/README.txt b/README.txt
diff --git a/core/redblack.c b/core/redblack.c
@@ -30,8 +30,9 @@
 
 // Create a new red-black tree 
 // (just return an empty black leaf pointer)
-rb_tree* rb_new(alloc_pool_t *pool)
+rb_tree* rb_new(alloc_pool_t *parent_pool)
 {
+    alloc_pool_t *pool = p_new_pool(parent_pool);
     rb_tree *tree = (rb_tree*)p_alloc(pool, sizeof(rb_tree));
     tree->root = NULL;
     tree->pool = pool;
@@ -255,21 +256,10 @@ uint32_t rb_count (rb_tree *tree)
 {
     return _rb_count(tree->root);
 }
-
-void _rb_free (rb_node *node)
-{
-    if (!node) return ;
-    _rb_free(node->right);
-    if (node->right) p_free(node->right);
-    _rb_free(node->left);
-    if (node->left) p_free(node->left);
-}
 
 // Free all the nodes (and the rb_tree ptr itself)
 void rb_free (rb_tree *tree)
 {
-    _rb_free(tree->root);
-    p_free(tree->root);
-    p_free(tree);
+    p_free_pool(tree->pool);
 }
 
diff --git a/gui/Shoebill.xcodeproj/project.pbxproj b/gui/Shoebill.xcodeproj/project.pbxproj
@@ -32,9 +32,9 @@
 		87495444189980E200E80F5B /* shoeScreenView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = shoeScreenView.xib; sourceTree = "<group>"; };
 		8749544618999F5300E80F5B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		874954481899A22D00E80F5B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
-		8781D24918A19C340016F604 /* shoePreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shoePreferencesWindowController.h; sourceTree = "<group>"; };
-		8781D24A18A19C340016F604 /* shoePreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = shoePreferencesWindowController.m; sourceTree = "<group>"; };
-		8781D24B18A19C340016F604 /* shoePreferencesWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = shoePreferencesWindowController.xib; sourceTree = "<group>"; };
+		8781D24918A19C340016F604 /* shoePreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shoePreferencesWindowController.h; path = Shoebill/shoePreferencesWindowController.h; sourceTree = "<group>"; };
+		8781D24A18A19C340016F604 /* shoePreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = shoePreferencesWindowController.m; path = Shoebill/shoePreferencesWindowController.m; sourceTree = "<group>"; };
+		8781D24B18A19C340016F604 /* shoePreferencesWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = shoePreferencesWindowController.xib; path = Shoebill/shoePreferencesWindowController.xib; sourceTree = "<group>"; };
 		8782FCE2189AFEFB0081E19E /* shoeApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shoeApplication.h; sourceTree = "<group>"; };
 		8782FCE3189AFEFB0081E19E /* shoeApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = shoeApplication.m; sourceTree = "<group>"; };
 		87F9772818987700000D589E /* Shoebill.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Shoebill.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -134,10 +134,8 @@
 				8782FCE3189AFEFB0081E19E /* shoeApplication.m */,
 				87F9773D18987700000D589E /* shoeAppDelegate.h */,
 				87F9773E18987700000D589E /* shoeAppDelegate.m */,
-				8781D24B18A19C340016F604 /* shoePreferencesWindowController.xib */,
-				8781D24918A19C340016F604 /* shoePreferencesWindowController.h */,
-				8781D24A18A19C340016F604 /* shoePreferencesWindowController.m */,
 				870A2F9F192D2ADA00ABBC14 /* Screen */,
+				AE0D1AAB193132E700EBBED0 /* Preferences */,
 				87F9773218987700000D589E /* Supporting Files */,
 			);
 			path = Shoebill;
@@ -156,6 +154,17 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		AE0D1AAB193132E700EBBED0 /* Preferences */ = {
+			isa = PBXGroup;
+			children = (
+				8781D24B18A19C340016F604 /* shoePreferencesWindowController.xib */,
+				8781D24918A19C340016F604 /* shoePreferencesWindowController.h */,
+				8781D24A18A19C340016F604 /* shoePreferencesWindowController.m */,
+			);
+			name = Preferences;
+			path = ..;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */

diff --git a/gui/Shoebill/Shoebill-Info.plist b/gui/Shoebill/Shoebill-Info.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleGetInfoString</key>
+	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013-2014 Peter Rutenbar</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.2</string>
+	<string>0.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.2</string>
+	<string>0.0.3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>

diff --git a/gui/Shoebill/en.lproj/Credits.rtf b/gui/Shoebill/en.lproj/Credits.rtf
@@ -1,13 +1,12 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \vieww9600\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\qc
 
 \f0\b\fs24 \cf0 Shoebill 
 \b0 \
 A Macintosh II emulator that runs A/UX\
 \
 {\field{\*\fldinst{HYPERLINK "https://github.com/pruten/shoebill"}}{\fldrslt https://github.com/pruten/shoebill}}\
-\
-Peter Rutenbar ([email protected])}
+}