forked from osmocom/wireshark
Don't include \r in linktype on win32, it looks weird in the combo box.
svn path=/trunk/; revision=25410
This commit is contained in:
parent
d58dd2088f
commit
d623efba63
|
@ -634,7 +634,11 @@ capture_interface_list(int *err, char **err_str)
|
|||
}
|
||||
|
||||
/* Split our lines */
|
||||
#ifdef _WIN32
|
||||
raw_list = g_strsplit(msg, "\r\n", 0);
|
||||
#else
|
||||
raw_list = g_strsplit(msg, "\n", 0);
|
||||
#endif
|
||||
g_free(msg);
|
||||
|
||||
for (i = 0; raw_list[i] != NULL; i++) {
|
||||
|
@ -717,7 +721,11 @@ capture_pcap_linktype_list(const gchar *ifname, char **err_str)
|
|||
}
|
||||
|
||||
/* Split our lines */
|
||||
#ifdef _WIN32
|
||||
raw_list = g_strsplit(msg, "\r\n", 0);
|
||||
#else
|
||||
raw_list = g_strsplit(msg, "\n", 0);
|
||||
#endif
|
||||
g_free(msg);
|
||||
|
||||
for (i = 0; raw_list[i] != NULL; i++) {
|
||||
|
|
Loading…
Reference in New Issue