diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-27 17:10:50 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-27 17:10:50 +0000 |
| commit | 0bdc0efc46ec66a298306aae253225c702ed6bea (patch) | |
| tree | 1d6db93f3252994330777f123cb3d038518080e9 /capture_ifinfo.c | |
| parent | b450609a5561db9ddfc23b41c742979f5c4b3a32 (diff) | |
get main_window_update out of the way... pass an update_cb to the capture_sync stuff
... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!
I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.
svn path=/trunk/; revision=50188
Diffstat (limited to 'capture_ifinfo.c')
| -rw-r--r-- | capture_ifinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/capture_ifinfo.c b/capture_ifinfo.c index 8b6faaea6e..a0a5dea2fd 100644 --- a/capture_ifinfo.c +++ b/capture_ifinfo.c @@ -105,7 +105,7 @@ static void append_remote_list(GList *iflist) /* XXX - We parse simple text output to get our interface list. Should * we use "real" data serialization instead, e.g. via XML? */ GList * -capture_interface_list(int *err, char **err_str) +capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) { int ret; GList *if_list = NULL; @@ -119,7 +119,7 @@ capture_interface_list(int *err, char **err_str) g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ..."); /* Try to get our interface list */ - ret = sync_interface_list_open(&data, &primary_msg, &secondary_msg); + ret = sync_interface_list_open(&data, &primary_msg, &secondary_msg, update_cb); if (ret != 0) { g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!"); if (err_str) { @@ -206,7 +206,7 @@ capture_interface_list(int *err, char **err_str) * we use "real" data serialization instead, e.g. via XML? */ if_capabilities_t * capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode, - char **err_str) + char **err_str, void (*update_cb)(void)) { if_capabilities_t *caps; GList *linktype_list = NULL; @@ -219,7 +219,7 @@ capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode, /* Try to get our interface list */ err = sync_if_capabilities_open(ifname, monitor_mode, &data, - &primary_msg, &secondary_msg); + &primary_msg, &secondary_msg, update_cb); if (err != 0) { g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities failed!"); if (err_str) { |