diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-06-28 20:06:37 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-06-28 20:06:37 +0000 |
| commit | 99193ddeebdc2db2f22f726b9414aba66c11f13d (patch) | |
| tree | c2f6c9b47e4a767a7fab569e0e692ca17fd6d8a8 /ui | |
| parent | 90265cafabdd2d4f07f27c480fb9884766795769 (diff) | |
capture_get_if_icon() is no longer platform-dependent; the
platform-dependent work is now done in get_interface_type().
That means we also don't need to protect the handling of IF_DIALUP or
even IF_AIRPCAP in #ifdefs, just in case we add support for those types
in other OSes.
Nothing's uisng the capture_ethernet_16.xpm image here, so don't bother
including it. (Does *anybody* use it? I couldn't find any uses, but
maybe we should use that.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43531 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/capture_if_dlg.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index e319bbde7f..94b19d6c50 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -74,10 +74,7 @@ #include "ui/gtk/remote_icons.h" #endif -#ifdef _WIN32 -#include "../../image/toolbar/capture_ethernet_16.xpm" #include "../../image/toolbar/modem_16.xpm" -#endif #include "../../image/toolbar/network_virtual_16.xpm" @@ -414,7 +411,6 @@ gint if_list_comparator_alph (const void *first_arg, const void *second_arg){ /* * Used to retrieve the interface icon. - * This is hideously platform-dependent. */ GtkWidget * capture_get_if_icon(interface_t *device) { @@ -424,16 +420,12 @@ GtkWidget * capture_get_if_icon(interface_t *device) } #endif switch (device->type) { -#ifdef _WIN32 case IF_DIALUP: return xpm_to_widget(modem_16_xpm); -#endif case IF_WIRELESS: return pixbuf_to_widget(network_wireless_pb_data); -#ifdef HAVE_AIRPCAP case IF_AIRPCAP: return xpm_to_widget(capture_airpcap_16_xpm); -#endif case IF_BLUETOOTH: return pixbuf_to_widget(network_bluetooth_pb_data); case IF_USB: |