diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-09 16:42:58 -0400 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-12-20 17:39:29 +0000 |
| commit | 9ba9cd83a4f72339b15aebbc1fbdde32f08ef3bc (patch) | |
| tree | 4ed17ac7d9681f43bf1e0e1069bb2a84a48a8387 /ui/capture.c | |
| parent | 2bb8255e29e26c7c14f7a83ce33b41f9af18501e (diff) | |
| download | wireshark-9ba9cd83a4f72339b15aebbc1fbdde32f08ef3bc.tar.gz | |
Qt: Add a CaptureFile class.
Wrap the capture_file struct in a QObject which translates cf_cb_* and
capture_cb_* events into signals. Move the global cfile to
capture_file.cpp.
Don't use a void pointer for the capture file struct.
Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a
Reviewed-on: https://code.wireshark.org/review/5885
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/capture.c')
| -rw-r--r-- | ui/capture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/capture.c b/ui/capture.c index cfc75b979d..254cda3f4e 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -105,14 +105,14 @@ capture_callback_add(capture_callback_t func, gpointer user_data) } void -capture_callback_remove(capture_callback_t func) +capture_callback_remove(capture_callback_t func, gpointer user_data) { capture_callback_data_t *cb; GList *cb_item = capture_callbacks; while(cb_item != NULL) { cb = (capture_callback_data_t *)cb_item->data; - if(cb->cb_fct == func) { + if(cb->cb_fct == func && cb->user_data == user_data) { capture_callbacks = g_list_remove(capture_callbacks, cb); g_free(cb); return; |