# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1263661112 -3600
# Node ID af35b5109f172411de5798991e89919b7ed5cf85
# Parent  f1d6e2fa672f551cd161d1d5e752057485d57c85# Parent  048bc25afa8374ac5c8841eb2495a5dc40631f6f
merge

diff -r f1d6e2fa672f -r af35b5109f17 .classpath
--- a/.classpath	Sat Jan 16 17:57:08 2010 +0100
+++ b/.classpath	Sat Jan 16 17:58:32 2010 +0100
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="lib" path="libs/smackx-debug.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/smackx-jingle.jar" sourcepath="/home/nikita/devel/smack">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="libs/jlibrtp.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/android/docs/reference/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="libs/security.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="lib" path="libs/smackx-debug.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/smackx-jingle.jar" sourcepath="/home/nikita/devel/smack">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/jlibrtp.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/android/docs/reference/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/security.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff -r f1d6e2fa672f -r af35b5109f17 AndroidManifest.xml
--- a/AndroidManifest.xml	Sat Jan 16 17:57:08 2010 +0100
+++ b/AndroidManifest.xml	Sat Jan 16 17:58:32 2010 +0100
@@ -85,6 +85,6 @@
 	<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
-	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="6" />
+	<uses-sdk android:minSdkVersion="3"/>
 
 </manifest> 
diff -r f1d6e2fa672f -r af35b5109f17 default.properties
--- a/default.properties	Sat Jan 16 17:57:08 2010 +0100
+++ b/default.properties	Sat Jan 16 17:58:32 2010 +0100
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-5
+target=android-4
 apk-configurations=
diff -r f1d6e2fa672f -r af35b5109f17 res/anim/rotate_and_scale.xml
--- a/res/anim/rotate_and_scale.xml	Sat Jan 16 17:57:08 2010 +0100
+++ b/res/anim/rotate_and_scale.xml	Sat Jan 16 17:58:32 2010 +0100
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:fromXScale="0.5" android:toXScale="1.0"
-	android:fromYScale="0.5" android:toYScale="1.0"
+    <scale android:fromXScale="0.3" android:toXScale="0.3"
+	android:fromYScale="0.3" android:toYScale="0.3"
 	android:pivotX="50%" android:pivotY="50%" 
 	android:repeatMode="reverse" android:duration="8000"
 	android:repeatCount="infinite" />
diff -r f1d6e2fa672f -r af35b5109f17 src/com/beem/project/beem/ui/Subscription.java
--- a/src/com/beem/project/beem/ui/Subscription.java	Sat Jan 16 17:57:08 2010 +0100
+++ b/src/com/beem/project/beem/ui/Subscription.java	Sat Jan 16 17:58:32 2010 +0100
@@ -162,7 +162,7 @@
 		    break;
 		case R.id.SubscriptionRefuse:
 		    Toast.makeText(Subscription.this, getString(R.string.SubscriptRefused), Toast.LENGTH_SHORT).show();
-
+		    finish();
 		    break;
 		default:
 		    Toast.makeText(Subscription.this, getString(R.string.SubscriptError), Toast.LENGTH_SHORT).show();