[gcr] egg: Fix regression of DER choice encoding

[Stefan Walter <stefw src gnome org>]

commit ef4773b8f4b00ca9b4c2fa4e73e2c6523d1f7389
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Nov 17 10:46:44 2011 +0100

    egg: Fix regression of DER choice encoding

 egg/egg-asn1x.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
index 5a7db21..b7890e8 100644
--- a/egg/egg-asn1x.c
+++ b/egg/egg-asn1x.c
@@ -1611,10 +1611,11 @@ anode_encoder_unsigned (gpointer user_data,
 
 static gboolean
 anode_encoder_structured (gpointer user_data,
-                          GNode *node,
+                          GNode *unused,
                           guchar *data,
                           gsize n_data)
 {
+	GNode *node = user_data;
 	GNode *child;
 	gsize length;
 	Atlv *tlv;
@@ -1657,7 +1658,7 @@ anode_encoder_choice (gpointer user_data,
 
 	enc = anode_get_enc_data (child);
 	g_return_val_if_fail (enc, FALSE);
-	if (!(enc->encoder) (enc->data, node, data, n_data))
+	if (!(enc->encoder) (enc->data, child, data, n_data))
 		return FALSE;
 
 	/* Child's buffer matches ours */