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 /gtk/about_dlg.c | |
| parent | 44f914a0f19b1a73bfb66d69d8b3b74e5aa9bb33 (diff) | |
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 'gtk/about_dlg.c')
| -rw-r--r-- | gtk/about_dlg.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 1dedc14586..6f3e5404ad 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -210,12 +210,18 @@ splash_update(register_action_e action, const char *message, gpointer client_dat case RA_PLUGIN_REGISTER: action_msg = "Registering plugins ..."; break; + case RA_PYTHON_REGISTER: + action_msg = "Registering Python dissectors ..."; + break; case RA_HANDOFF: action_msg = "Handing off dissector ..."; break; case RA_PLUGIN_HANDOFF: action_msg = "Handing off plugins ..."; break; + case RA_PYTHON_HANDOFF: + action_msg = "Handing off Python dissectors ..."; + break; case RA_LUA_PLUGINS: action_msg = "Loading Lua plugins ..."; break; @@ -241,6 +247,9 @@ splash_update(register_action_e action, const char *message, gpointer client_dat #ifdef HAVE_LUA_5_1 ul_count++; /* additional one for lua plugins */ #endif +#ifdef HAVE_PYTHON + ul_count += 2; /* additional 2 for python register and handoff */ +#endif } main_lb = g_object_get_data(G_OBJECT(win), "protocol_label"); |