diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-10-02 16:19:55 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-10-02 16:19:55 +0000 |
| commit | 64c2355b675f0c38e1f1d313fe88ded3270cd1dd (patch) | |
| tree | 43da296aaad92668db36ffda59e7e1e841e00d77 /epan/proto.c | |
| parent | 44f914a0f19b1a73bfb66d69d8b3b74e5aa9bb33 (diff) | |
| download | wireshark-64c2355b675f0c38e1f1d313fe88ded3270cd1dd.tar.gz | |
Removed the protocol registration updates in the splash screen for Python
dissectors, because it does not work as expected and causes an assert.
Added generic splash updates for python register and handoff instead.
This should fix bug 5431.
svn path=/trunk/; revision=39221
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/proto.c b/epan/proto.c index e83859d8bf..adbcb53dc8 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -393,7 +393,9 @@ proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_da register_all_protocols_func(cb, client_data); #ifdef HAVE_PYTHON /* Now scan for python protocols */ - register_all_py_protocols_func(cb, client_data); + if(cb) + (*cb)(RA_PYTHON_REGISTER, NULL, client_data); + register_all_py_protocols_func(); #endif #ifdef HAVE_PLUGINS @@ -413,7 +415,9 @@ proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_da #ifdef HAVE_PYTHON /* Now do the same with python dissectors */ - register_all_py_handoffs_func(cb, client_data); + if(cb) + (*cb)(RA_PYTHON_HANDOFF, NULL, client_data); + register_all_py_handoffs_func(); #endif #ifdef HAVE_PLUGINS |