diff options
author | George Kiagiadakis <gkiagia@tolabaki.gr> | 2016-12-03 14:46:21 +0200 |
---|---|---|
committer | George Kiagiadakis <gkiagia@tolabaki.gr> | 2016-12-03 14:46:21 +0200 |
commit | 14df9f80b63ef87ec9a814cf22dfc546f961ed7f (patch) | |
tree | ae471899ccd32ec1260bfbd37850b318d5548cd4 | |
parent | dc32fcf1acfc7383d8785986cbd8804e63c5e8d2 (diff) | |
parent | e89fecb263550c94a3566c97327955afb8fef19f (diff) | |
download | telepathy-haze-next.tar.gz |
Merge branch 'master' into nextnext
-rw-r--r-- | src/contact-list.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/contact-list.c b/src/contact-list.c index 6853d8c..4bd5ce1 100644 --- a/src/contact-list.c +++ b/src/contact-list.c @@ -532,7 +532,8 @@ haze_contact_list_request_subscription (HazeContactList *self, /* If the buddy already exists, then it should already be on the * subscribe list. */ - g_assert (purple_find_buddy (account, bname) == NULL); + if (purple_find_buddy (account, bname) != NULL) + return; buddy = purple_buddy_new (account, bname, NULL); |