Move alert_box.c back up to the top-level directory for now, to fix the

Windows build.  We probably want to construct a "ui" (static) library
the same way we construct the libwireshark (dynamic) library, out of
stuff in the ui directory and the relevant subdirectories.

svn path=/trunk/; revision=40541

Makefile.common

@@ -147,6 +147,7 @@ wireshark_SOURCES =	\
 	$(WIRESHARK_COMMON_SRC)	\
 	$(SHARK_COMMON_CAPTURE_SRC) \
 	airpcap_loader.c \
+	alert_box.c	\
 	capture.c	\
 	capture_info.c	\
 	capture_opts.c \
@@ -159,8 +160,7 @@ wireshark_SOURCES =	\
 	proto_hier_stats.c	\
 	summary.c	\
 	tempfile.c	\
-	u3.c		\
-	ui/alert_box.c
+	u3.c
 
 # corresponding headers
 wireshark_INCLUDES =	\

alert_box.c

@@ -34,9 +34,9 @@
 #include <epan/filesystem.h>
 #include <epan/dfilter/dfilter.h>
 
-#include "alert_box.h"
+#include "ui/alert_box.h"
 
-#include "simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 /*
  * Alert box for general errors.