aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2007-04-24 05:52:01 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2007-04-24 05:52:01 +0000
commitc1d76f94652830af9d83c183eb7ab307ca280810 (patch)
tree27a0b0676d0a09daa0ac8e3ed7bd9ed5db1807ff
parent5aaff9b25274c314ea828d9b2d77b55ec86d1bd8 (diff)
oncly include capture_details_24.xpm IFF we have pcap and if we have gtk>=2 to supress a warning if compiling for gtk 1
svn path=/trunk/; revision=21550
-rw-r--r--gtk/toolbar.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 6a39b59c96..7825b5e46d 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -106,7 +106,9 @@
#include "../image/toolbar/capture_stop_24.xpm"
#include "../image/toolbar/capture_restart_24.xpm"
#include "../image/toolbar/capture_filter_24.xpm"
+#if GTK_MAJOR_VERSION >= 2
#include "../image/toolbar/capture_details_24.xpm"
+#endif
#endif /* HAVE_LIBPCAP */
#include "../image/toolbar/display_filter_24.xpm"
/* these icons are standard stock icons, but used for Wireshark specific stock icon labels */
@@ -223,6 +225,7 @@ static void wireshark_stock_icons(void) {
{ WIRESHARK_STOCK_CAPTURE_RESTART, capture_restart_24_xpm },
{ WIRESHARK_STOCK_CAPTURE_FILTER, capture_filter_24_xpm },
{ WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY, capture_filter_24_xpm },
+qqq
{ WIRESHARK_STOCK_CAPTURE_DETAILS, capture_details_24_xpm },
#endif
{ WIRESHARK_STOCK_DISPLAY_FILTER, display_filter_24_xpm },