1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate the main_window_update change of few commits ago into the qt client

Browse Source 
:wq



svn path=/trunk/; revision=50198
This commit is contained in:
Luis Ontanon 2013-06-27 19:24:39 +00:00
parent ac3f0d7483
commit 24a5467228
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/qt/capture_preferences_frame.cpp
View File

@ -31,6 +31,7 @@
#include <QSpacerItem>
#include "capture_ui_utils.h"
#include "ui/ui_util.h"
#include <cstdio>
#include <epan/prefs-int.h>
@ -73,7 +74,7 @@ void CapturePreferencesFrame::updateWidgets()
int err;
ui->defaultInterfaceComboBox->clear();
if_list = capture_interface_list(&err, NULL);
if_list = capture_interface_list(&err, NULL,main_window_update);
combo_list = build_capture_combo_list(if_list, FALSE);
free_interface_list(if_list);
for (combo_entry = combo_list; combo_entry != NULL && combo_entry->data != NULL; combo_entry = g_list_next(combo_entry)) {

3
ui/qt/interface_tree.cpp
View File

@ -26,6 +26,7 @@
#include "ui/capture_globals.h"
#include "ui/iface_lists.h"
#include "ui/utf8_entities.h"
#include "ui/ui_util.h"
#include "sparkline_delegate.h"
#include "wireshark_application.h"
@ -117,7 +118,7 @@ void InterfaceTree::getInterfaceList()
clear();
if_list = capture_interface_list(&err, &err_str);
if_list = capture_interface_list(&err, &err_str,main_window_update);
if_list = g_list_sort(if_list, if_list_comparator_alph);
if (if_list == NULL) {

4
ui/qt/main.cpp
View File

@ -687,7 +687,7 @@ int main(int argc, char *argv[])
break;
case 'D': /* Print a list of capture devices and exit */
#ifdef HAVE_LIBPCAP
if_list = capture_interface_list(&err, &err_str);
if_list = capture_interface_list(&err, &err_str, main_window_update);
if (if_list == NULL) {
switch (err) {
case CANT_GET_INTERFACE_LIST:
@ -862,7 +862,7 @@ int main(int argc, char *argv[])
/////////
#ifdef HAVE_LIBPCAP
fill_in_local_interfaces();
fill_in_local_interfaces(main_window_update);
// if (start_capture && list_link_layer_types) {
// /* Specifying *both* is bogus. */
// cmdarg_err("You can't specify both -L and a live capture.");

3
ui/qt/main_window_slots.cpp
View File

@ -57,6 +57,7 @@
#include "epan/filter_expressions.h"
#include "ui/alert_box.h"
#include "ui/ui_util.h"
#include "ui/capture_globals.h"
#include "ui/help_url.h"
#include "ui/main_statusbar.h"
@ -433,7 +434,7 @@ void MainWindow::startCapture() {
collect_ifaces(&global_capture_opts);
cfile.window = this;
if (capture_start(&global_capture_opts, &global_capture_session)) {
if (capture_start(&global_capture_opts, &global_capture_session, main_window_update)) {
/* The capture succeeded, which means the capture filter syntax is
valid; add this capture filter to the recent capture filter list. */
for (i = 0; i < global_capture_opts.ifaces->len; i++) {