From Didier Gautheron (bug 3126):

Update expert info icon on redissect.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28269 f5534014-38df-0310-8fa8-9805f1628bb7

8 files changed, 28 insertions, 18 deletions

diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
index 0a54353b90..f8005df8f5 100644
--- a/gtk/airpcap_dlg.c
+++ b/gtk/airpcap_dlg.c
@@ -1800,7 +1800,7 @@ on_enable_decryption_en_changed(GtkWidget *w, gpointer data)
     }
 
     /* Redissect all the packets, and re-evaluate the display filter. */
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 /*
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 2285f87c7a..9902844559 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -37,6 +37,7 @@
 #include "../globals.h"
 #include "../simple_dialog.h"
 
+#include "gtk/main.h"
 #include "gtk/decode_as_dlg.h"
 #include "gtk/dlg_utils.h"
 #include "gtk/gui_utils.h"
@@ -428,7 +429,7 @@ decode_clear_all(void)
 
     decode_dcerpc_reset_all();
 
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 
@@ -837,7 +838,7 @@ decode_ok_cb (GtkWidget *ok_bt _U_, gpointer parent_w)
     g_slist_free(decode_dimmable);
     decode_dimmable = NULL;
 
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 /*
@@ -866,7 +867,7 @@ decode_apply_cb (GtkWidget *apply_bt _U_, gpointer parent_w)
     func = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_ACTION);
     func(notebook_pg);
 
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 /*
diff --git a/gtk/main.c b/gtk/main.c
index cffb210069..1a524fc584 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -3392,7 +3392,13 @@ void change_configuration_profile (const gchar *profile_name)
 
    /* Recreate the packet list according to new preferences */
    packet_list_recreate ();
-   status_expert_update();
    cfile.cinfo.columns_changed = FALSE; /* Reset value */
    user_font_apply();
 }
+
+/** redissect packets and update UI */
+void redissect_packets(void)
+{
+    cf_redissect_packets(&cfile);
+    status_expert_update();
+}
diff --git a/gtk/main.h b/gtk/main.h
index 2667214d5b..af9d01c9fb 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -340,6 +340,9 @@ extern void prefs_to_capture_opts(void);
 /** Change configuration profile */
 extern void change_configuration_profile(const gchar *profile_name);
 
+/** redissect packets and update UI */
+extern void redissect_packets(void);
+
 extern GtkWidget *pkt_scrollw;
 
 #endif /* __MAIN_H__ */
diff --git a/gtk/main_menu.c b/gtk/main_menu.c
index 1447308b4d..5704b7f5ed 100644
--- a/gtk/main_menu.c
+++ b/gtk/main_menu.c
@@ -2751,7 +2751,7 @@ menu_prefs_toggle_bool (GtkWidget *w, gpointer data)
     if (!prefs.gui_use_pref_save) {
         prefs_main_write();
     }
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 static void
@@ -2772,7 +2772,7 @@ menu_prefs_change_enum (GtkWidget *w, gpointer data)
         if (!prefs.gui_use_pref_save) {
             prefs_main_write();
         }
-        cf_redissect_packets(&cfile);
+        redissect_packets();
     }
 }
 
@@ -2837,7 +2837,7 @@ menu_prefs_change_ok (GtkWidget *w, gpointer parent_w)
         if (!prefs.gui_use_pref_save) {
             prefs_main_write();
         }
-        cf_redissect_packets(&cfile);
+        redissect_packets();
     }
 
     window_destroy(GTK_WIDGET(parent_w));
diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c
index dbbf086f67..bc585ce254 100644
--- a/gtk/main_packet_list.c
+++ b/gtk/main_packet_list.c
@@ -569,7 +569,7 @@ packet_list_recreate(void)
     main_widgets_rearrange();
 
     if(cfile.state != FILE_CLOSED)
-        cf_redissect_packets(&cfile);
+       redissect_packets();
 }
 
 void
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 97058fe34c..2c3c31ddea 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1399,7 +1399,7 @@ prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
   if (must_redissect) {
     /* Redissect all the packets, and re-evaluate the display filter. */
-    cf_redissect_packets(&cfile);
+    redissect_packets();
   }
 
 }
@@ -1428,7 +1428,7 @@ prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
 
   if (must_redissect) {
     /* Redissect all the packets, and re-evaluate the display filter. */
-    cf_redissect_packets(&cfile);
+    redissect_packets();
   }
 }
 
@@ -1463,7 +1463,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w)
 
   if (must_redissect) {
     /* Redissect all the packets, and re-evaluate the display filter. */
-    cf_redissect_packets(&cfile);
+    redissect_packets();
   }
 }
 
@@ -1564,7 +1564,7 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
 
   if (must_redissect) {
     /* Redissect all the packets, and re-evaluate the display filter. */
-    cf_redissect_packets(&cfile);
+    redissect_packets();
   }
 }
 
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 00aa078c65..8ccdaf750b 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -362,7 +362,7 @@ proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
   window_destroy(GTK_WIDGET(parent_w));
   if (redissect)
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 static void
@@ -379,7 +379,7 @@ proto_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
   }
 
   if (redissect)
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 static void
@@ -390,7 +390,7 @@ proto_save_cb(GtkWidget *save_bt _U_, gpointer parent_w)
 
   if (set_proto_selection(GTK_WIDGET(parent_w))) {
     /* Redissect all the packets, and re-evaluate the display filter. */
-    cf_redissect_packets(&cfile);
+    redissect_packets();
   }
 }
 
@@ -402,7 +402,7 @@ proto_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
   redissect = revert_proto_selection();
   window_destroy(GTK_WIDGET(parent_w));
   if (redissect)
-    cf_redissect_packets(&cfile);
+    redissect_packets();
 }
 
 static gboolean
@@ -523,7 +523,7 @@ proto_disable_dialog_cb(gpointer dialog _U_, gint btn, gpointer data)
     if (proto_is_protocol_enabled(protocol) == TRUE) {
       if (proto_can_toggle_protocol(id) == TRUE) {
         proto_set_decoding(id, FALSE);
-        cf_redissect_packets(&cfile);
+        redissect_packets();
       }
     }
   }