[Telepathy-commits] [telepathy-haze/master] Don't assert that valid handles are on subscribe in SetAliases

[Will Thompson]

---
 src/connection-aliasing.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index db8fc80..079730e 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -169,10 +169,16 @@ set_aliases_foreach (gpointer key,
     {
         PurpleBuddy *buddy = purple_find_buddy (data->conn->account, bname);
 
-        g_assert (buddy != NULL);
-
-        purple_blist_alias_buddy (buddy, new_alias);
-        serv_alias_buddy (buddy);
+        if (buddy == NULL)
+        {
+            g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+                "You can't set the alias of someone not on your contact list");
+        }
+        else
+        {
+            purple_blist_alias_buddy (buddy, new_alias);
+            serv_alias_buddy (buddy);
+        }
     }
 
     if (error) {
-- 
1.5.6.3