Call the "new-style init" routine for plugins a "register" routine, as

it serves the same purpose as the register routine in a built-in
dissector, and don't require all dissectors to have one, as they might
just be taps.

Get rid of the stats tree's init routine, as it's just a tap, and as it
doesn't do anything.

Update the idl2eth Python script to generate plugins with register routines.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13644 f5534014-38df-0310-8fa8-9805f1628bb7

24 files changed, 143 insertions, 147 deletions

diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c
index 8bccfee84a..a68ff22bdd 100644
--- a/plugins/acn/packet-acn.c
+++ b/plugins/acn/packet-acn.c
@@ -1198,12 +1198,7 @@ proto_reg_handoff_acn(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_acn();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_acn == -1) { /* execute protocol initialization only once */
@@ -1211,6 +1206,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_acn();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/agentx/packet-agentx.c b/plugins/agentx/packet-agentx.c
index 26f19ee6dc..af38ade523 100644
--- a/plugins/agentx/packet-agentx.c
+++ b/plugins/agentx/packet-agentx.c
@@ -1165,12 +1165,7 @@ proto_reg_handoff_agentx(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_agentx();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_agentx == -1) { /* execute protocol initialization only once */
@@ -1178,6 +1173,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_agentx();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c
index 7ce20e79a1..058c02513a 100644
--- a/plugins/artnet/packet-artnet.c
+++ b/plugins/artnet/packet-artnet.c
@@ -2722,12 +2722,7 @@ proto_reg_handoff_artnet(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_artnet();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_artnet == -1) { /* execute protocol initialization only once */
@@ -2735,6 +2730,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_artnet();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 3c2148f776..796c6058ae 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -5212,12 +5212,7 @@ proto_reg_handoff_asn1(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_asn1();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_asn1 == -1) { /* execute protocol initialization only once */
@@ -5225,6 +5220,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_asn1();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/ciscosm/packet-sm.c b/plugins/ciscosm/packet-sm.c
index 94180154ec..e84fcbe6d8 100644
--- a/plugins/ciscosm/packet-sm.c
+++ b/plugins/ciscosm/packet-sm.c
@@ -179,7 +179,7 @@ plugin_reg_handoff_sm(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
 	/* register the new protocol, protocol fields, and subtrees */
 	if (proto_sm == -1) { /* execute protocol initialization only once */
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 0b60707e54..be3eddbd07 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -771,39 +771,7 @@ proto_reg_handoff_docsis (void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff (void)
-{
-  proto_reg_handoff_docsis ();
-  proto_reg_handoff_docsis_bpkmattr ();
-  proto_reg_handoff_docsis_dsarsp ();
-  proto_reg_handoff_docsis_mgmt ();
-  proto_reg_handoff_docsis_rngreq ();
-  proto_reg_handoff_docsis_rngrsp ();
-  proto_reg_handoff_docsis_bpkmreq ();
-  proto_reg_handoff_docsis_dscack ();
-  proto_reg_handoff_docsis_map ();
-  proto_reg_handoff_docsis_tlv ();
-  proto_reg_handoff_docsis_bpkmrsp ();
-  proto_reg_handoff_docsis_dscreq ();
-  proto_reg_handoff_docsis_regack ();
-  proto_reg_handoff_docsis_uccreq ();
-  proto_reg_handoff_docsis_dscrsp ();
-  proto_reg_handoff_docsis_regreq ();
-  proto_reg_handoff_docsis_uccrsp ();
-  proto_reg_handoff_docsis_dsaack ();
-  proto_reg_handoff_docsis_dsdreq ();
-  proto_reg_handoff_docsis_regrsp ();
-  proto_reg_handoff_docsis_ucd ();
-  proto_reg_handoff_docsis_type29ucd ();
-  proto_reg_handoff_docsis_dsareq ();
-  proto_reg_handoff_docsis_dsdrsp ();
-  proto_reg_handoff_docsis_vsif ();
-  proto_reg_handoff_docsis_intrngreq ();
-
-}
-
-G_MODULE_EXPORT void
-new_plugin_init (void)
+plugin_register (void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_docsis == -1)
@@ -838,4 +806,36 @@ new_plugin_init (void)
     }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff (void)
+{
+  proto_reg_handoff_docsis ();
+  proto_reg_handoff_docsis_bpkmattr ();
+  proto_reg_handoff_docsis_dsarsp ();
+  proto_reg_handoff_docsis_mgmt ();
+  proto_reg_handoff_docsis_rngreq ();
+  proto_reg_handoff_docsis_rngrsp ();
+  proto_reg_handoff_docsis_bpkmreq ();
+  proto_reg_handoff_docsis_dscack ();
+  proto_reg_handoff_docsis_map ();
+  proto_reg_handoff_docsis_tlv ();
+  proto_reg_handoff_docsis_bpkmrsp ();
+  proto_reg_handoff_docsis_dscreq ();
+  proto_reg_handoff_docsis_regack ();
+  proto_reg_handoff_docsis_uccreq ();
+  proto_reg_handoff_docsis_dscrsp ();
+  proto_reg_handoff_docsis_regreq ();
+  proto_reg_handoff_docsis_uccrsp ();
+  proto_reg_handoff_docsis_dsaack ();
+  proto_reg_handoff_docsis_dsdreq ();
+  proto_reg_handoff_docsis_regrsp ();
+  proto_reg_handoff_docsis_ucd ();
+  proto_reg_handoff_docsis_type29ucd ();
+  proto_reg_handoff_docsis_dsareq ();
+  proto_reg_handoff_docsis_dsdrsp ();
+  proto_reg_handoff_docsis_vsif ();
+  proto_reg_handoff_docsis_intrngreq ();
+
+}
+
 #endif
diff --git a/plugins/enttec/packet-enttec.c b/plugins/enttec/packet-enttec.c
index c7c0371bee..84799bcfea 100644
--- a/plugins/enttec/packet-enttec.c
+++ b/plugins/enttec/packet-enttec.c
@@ -587,12 +587,7 @@ proto_reg_handoff_enttec(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-	proto_reg_handoff_enttec();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
 	/* register the new protocol, protocol fields, and subtrees */
 	if (proto_enttec == -1) { /* execute protocol initialization only once */
@@ -600,6 +595,11 @@ new_plugin_init(void)
 	}
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+	proto_reg_handoff_enttec();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index 110eec0a88..d44ce4231d 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -859,18 +859,18 @@ void proto_register_handoff_giop_coseventcomm(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-   proto_register_handoff_giop_coseventcomm();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
    if (proto_coseventcomm == -1) {
      proto_register_giop_coseventcomm();
    }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+   proto_register_handoff_giop_coseventcomm();
+}
+
 #endif
 
 
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index 44e6229ff8..057a83dd91 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -1737,18 +1737,16 @@ void proto_register_handoff_giop_cosnaming(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-   proto_register_handoff_giop_cosnaming();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
    if (proto_cosnaming == -1) {
      proto_register_giop_cosnaming();
    }
 }
 
-#endif
-
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+   proto_register_handoff_giop_cosnaming();
+}
 
+#endif
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index ea6196fe7f..eb84399a05 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -2293,12 +2293,7 @@ proto_reg_handoff_gryphon(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_gryphon();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_gryphon == -1) { /* execute protocol initialization only once */
@@ -2306,6 +2301,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_gryphon();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index a87b748d65..f8332b122f 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -2333,13 +2333,7 @@ static void proto_reg_handoff_irda(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void)
-{
-    proto_reg_handoff_irda();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
     /* register the new protocol, protocol fields, and subtrees */
     if (proto_irlap == -1)
@@ -2351,6 +2345,12 @@ new_plugin_init(void)
     }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void)
+{
+    proto_reg_handoff_irda();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c
index 52b57aac05..290f196ebc 100644
--- a/plugins/lwres/packet-lwres.c
+++ b/plugins/lwres/packet-lwres.c
@@ -1523,12 +1523,7 @@ proto_reg_handoff_lwres(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_lwres();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_lwres == -1) { /* execute protocol initialization only once */
@@ -1536,6 +1531,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_lwres();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/mate/mate_plugin.c b/plugins/mate/mate_plugin.c
index b89347d1ce..963e9b75ee 100644
--- a/plugins/mate/mate_plugin.c
+++ b/plugins/mate/mate_plugin.c
@@ -44,7 +44,7 @@ static gboolean initialized = FALSE;
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = VERSION;
 
-G_MODULE_EXPORT void new_plugin_init(void) {
+G_MODULE_EXPORT void plugin_register(void) {
 	
 	/* register the new protocol, protocol fields, and subtrees */
 	if (! initialized ) { /* execute protocol initialization only once */
diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c
index 794fcc9be6..9c83a61711 100644
--- a/plugins/megaco/packet-megaco.c
+++ b/plugins/megaco/packet-megaco.c
@@ -2735,12 +2735,7 @@ static gint tvb_skip_wsp_return(tvbuff_t* tvb, gint offset){
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-	proto_reg_handoff_megaco();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
 	/* register the new protocol, protocol fields, and subtrees */
 	if (proto_megaco == -1) { /* execute protocol initialization only once */
@@ -2748,6 +2743,11 @@ new_plugin_init(void)
 	}
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+	proto_reg_handoff_megaco();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index cc76d8211d..2524333e80 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -1750,12 +1750,7 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset,
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_mgcp();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_mgcp == -1) { /* execute protocol initialization only once */
@@ -1763,6 +1758,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_mgcp();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/opsi/packet-opsi.c b/plugins/opsi/packet-opsi.c
index 2fc4275951..b93e749bab 100644
--- a/plugins/opsi/packet-opsi.c
+++ b/plugins/opsi/packet-opsi.c
@@ -806,7 +806,7 @@ proto_reg_handoff_opsi(void)
 
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
 	/* register the new protocol, protocol fields, and subtrees */
 	if (proto_opsi == -1) { /* execute protocol initialization only once */
diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c
index 916e8a033a..aac945dc02 100644
--- a/plugins/pcli/packet-pcli.c
+++ b/plugins/pcli/packet-pcli.c
@@ -175,12 +175,7 @@ proto_reg_handoff_pcli(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_pcli();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_pcli == -1) { /* execute protocol initialization only once */
@@ -188,6 +183,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_pcli();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/rdm/packet-rdm.c b/plugins/rdm/packet-rdm.c
index 67fed61eab..c85dc5df69 100644
--- a/plugins/rdm/packet-rdm.c
+++ b/plugins/rdm/packet-rdm.c
@@ -260,12 +260,7 @@ proto_reg_handoff_rdm(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_rdm();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rdm == -1) { /* execute protocol initialization only once */
@@ -273,6 +268,11 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_rdm();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/rlm/packet-rlm.c b/plugins/rlm/packet-rlm.c
index aeee463172..79d2e98caa 100644
--- a/plugins/rlm/packet-rlm.c
+++ b/plugins/rlm/packet-rlm.c
@@ -242,7 +242,7 @@ proto_register_rlm(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rlm == -1) { /* execute protocol initialization only once */
diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c
index 10c204d297..cc6b959f96 100644
--- a/plugins/rtnet/packet-rtnet.c
+++ b/plugins/rtnet/packet-rtnet.c
@@ -1402,14 +1402,7 @@ proto_reg_handoff_rtcfg(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_rtmac();
-  proto_reg_handoff_rtcfg();
-  data_handle = find_dissector("data");
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rtmac == -1) { /* execute protocol initialization only once */
@@ -1420,6 +1413,13 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_rtmac();
+  proto_reg_handoff_rtcfg();
+  data_handle = find_dissector("data");
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/rudp/packet-rudp.c b/plugins/rudp/packet-rudp.c
index e9f814ae2e..1355d325d5 100644
--- a/plugins/rudp/packet-rudp.c
+++ b/plugins/rudp/packet-rudp.c
@@ -234,12 +234,7 @@ proto_reg_handoff_rudp(void) {
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-  proto_reg_handoff_rudp();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rudp == -1) { /* execute protocol initialization only once */
@@ -247,5 +242,10 @@ new_plugin_init(void)
   }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_rudp();
+}
+
 #endif
 
diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c
index f2e29d7e56..3621df24b2 100644
--- a/plugins/stats_tree/stats_tree_plugin.c
+++ b/plugins/stats_tree/stats_tree_plugin.c
@@ -38,8 +38,6 @@ extern void register_http_stat_trees(void);
 
 G_MODULE_EXPORT const gchar version[] = "0.0";
 
-G_MODULE_EXPORT void new_plugin_init(void) {}
-
 G_MODULE_EXPORT void plugin_register_tap_listener(void)
 {
 	register_http_stat_trees();
diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c
index ce5ba5bac7..b3feeca699 100644
--- a/plugins/v5ua/packet-v5ua.c
+++ b/plugins/v5ua/packet-v5ua.c
@@ -2372,12 +2372,7 @@ proto_reg_handoff_v5ua(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_reg_handoff(void){
-    proto_reg_handoff_v5ua();
-}
-
-G_MODULE_EXPORT void
-new_plugin_init(void)
+plugin_register(void)
 {
     /* register the new protocol, protocol fields, and subtrees */
     if (proto_v5ua == -1) { /* execute protocol initialization only once */
@@ -2385,6 +2380,11 @@ new_plugin_init(void)
     }
 }
 
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+    proto_reg_handoff_v5ua();
+}
+
 #endif
 
 /* End the functions we need for plugin stuff */
diff --git a/plugins/xml/xml_plugin.c b/plugins/xml/xml_plugin.c
index 08091b9398..6c49f1d066 100644
--- a/plugins/xml/xml_plugin.c
+++ b/plugins/xml/xml_plugin.c
@@ -44,7 +44,7 @@ static gboolean initialized = FALSE;
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = VERSION;
 
-G_MODULE_EXPORT void new_plugin_init() {
+G_MODULE_EXPORT void plugin_register(void) {
 
 	/* register the new protocol, protocol fields, and subtrees */
 	if (! initialized ) { /* execute protocol initialization only once */