diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-18 13:47:51 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-18 13:47:51 +0000 |
| commit | bcce213e495424684e2cda11f6e5559032e481b4 (patch) | |
| tree | 5ccfafd52d5a2c4dfa990f0820aab0addee81bed | |
| parent | ac6bfbe70f5ac35d0b998854d3d5ae17ee55be78 (diff) | |
Use wocky_node_matches() in a couple of places
| -rw-r--r-- | wocky/wocky-connector.c | 3 | ||||
| -rw-r--r-- | wocky/wocky-data-form.c | 3 | ||||
| -rw-r--r-- | wocky/wocky-tls-connector.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c index 556ab7c..244f94b 100644 --- a/wocky/wocky-connector.c +++ b/wocky/wocky-connector.c @@ -1183,8 +1183,7 @@ xmpp_features_cb (GObject *source, DEBUG ("received feature stanza from server"); node = wocky_stanza_get_top_node (stanza); - if (wocky_strdiff (node->name, "features") || - wocky_strdiff (wocky_node_get_ns (node), WOCKY_XMPP_NS_STREAM)) + if (!wocky_node_matches (node, "features", WOCKY_XMPP_NS_STREAM)) { char *msg = state_message (priv, "Malformed or missing feature stanza"); abort_connect_code (data, WOCKY_CONNECTOR_ERROR_BAD_FEATURES, msg); diff --git a/wocky/wocky-data-form.c b/wocky/wocky-data-form.c index 4eb3b66..e945be6 100644 --- a/wocky/wocky-data-form.c +++ b/wocky/wocky-data-form.c @@ -572,8 +572,7 @@ wocky_data_form_new_from_node (WockyNode *x, const gchar *type, *title, *instructions; WockyDataForm *form; - if (wocky_strdiff (x->name, "x") - || x->ns != g_quark_from_string (WOCKY_XMPP_NS_DATA)) + if (!wocky_node_matches (x, "x", WOCKY_XMPP_NS_DATA)) { DEBUG ("Invalid 'x' node"); g_set_error (error, WOCKY_DATA_FORM_ERROR, diff --git a/wocky/wocky-tls-connector.c b/wocky/wocky-tls-connector.c index 9de49b7..9cb3bf7 100644 --- a/wocky/wocky-tls-connector.c +++ b/wocky/wocky-tls-connector.c @@ -372,8 +372,7 @@ starttls_recv_cb (GObject *source, DEBUG ("Received STARTTLS response"); node = wocky_stanza_get_top_node (stanza); - if (wocky_strdiff (node->name, "proceed") || - wocky_strdiff (wocky_node_get_ns (node), WOCKY_XMPP_NS_TLS)) + if (!wocky_node_matches (node, "proceed", WOCKY_XMPP_NS_TLS)) { report_error_in_idle (self, WOCKY_CONNECTOR_ERROR_TLS_REFUSED, "%s", "STARTTLS refused by the server"); |