aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--globals.h2
-rw-r--r--gtk/capture_if_dlg.h8
-rw-r--r--gtk/main_menubar.c8
-rw-r--r--gtk/stock_icons.c6
-rw-r--r--gtk/stock_icons.h2
5 files changed, 6 insertions, 20 deletions
diff --git a/globals.h b/globals.h
index 0e6c6bbf82..5bb8718b67 100644
--- a/globals.h
+++ b/globals.h
@@ -33,10 +33,8 @@ extern "C" {
#include <epan/timestamp.h>
extern capture_file cfile;
-#ifdef HAVE_LIBPCAP
/** @todo move this to the gtk dir */
extern gboolean auto_scroll_live;
-#endif
#ifdef __cplusplus
}
diff --git a/gtk/capture_if_dlg.h b/gtk/capture_if_dlg.h
index 5f66d9d9de..3c2f2359d0 100644
--- a/gtk/capture_if_dlg.h
+++ b/gtk/capture_if_dlg.h
@@ -32,10 +32,6 @@
void
set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress);
-#ifdef HAVE_LIBPCAP
-
-#include "capture_ifinfo.h" /* for if_info_t */
-
/** User requested the "Capture Interfaces" dialog box by menu or toolbar.
*
* @param widget parent widget (unused)
@@ -44,6 +40,10 @@ set_capture_if_dialog_for_capture_in_progress(gboolean capture_in_progress);
void
capture_if_cb(GtkWidget *widget, gpointer data);
+#ifdef HAVE_LIBPCAP
+
+#include "capture_ifinfo.h" /* for if_info_t */
+
/*
* Used to retrieve the interface icon
*/
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c
index a36152f4a1..c4a6f60bfd 100644
--- a/gtk/main_menubar.c
+++ b/gtk/main_menubar.c
@@ -1576,14 +1576,13 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Go/LastPacket", GTK_STOCK_GOTO_BOTTOM, "_Last Packet", "<control>End", NULL, G_CALLBACK(goto_bottom_frame_cb) },
{ "/Go/PreviousPacketInConversation", GTK_STOCK_GO_UP, "Previous Packet In Conversation", "<control>comma", NULL, G_CALLBACK(goto_previous_frame_conversation_cb) },
{ "/Go/NextPacketInConversation", GTK_STOCK_GO_DOWN, "Next Packet In Conversation", "<control>period", NULL, G_CALLBACK(goto_next_frame_conversation_cb) },
-#ifdef HAVE_LIBPCAP
+
{ "/Capture/Interfaces", WIRESHARK_STOCK_CAPTURE_INTERFACES, "_Interfaces...", "<control>I", NULL, G_CALLBACK(capture_if_cb) },
{ "/Capture/Options", WIRESHARK_STOCK_CAPTURE_OPTIONS, "_Options...", "<control>K", NULL, G_CALLBACK(capture_prep_cb) },
{ "/Capture/Start", WIRESHARK_STOCK_CAPTURE_START, "_Start", "<control>E", NULL, G_CALLBACK(capture_start_cb) },
{ "/Capture/Stop", WIRESHARK_STOCK_CAPTURE_STOP, "S_top", "<control>E", NULL, G_CALLBACK(capture_stop_cb) },
{ "/Capture/Restart", WIRESHARK_STOCK_CAPTURE_RESTART, "_Restart", "<control>R", NULL, G_CALLBACK(capture_restart_cb) },
{ "/Capture/CaptureFilters", WIRESHARK_STOCK_CAPTURE_FILTER, "Capture _Filters...", NULL, NULL, G_CALLBACK(cfilter_dialog_cb) },
-#endif /* HAVE_LIBPCAP */
{ "/Analyze/DisplayFilters", WIRESHARK_STOCK_DISPLAY_FILTER, "_Display Filters...", NULL, NULL, G_CALLBACK(dfilter_dialog_cb) },
@@ -4284,12 +4283,12 @@ menu_auto_scroll_live_changed(gboolean auto_scroll_live_in) {
#ifdef HAVE_LIBPCAP
/* tell toolbar about it */
toolbar_auto_scroll_live_changed(auto_scroll_live_in);
+#endif /*HAVE_LIBPCAP */
/* change auto scroll */
if(auto_scroll_live_in != auto_scroll_live) {
auto_scroll_live = auto_scroll_live_in;
}
-#endif /*HAVE_LIBPCAP */
}
@@ -4391,15 +4390,12 @@ menu_recent_read_finished(void) {
menu_name_resolution_changed();
-
-#ifdef HAVE_LIBPCAP
menu = gtk_ui_manager_get_widget(ui_manager_main_menubar, "/Menubar/ViewMenu/AutoScrollinLiveCapture");
if(!menu){
g_warning("menu_recent_read_finished: No menu found, path= /Menubar/ViewMenu/AutoScrollinLiveCapture");
}else{
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), auto_scroll_live);
}
-#endif /* HAVE_LIBPCAP */
main_widgets_rearrange();
diff --git a/gtk/stock_icons.c b/gtk/stock_icons.c
index 27338c089b..7a825e3daf 100644
--- a/gtk/stock_icons.c
+++ b/gtk/stock_icons.c
@@ -32,7 +32,6 @@
#include "gtk/stock_icons.h"
/* these icons are derived from the original stock icons */
-#ifdef HAVE_LIBPCAP
#include "../image/toolbar/capture_interfaces_24.xpm"
#include "../image/toolbar/capture_options_24.xpm"
#include "../image/toolbar/capture_start_24.xpm"
@@ -40,7 +39,6 @@
#include "../image/toolbar/capture_restart_24.xpm"
#include "../image/toolbar/capture_filter_24.xpm"
#include "../image/toolbar/capture_details_24.xpm"
-#endif /* HAVE_LIBICAP */
#include "../image/toolbar/display_filter_24.xpm"
#include "../image/wsicon16.xpm"
#include "../image/toolbar/colorize_24.xpm"
@@ -93,7 +91,6 @@ void stock_icons_init(void) {
/* register non-standard pixmaps with the gtk-stock engine */
static const GtkStockItem stock_items[] = {
-#ifdef HAVE_LIBPCAP
{ WIRESHARK_STOCK_CAPTURE_INTERFACES, "_Interfaces", 0, 0, NULL },
{ WIRESHARK_STOCK_CAPTURE_OPTIONS, "_Options", 0, 0, NULL },
{ WIRESHARK_STOCK_CAPTURE_START, "_Start", 0, 0, NULL },
@@ -102,7 +99,6 @@ void stock_icons_init(void) {
{ WIRESHARK_STOCK_CAPTURE_FILTER, "_Capture Filter", 0, 0, NULL },
{ WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY, "_Capture Filter:", 0, 0, NULL },
{ WIRESHARK_STOCK_CAPTURE_DETAILS, "_Details", 0, 0, NULL },
-#endif /* HAVE_LIBPCAP */
#ifdef HAVE_GEOIP
{ WIRESHARK_STOCK_MAP, "Map", 0, 0, NULL },
#endif
@@ -162,7 +158,6 @@ void stock_icons_init(void) {
};
static const stock_pixmap_t pixmaps[] = {
-#ifdef HAVE_LIBPCAP
{ WIRESHARK_STOCK_CAPTURE_INTERFACES, capture_interfaces_24_xpm },
{ WIRESHARK_STOCK_CAPTURE_OPTIONS, capture_options_24_xpm },
{ WIRESHARK_STOCK_CAPTURE_START, capture_start_24_xpm },
@@ -171,7 +166,6 @@ void stock_icons_init(void) {
{ WIRESHARK_STOCK_CAPTURE_FILTER, capture_filter_24_xpm },
{ WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY, capture_filter_24_xpm },
{ WIRESHARK_STOCK_CAPTURE_DETAILS, capture_details_24_xpm },
-#endif /* HAVE_LIBPCAP */
#ifdef HAVE_GEOIP
{ WIRESHARK_STOCK_MAP, internet_24_xpm},
#endif
diff --git a/gtk/stock_icons.h b/gtk/stock_icons.h
index 1656095d6b..3158a1732a 100644
--- a/gtk/stock_icons.h
+++ b/gtk/stock_icons.h
@@ -27,7 +27,6 @@
#define __STOCK_ICONS_H__
-#ifdef HAVE_LIBPCAP
#define WIRESHARK_STOCK_CAPTURE_INTERFACES "Wireshark_Stock_CaptureInterfaces"
#define WIRESHARK_STOCK_CAPTURE_OPTIONS "Wireshark_Stock_CaptureOptionss"
#define WIRESHARK_STOCK_CAPTURE_START "Wireshark_Stock_CaptureStart"
@@ -36,7 +35,6 @@
#define WIRESHARK_STOCK_CAPTURE_FILTER "Wireshark_Stock_CaptureFilter"
#define WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY "Wireshark_Stock_CaptureFilter_Entry"
#define WIRESHARK_STOCK_CAPTURE_DETAILS "Wireshark_Stock_CaptureDetails"
-#endif
#ifdef HAVE_GEOIP
#define WIRESHARK_STOCK_MAP "Wireshark_Stock_Map"
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 22:11:33 +0000