From Carlos G Mendioroz:

Use the user defined comment in the Capture Interfaces dialog box.

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

diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 47c75539d3083993958f7a4834d2635ae5b0c09e..62ef5b52d9243c132feef4ac162fdcb1bde6d42a 100644 (file)
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -465,6 +465,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
   GString       *if_tool_str = g_string_new("");
   const gchar   *addr_str;
   gchar         *tmp_str;
+  gchar         *user_descr;
   if_stat_cache_t *sc;
 
   if (cap_if_w != NULL) {
@@ -627,10 +628,16 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
       g_string_append(if_tool_str, "\n");
 
       /* description */
-      if (if_info->description != NULL)
-        if_dlg_data->descr_lb = gtk_label_new(if_info->description);
-      else
-        if_dlg_data->descr_lb = gtk_label_new("");
+      user_descr = capture_dev_user_descr_find(if_info->name);
+      if (user_descr) {
+        if_dlg_data->descr_lb = gtk_label_new(user_descr);
+        g_free (user_descr);
+      } else {
+        if (if_info->description)
+          if_dlg_data->descr_lb = gtk_label_new(if_info->description);
+        else
+          if_dlg_data->descr_lb = gtk_label_new("");
+      }
       gtk_misc_set_alignment(GTK_MISC(if_dlg_data->descr_lb), 0.0f, 0.5f);
       gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->descr_lb, 2, 3, row, row+1);