From 56227e27e8aa811713b9f6d08ef0642e4a2fed6d Mon Sep 17 00:00:00 2001
From: asukali <jessica.jans@gmail.com>
Date: Sat, 22 Jan 2011 23:07:54 +0100
Subject: [PATCH] Fixed project setup to compile and run Astrid

(tim's edit: removed GDCatalog)
---
 astrid/.classpath               | 4 +++-
 astrid/.project                 | 5 -----
 astrid/astrid.launch            | 1 +
 greendroid/GDCatalog/.classpath | 1 +
 tests/.classpath                | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/astrid/.classpath b/astrid/.classpath
index f3f2947e2..a97f2b2bf 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -15,7 +15,9 @@
 	<classpathentry exported="true" kind="lib" path="libs/locale_platform.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/todoroo-g.jar"/>
 	<classpathentry kind="lib" path="libs/framework.jar"/>
-	<classpathentry kind="src" path="astridApi_src"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/astridApi"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/GreenDroid"/>
 	<classpathentry kind="src" path="GreenDroid_src"/>
+	<classpathentry kind="src" path="astridApi_src"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>
diff --git a/astrid/.project b/astrid/.project
index e141deba9..fa28c40a2 100644
--- a/astrid/.project
+++ b/astrid/.project
@@ -47,10 +47,5 @@
 			<type>2</type>
 			<locationURI>_android_astridApi_98e6a2cf/src</locationURI>
 		</link>
-		<link>
-			<name>astridApi_src</name>
-			<type>2</type>
-			<locationURI>_android_astridApi_98e6a2cf/src</locationURI>
-		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/astrid/astrid.launch b/astrid/astrid.launch
index affe3f7f1..3083390d0 100644
--- a/astrid/astrid.launch
+++ b/astrid/astrid.launch
@@ -7,6 +7,7 @@
 <stringAttribute key="ch.zork.quicklaunch.mode" value="run"/>
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
 <stringAttribute key="com.android.ide.eclipse.adt.activity" value="com.todoroo.astrid.gtasks.GtasksPreferences"/>
+<stringAttribute key="com.android.ide.eclipse.adt.avd" value="galaxy_tab"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value="-scale 0.7"/>
 <intAttribute key="com.android.ide.eclipse.adt.delay" value="0"/>
 <booleanAttribute key="com.android.ide.eclipse.adt.nobootanim" value="true"/>
diff --git a/greendroid/GDCatalog/.classpath b/greendroid/GDCatalog/.classpath
index 28d6a6ece..a785243ee 100644
--- a/greendroid/GDCatalog/.classpath
+++ b/greendroid/GDCatalog/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/GreenDroid"/>
 	<classpathentry kind="src" path="GreenDroid_src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/.classpath b/tests/.classpath
index 1f0940313..6c2f93551 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/astridApi"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>