- epan/uat.h: change the UAT_PROTO_DEF macro to handle both the name of the dissector and the handle

- packet-user_encap.c: use the new UAT_PROTO_DEF
- gtk/uat_gui.c:  change the order of "containment" of the widgets to have the clist fields sized to the scrolledwindow instead of the whole window


svn path=/trunk/; revision=21934

1 files changed, 6 insertions, 3 deletions

diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 8ec2011cd7..00c4b9fe33 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -43,8 +43,11 @@
 
 typedef struct _user_encap_t {
 	guint encap;
+	char* payload_proto_name;
 	dissector_handle_t payload_proto;
+	char* header_proto_name;
 	dissector_handle_t header_proto;
+	char* trailer_proto_name;
 	dissector_handle_t trailer_proto;
 	guint header_size;
 	guint trailer_size;
@@ -127,11 +130,11 @@ static void user_update_cb(void* r _U_, const char** err _U_) {
 }
 
 UAT_VS_DEF(user_encap, encap, user_encap_t, WTAP_ENCAP_USER0, ENCAP0_STR)
-UAT_PROTO_DEF(user_encap, payload_proto, user_encap_t)
+UAT_PROTO_DEF(user_encap, payload_proto, payload_proto, payload_proto_name, user_encap_t)
 UAT_DEC_CB_DEF(user_encap, header_size, user_encap_t)
 UAT_DEC_CB_DEF(user_encap, trailer_size, user_encap_t)
-UAT_PROTO_DEF(user_encap, header_proto, user_encap_t)
-UAT_PROTO_DEF(user_encap, trailer_proto, user_encap_t)
+UAT_PROTO_DEF(user_encap, header_proto, header_proto, header_proto_name, user_encap_t)
+UAT_PROTO_DEF(user_encap, trailer_proto, trailer_proto, trailer_proto_name, user_encap_t)
 
 static dissector_handle_t user_encap_handle;