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

:wq

svn path=/trunk/; revision=50198

diff --git a/ui/qt/capture_preferences_frame.cpp b/ui/qt/capture_preferences_frame.cpp
index 3763b7a0c0410786e3b7e1bc26f1294d20297edc..e5b629b0cb8d283937d46c1aac4fbf735df53434 100644 (file)
--- a/ui/qt/capture_preferences_frame.cpp
+++ b/ui/qt/capture_preferences_frame.cpp
@@ -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)) {

diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp
index 6b6d77f3c021608bcdd3c1288eb46429e8568c5f..607146a755f79fc226c1a6ed9d8788ba410699ff 100644 (file)
--- a/ui/qt/interface_tree.cpp
+++ b/ui/qt/interface_tree.cpp
@@ -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) {

diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index dc075d7507d8afcbdfe352c45a102dbca7c26f96..56df2fc9b95040a90e8736abf28d26de3bd81e9d 100644 (file)
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -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.");

diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 1bca85ccbb4f539c6462072408c3415a931145da..a0ce0d9d22197d3f65dbd3fd2b8da6231d05fb7e 100644 (file)
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -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++) {