From 456bf0b515902b4f32063fcee4e23dccb622915c Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@googlemail.com>
Date: Tue, 30 Mar 2010 23:17:23 +0200
Subject: [PATCH] ConversationActivity: Added "close" to menu

---
 res/menu/conversations.xml                       |  6 +++++-
 res/values/strings.xml                           |  1 +
 src/org/yaaic/activity/ConversationActivity.java | 10 +++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index 187025c..27b51fc 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -24,8 +24,12 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         android:id="@+id/join"
         android:title="@string/join_channel"
         android:icon="@android:drawable/ic_menu_add" />
+    <item
+        android:id="@+id/close"
+        android:title="@string/close"
+        android:icon="@android:drawable/ic_menu_close_clear_cancel" />
     <item
         android:id="@+id/disconnect"
         android:title="@string/disconnect"
-        android:icon="@android:drawable/ic_menu_close_clear_cancel" />
+        android:icon="@android:drawable/ic_menu_revert" />
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5e924be..74edb8f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="channel">Channel</string>
     <string name="join">Join</string>
     <string name="join_channel">Join Channel</string>
+    <string name="close">Close</string>
     <string name="connect">Connect</string>
     <string name="disconnect">Disconnect</string>
     <string name="edit">Edit</string>
diff --git a/src/org/yaaic/activity/ConversationActivity.java b/src/org/yaaic/activity/ConversationActivity.java
index 519073d..307d93e 100644
--- a/src/org/yaaic/activity/ConversationActivity.java
+++ b/src/org/yaaic/activity/ConversationActivity.java
@@ -41,6 +41,7 @@ import android.widget.Gallery;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.ViewSwitcher;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -233,7 +234,14 @@ public class ConversationActivity extends Activity implements ServiceConnection,
 				setResult(RESULT_OK);
 				finish();
 				break;
-				
+			case R.id.close:
+				Conversation conversation = deckAdapter.getItem(deck.getSelectedItemPosition());
+				if (conversation.getType() != Conversation.TYPE_SERVER) {
+					onRemoveConversation(conversation.getName());
+				} else {
+					Toast.makeText(this, "You can not close the server info window", Toast.LENGTH_SHORT).show();
+				}
+				break;
 			case R.id.join:
 				startActivityForResult(new Intent(this, JoinActivity.class), 0);
 				break;