diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-22 06:02:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-22 06:02:49 +0000 |
| commit | bd976ae6c06b2111bd82df16b77739731dc17402 (patch) | |
| tree | 406d65d00129abb45868150687f267a139bbf670 /ui/gtk/prefs_capture.c | |
| parent | b9e8e95ffe9f352cde5847d458081826523cf46f (diff) | |
| download | wireshark-bd976ae6c06b2111bd82df16b77739731dc17402.tar.gz | |
On UN*X, if an interface has a description, use it as the "friendly
name". If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.
If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.
Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.
svn path=/trunk/; revision=46131
Diffstat (limited to 'ui/gtk/prefs_capture.c')
| -rw-r--r-- | ui/gtk/prefs_capture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index 1baa8ad611..47560acc8c 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -1353,9 +1353,9 @@ ifopts_options_add(GtkListStore *list_store, if_info_t *if_info) /* set device name text */ text[0] = g_strdup(if_info->name); - /* set OS description */ - if (if_info->description != NULL) - text[1] = g_strdup(if_info->description); + /* set vendor description */ + if (if_info->vendor_description != NULL) + text[1] = g_strdup(if_info->vendor_description); else text[1] = g_strdup(""); |