[telepathy-gabble/master] remove invalid assertion
Dafydd Harries
dafydd.harries at collabora.co.uk
Mon Aug 17 06:07:51 PDT 2009
replace_reply_cb() can be called when we don't have a vCard set request in
progress, so it's wrong to assert that priv->edit_pipeline_item is not NULL.
Specifically, it's called when a pre-set get request fails.
---
src/vcard-manager.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 7c3e276..d4ae690 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -847,6 +847,9 @@ get_error_from_pipeline_reply (LmMessage *reply_msg, GError *error)
return err;
}
+/* Called when a pre-set get request failed, or when a set request succeeded
+ * or failed.
+ */
static void
replace_reply_cb (GabbleConnection *conn,
LmMessage *reply_msg,
@@ -861,7 +864,7 @@ replace_reply_cb (GabbleConnection *conn,
GList *li;
LmMessageNode *node;
- g_assert (priv->edit_pipeline_item != NULL);
+ /* If we sent a SET request, it's dead now. */
priv->edit_pipeline_item = NULL;
DEBUG ("called: %s error", (error) ? "some" : "no");
--
1.5.6.5
More information about the telepathy-commits
mailing list