[telepathy-gabble/master] replace_reply_cb(): cancel all pending vCard edit requests if there was an error

[Dafydd Harries]

Previously, we only cancelled an edit request if req->set_in_pipeline was set,
which was only set when the set request was sent. Hence, if you made a vCard
change which depended on a get request that failed, your callback would never
be called.
---
 src/vcard-manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 189b22d..53c7725 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -906,7 +906,7 @@ replace_reply_cb (GabbleConnection *conn,
     {
       GabbleVCardManagerEditRequest *req = li->data;
       li = g_list_next (li);
-      if (req->set_in_pipeline)
+      if (req->set_in_pipeline || err)
         {
           if (req->callback)
             {
-- 
1.5.6.5