If we have libpcap, include <pcap.h>, because "capture.h" requires it.
If we *don't* have libpcap, don't include "capture.h", and don't test whether a capture is in progress. Clean up a message. svn path=/trunk/; revision=14356
This commit is contained in:
parent
38c139dce3
commit
bcc201cd88
|
@ -30,6 +30,9 @@
|
||||||
#include <io.h> /* open/close on win32 */
|
#include <io.h> /* open/close on win32 */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPCAP
|
||||||
|
#include <pcap.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
@ -43,7 +46,9 @@
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "simple_dialog.h"
|
#include "simple_dialog.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#ifdef HAVE_LIBPCAP
|
||||||
#include "capture.h"
|
#include "capture.h"
|
||||||
|
#endif
|
||||||
#include <epan/prefs.h>
|
#include <epan/prefs.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -316,14 +321,16 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_)
|
||||||
* so we have to take care of NOT loading a new file while a different process
|
* so we have to take care of NOT loading a new file while a different process
|
||||||
* (e.g. capture/load/...) is still in progress. */
|
* (e.g. capture/load/...) is still in progress. */
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPCAP
|
||||||
/* if a capture is running, do nothing but warn the user */
|
/* if a capture is running, do nothing but warn the user */
|
||||||
if((capture_opts->state != CAPTURE_STOPPED)) {
|
if((capture_opts->state != CAPTURE_STOPPED)) {
|
||||||
dialog = simple_dialog(ESD_TYPE_CONFIRMATION,
|
dialog = simple_dialog(ESD_TYPE_CONFIRMATION,
|
||||||
ESD_BTN_OK,
|
ESD_BTN_OK,
|
||||||
PRIMARY_TEXT_START "Drag and Drop currently not possible!" PRIMARY_TEXT_END "\n\n"
|
PRIMARY_TEXT_START "Drag and Drop currently not possible!" PRIMARY_TEXT_END "\n\n"
|
||||||
"Dropping a file isn't possible while capture is in progress.");
|
"Dropping a file isn't possible while a capture is in progress.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* if another file read is still in progress, do nothing but warn the user */
|
/* if another file read is still in progress, do nothing but warn the user */
|
||||||
if((cfile.state == FILE_READ_IN_PROGRESS)) {
|
if((cfile.state == FILE_READ_IN_PROGRESS)) {
|
||||||
|
|
Loading…
Reference in New Issue