# HG changeset patch
# User Vincent Veronis <veroni_v@epitech.net>
# Date 1259941711 -3600
# Node ID e561bc44c3960f130226d6301edffc6e101bb4e5
# Parent  5e48a07294117accf4b166d975dd06b7df7bc66e# Parent  261c4895bf843e92b6dba5fc5670037ff9dc57bc
Merge.

diff -r 261c4895bf84 -r e561bc44c396 res/menu/contactlist_context.xml
--- a/res/menu/contactlist_context.xml	Fri Dec 04 14:26:17 2009 +0100
+++ b/res/menu/contactlist_context.xml	Fri Dec 04 16:48:31 2009 +0100
@@ -13,7 +13,7 @@
 			<item android:id="@+id/contact_list_context_menu_userinfo_subscription"
 				android:title="@string/userinfo_label_re_subscription" />
 			<item android:id="@+id/contact_list_context_menu_userinfo_block"
-				android:title="@string/userinfo_label_block" />
+				android:title="@string/userinfo_label_block" android:visible="false"/>
 			<item android:id="@+id/contact_list_context_menu_userinfo_delete"
 				android:title="@string/userinfo_label_delete" />
 		</menu>
diff -r 261c4895bf84 -r e561bc44c396 src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Fri Dec 04 14:26:17 2009 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Fri Dec 04 16:48:31 2009 +0100
@@ -179,7 +179,7 @@
     @Override
     public void onDestroy() {
 	super.onDestroy();
-	mNotificationManager.cancel(NOTIFICATION_STATUS_ID);
+	mNotificationManager.cancelAll();
 	if (mConnection.isAuthentificated())
 	    mConnection.disconnect();
 	Log.d(TAG, "ONDESTROY");
diff -r 261c4895bf84 -r e561bc44c396 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Dec 04 14:26:17 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Dec 04 16:48:31 2009 +0100
@@ -709,8 +709,8 @@
 	    setView(textEntryView);
 	    mEditTextAlias = (EditText) textEntryView.findViewById(R.id.CDAliasDialogName);
 	    mEditTextAlias.setText(mContact.getName());
-	    setPositiveButton("OK", new ContactDialogAliasDialog());
-	    setNegativeButton("Cancel", new ContactDialogAliasDialog());
+	    setPositiveButton(R.string.OkButton, new ContactDialogAliasDialog());
+	    setNegativeButton(R.string.CancelButton, new ContactDialogAliasDialog());
 	}
 
 	/**