# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1259942523 -3600
# Node ID 98442ee557bfba01647c485200b6c3b8e8080cac
# Parent  9bc335cd3a0d1bb008545995ab684168d681eb2c# Parent  e561bc44c3960f130226d6301edffc6e101bb4e5
merge

diff -r 9bc335cd3a0d -r 98442ee557bf res/menu/contactlist_context.xml
--- a/res/menu/contactlist_context.xml	Fri Dec 04 17:01:36 2009 +0100
+++ b/res/menu/contactlist_context.xml	Fri Dec 04 17:02:03 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 9bc335cd3a0d -r 98442ee557bf src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Fri Dec 04 17:01:36 2009 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Fri Dec 04 17:02:03 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 9bc335cd3a0d -r 98442ee557bf src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Dec 04 17:01:36 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Dec 04 17:02:03 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());
 	}
 
 	/**