change all preferences related filenames from xy_prefs to prefs_xy

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24975 f5534014-38df-0310-8fa8-9805f1628bb7

21 files changed, 102 insertions, 108 deletions

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index b61ec67aca..3100c43f31 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -42,12 +42,10 @@ WIRESHARK_GTK_SRC = \
 	capture_file_dlg.c	\
 	capture_if_dlg.c	\
 	capture_info_dlg.c	\
-	capture_prefs.c	\
 	cfilter_combo_utils.c	\
 	color_dlg.c	\
 	color_edit_dlg.c	\
 	color_utils.c	\
-	column_prefs.c	\
 	conversations_table.c	\
 	decode_as_ber.c	\
 	decode_as_dcerpc.c	\
@@ -71,12 +69,10 @@ WIRESHARK_GTK_SRC = \
 	goto_dlg.c	\
 	graph_analysis.c \
 	gtkvumeter.c	\
-	gui_prefs.c	\
 	gui_stat_util.c	\
 	gui_utils.c	\
 	help_dlg.c	\
 	hostlist_table.c \
-	layout_prefs.c	\
 	macros_dlg.c	\
 	main.c		\
 	main_airpcap_toolbar.c	\
@@ -88,14 +84,20 @@ WIRESHARK_GTK_SRC = \
 	main_toolbar.c	\
 	main_welcome.c		\
 	mcast_stream.c	\
-	nameres_prefs.c	\
 	packet_history.c	\
 	packet_win.c	\
 	pixmap_save.c	\
 	plugins_dlg.c	\
+	prefs_capture.c	\
+	prefs_column.c	\
 	prefs_dlg.c	\
+	prefs_gui.c	\
+	prefs_layout.c	\
+	prefs_nameres.c	\
+	prefs_print.c	\
+	prefs_rtp_player.c	\
+	prefs_stream.c	\
 	print_dlg.c	\
-	print_prefs.c	\
 	profile_dlg.c	\
 	progress_dlg.c	\
 	proto_dlg.c	\
@@ -103,7 +105,6 @@ WIRESHARK_GTK_SRC = \
 	range_utils.c	\
 	recent.c	\
 	rtp_player.c	\
-	rtp_player_prefs.c	\
 	rtp_stream.c	\
 	sctp_byte_graph_dlg.c	\
 	sctp_error_dlg.c	\
@@ -112,7 +113,6 @@ WIRESHARK_GTK_SRC = \
 	service_response_time_table.c	\
 	simple_dialog.c	\
 	stock_icons.c	\
-	stream_prefs.c	\
 	summary_dlg.c	\
 	supported_protos_dlg.c	\
 	tap_dfilter_dlg.c	\
@@ -204,12 +204,10 @@ noinst_HEADERS = \
 	airpcap_gui_utils.h \
 	capture_dlg.h	\
 	capture_file_dlg.h	\
-	capture_prefs.h	\
 	cfilter_combo_utils.h \
 	color_dlg.h	\
 	color_edit_dlg.h	\
 	colors.h	\
-	column_prefs.h	\
 	conversations_table.h \
 	decode_as_ber.h	\
 	decode_as_dlg.h	\
@@ -235,7 +233,6 @@ noinst_HEADERS = \
 	gsm_map_stat.h	\
 	gtkglobals.h	\
 	gtkvumeter.h \
-	gui_prefs.h	\
 	gui_stat_menu.h	\
 	gui_stat_util.h \
 	gui_utils.h	\
@@ -243,7 +240,6 @@ noinst_HEADERS = \
 	hostlist_table.h \
 	isprint.h	\
 	keys.h		\
-	layout_prefs.h	\
 	macros_dlg.h	\
 	main.h		\
 	main_airpcap_toolbar.h	\
@@ -257,13 +253,19 @@ noinst_HEADERS = \
 	mcast_stream.h  \
 	mcast_stream_dlg.h \
 	mtp3_stat.h	\
-	nameres_prefs.h	\
 	packet_history.h	\
 	packet_win.h	\
 	pixmap_save.h	\
 	plugins_dlg.h	\
+	prefs_capture.h	\
+	prefs_column.h	\
 	prefs_dlg.h	\
-	print_prefs.h	\
+	prefs_gui.h	\
+	prefs_layout.h	\
+	prefs_nameres.h	\
+	prefs_print.h	\
+	prefs_rtp_player.h 	\
+	prefs_stream.h	\
 	profile_dlg.h	\
 	proto_dlg.h	\
 	proto_hier_stats_dlg.h	\
@@ -271,14 +273,12 @@ noinst_HEADERS = \
 	recent.h	\
 	rtp_analysis.h	\
 	rtp_player.h 	\
-	rtp_player_prefs.h 	\
 	rtp_stream.h	\
 	rtp_stream_dlg.h \
 	sat.h		\
 	sctp_stat.h	\
 	service_response_time_table.h	\
 	stock_icons.h	\
-	stream_prefs.h	\
 	summary_dlg.h   \
 	supported_protos_dlg.h   \
 	tap_dfilter_dlg.h	\
diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index efc5655aaa..ead592780d 100644
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.c
@@ -58,7 +58,6 @@
 #include "gtk/tap_dfilter_dlg.h"
 #include "gtk/font_utils.h"
 #include "gtk/gui_stat_menu.h"
-#include "gtk/column_prefs.h"
 #include "gtk/prefs_dlg.h"
 #include "gtk/main.h"
 #include "gtk/webbrowser.h"
diff --git a/gtk/libui.vcproj b/gtk/libui.vcproj
index be1cd8c680..4a3071f678 100644
--- a/gtk/libui.vcproj
+++ b/gtk/libui.vcproj
@@ -96,10 +96,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\capture_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\cfilter_combo_utils.c"

 				>

 			</File>

@@ -116,14 +112,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\colors.c"

-				>

-			</File>

-			<File

-				RelativePath=".\column_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\conversations_table.c"

 				>

 			</File>

@@ -220,10 +208,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\gui_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\gui_stat_util.c"

 				>

 			</File>

@@ -240,10 +224,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\layout_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\macros_dlg.c"

 				>

 			</File>

@@ -288,10 +268,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\nameres_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\packet_history.c"

 				>

 			</File>

@@ -308,15 +284,43 @@
 				>

 			</File>

 			<File

+				RelativePath=".\prefs_capture.c"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_column.c"

+				>

+			</File>

+			<File

 				RelativePath=".\prefs_dlg.c"

 				>

 			</File>

 			<File

-				RelativePath=".\print_dlg.c"

+				RelativePath=".\prefs_gui.c"

 				>

 			</File>

 			<File

-				RelativePath=".\print_prefs.c"

+				RelativePath=".\prefs_layout.c"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_nameres.c"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_print.c"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_rtp_player.c"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_stream.c"

+				>

+			</File>

+			<File

+				RelativePath=".\print_dlg.c"

 				>

 			</File>

 			<File

@@ -352,10 +356,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\rtp_player_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\rtp_stream.c"

 				>

 			</File>

@@ -388,10 +388,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\stream_prefs.c"

-				>

-			</File>

-			<File

 				RelativePath=".\summary_dlg.c"

 				>

 			</File>

@@ -742,11 +738,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\capture_if_details_dlg.h"

-				>

-			</File>

-			<File

-				RelativePath=".\capture_prefs.h"

+				RelativePath=".\capture_if_details_dlg_win32.h"

 				>

 			</File>

 			<File

@@ -762,15 +754,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\colors.h"

-				>

-			</File>

-			<File

-				RelativePath=".\column_prefs.h"

-				>

-			</File>

-			<File

-				RelativePath=".\compat_macros.h"

+				RelativePath=".\color_utils.h"

 				>

 			</File>

 			<File

@@ -818,6 +802,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\file_dlg_win32.h"

+				>

+			</File>

+			<File

 				RelativePath=".\fileset_dlg.h"

 				>

 			</File>

@@ -874,10 +862,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\gui_prefs.h"

-				>

-			</File>

-			<File

 				RelativePath=".\gui_stat_menu.h"

 				>

 			</File>

@@ -906,10 +890,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\layout_prefs.h"

-				>

-			</File>

-			<File

 				RelativePath=".\macros_dlg.h"

 				>

 			</File>

@@ -962,10 +942,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\nameres_prefs.h"

-				>

-			</File>

-			<File

 				RelativePath=".\packet_history.h"

 				>

 			</File>

@@ -982,15 +958,43 @@
 				>

 			</File>

 			<File

+				RelativePath=".\prefs_capture.h"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_column.h"

+				>

+			</File>

+			<File

 				RelativePath=".\prefs_dlg.h"

 				>

 			</File>

 			<File

-				RelativePath=".\print_mswin.h"

+				RelativePath=".\prefs_gui.h"

 				>

 			</File>

 			<File

-				RelativePath=".\print_prefs.h"

+				RelativePath=".\prefs_layout.h"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_nameres.h"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_print.h"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_rtp_player.h"

+				>

+			</File>

+			<File

+				RelativePath=".\prefs_stream.h"

+				>

+			</File>

+			<File

+				RelativePath=".\print_win32.h"

 				>

 			</File>

 			<File

@@ -1022,10 +1026,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\rtp_player_prefs.h"

-				>

-			</File>

-			<File

 				RelativePath=".\rtp_stream.h"

 				>

 			</File>

@@ -1050,19 +1050,19 @@
 				>

 			</File>

 			<File

-				RelativePath=".\stream_prefs.h"

+				RelativePath=".\summary_dlg.h"

 				>

 			</File>

 			<File

-				RelativePath=".\summary_dlg.h"

+				RelativePath=".\supported_protos_dlg.h"

 				>

 			</File>

 			<File

-				RelativePath=".\supported_protos_dlg.h"

+				RelativePath=".\tap_dfilter_dlg.h"

 				>

 			</File>

 			<File

-				RelativePath=".\text_page.h"

+				RelativePath=".\text_page_utils.h"

 				>

 			</File>

 			<File

@@ -1085,10 +1085,6 @@
 				RelativePath=".\webbrowser.h"

 				>

 			</File>

-			<File

-				RelativePath=".\win32-file-dlg.h"

-				>

-			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

diff --git a/gtk/main.c b/gtk/main.c
index 674adf6a08..d843a92e02 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -124,7 +124,6 @@
 #include "gtk/color_dlg.h"
 #include "gtk/filter_dlg.h"
 #include "gtk/uat_gui.h"
-#include "gtk/layout_prefs.h"
 #include "gtk/u3.h"
 #include "gtk/main.h"
 #include "gtk/main_airpcap_toolbar.h"
diff --git a/gtk/capture_prefs.c b/gtk/prefs_capture.c
index 285d73c83d..e2e73bc090 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/prefs_capture.c
@@ -39,7 +39,7 @@
 #include "../capture_ui_utils.h"
 #include "../capture.h"
 
-#include "gtk/capture_prefs.h"
+#include "gtk/prefs_capture.h"
 #include "gtk/prefs_dlg.h"
 #include "gtk/gui_utils.h"
 #include "gtk/dlg_utils.h"
diff --git a/gtk/capture_prefs.h b/gtk/prefs_capture.h
index 7f19e4d5da..7f19e4d5da 100644
--- a/gtk/capture_prefs.h
+++ b/gtk/prefs_capture.h
diff --git a/gtk/column_prefs.c b/gtk/prefs_column.c
index 31a506c844..4da78344d7 100644
--- a/gtk/column_prefs.c
+++ b/gtk/prefs_column.c
@@ -34,7 +34,7 @@
 
 #include "../globals.h"
 
-#include "gtk/column_prefs.h"
+#include "gtk/prefs_column.h"
 #include "gtk/gtkglobals.h"
 #include "gtk/gui_utils.h"
 #include "gtk/main_packet_list.h"
diff --git a/gtk/column_prefs.h b/gtk/prefs_column.h
index 54dd747cc1..54dd747cc1 100644
--- a/gtk/column_prefs.h
+++ b/gtk/prefs_column.h
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 95c7d72b56..17b676e261 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -41,15 +41,15 @@
 #include "../simple_dialog.h"
 
 #include "gtk/main.h"
-#include "gtk/column_prefs.h"
+#include "gtk/prefs_column.h"
 #include "gtk/prefs_dlg.h"
-#include "gtk/print_prefs.h"
-#include "gtk/stream_prefs.h"
-#include "gtk/gui_prefs.h"
-#include "gtk/layout_prefs.h"
-#include "gtk/capture_prefs.h"
-#include "gtk/nameres_prefs.h"
-#include "gtk/rtp_player_prefs.h"
+#include "gtk/prefs_print.h"
+#include "gtk/prefs_stream.h"
+#include "gtk/prefs_gui.h"
+#include "gtk/prefs_layout.h"
+#include "gtk/prefs_capture.h"
+#include "gtk/prefs_nameres.h"
+#include "gtk/prefs_rtp_player.h"
 #include "gtk/gui_utils.h"
 #include "gtk/dlg_utils.h"
 #include "gtk/stock_icons.h"
diff --git a/gtk/gui_prefs.c b/gtk/prefs_gui.c
index da808c3afb..d6311072c6 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/prefs_gui.c
@@ -34,7 +34,7 @@
 #include "../globals.h"
 #include "../simple_dialog.h"
 
-#include "gtk/gui_prefs.h"
+#include "gtk/prefs_gui.h"
 #include "gtk/gtkglobals.h"
 #include "gtk/help_dlg.h"
 #include "gtk/supported_protos_dlg.h"
diff --git a/gtk/gui_prefs.h b/gtk/prefs_gui.h
index 2832220fb0..2832220fb0 100644
--- a/gtk/gui_prefs.h
+++ b/gtk/prefs_gui.h
diff --git a/gtk/layout_prefs.c b/gtk/prefs_layout.c
index 5838d2b1d5..4bd2561b2c 100644
--- a/gtk/layout_prefs.c
+++ b/gtk/prefs_layout.c
@@ -33,7 +33,7 @@
 #include "../globals.h"
 #include "../ui_util.h"
 
-#include "gtk/layout_prefs.h"
+#include "gtk/prefs_layout.h"
 #include "gtk/gtkglobals.h"
 #include "gtk/prefs_dlg.h"
 #include "gtk/gui_utils.h"
diff --git a/gtk/layout_prefs.h b/gtk/prefs_layout.h
index 89b64d086b..89b64d086b 100644
--- a/gtk/layout_prefs.h
+++ b/gtk/prefs_layout.h
diff --git a/gtk/nameres_prefs.c b/gtk/prefs_nameres.c
index 3505c4b6d7..638acc230c 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/prefs_nameres.c
@@ -34,7 +34,7 @@
 
 #include "../globals.h"
 
-#include "gtk/nameres_prefs.h"
+#include "gtk/prefs_nameres.h"
 #include "gtk/gtkglobals.h"
 #include "gtk/prefs_dlg.h"
 #include "gtk/gui_utils.h"
diff --git a/gtk/nameres_prefs.h b/gtk/prefs_nameres.h
index b25995fc56..b25995fc56 100644
--- a/gtk/nameres_prefs.h
+++ b/gtk/prefs_nameres.h
diff --git a/gtk/print_prefs.c b/gtk/prefs_print.c
index 0ffd3a8802..4f042ca87b 100644
--- a/gtk/print_prefs.c
+++ b/gtk/prefs_print.c
@@ -35,7 +35,7 @@
 #include "../print.h"
 #include "../util.h"
 
-#include "gtk/print_prefs.h"
+#include "gtk/prefs_print.h"
 #include "gtk/keys.h"
 #include "gtk/prefs_dlg.h"
 #include "gtk/gui_utils.h"
diff --git a/gtk/print_prefs.h b/gtk/prefs_print.h
index d1af4ff953..d1af4ff953 100644
--- a/gtk/print_prefs.h
+++ b/gtk/prefs_print.h
diff --git a/gtk/rtp_player_prefs.c b/gtk/prefs_rtp_player.c
index 5c7cf0abc4..e9f7599fc7 100644
--- a/gtk/rtp_player_prefs.c
+++ b/gtk/prefs_rtp_player.c
@@ -31,7 +31,7 @@
 
 #include <epan/prefs.h>
 
-#include "gtk/rtp_player_prefs.h"
+#include "gtk/prefs_rtp_player.h"
 #include "gtk/prefs_dlg.h"
 
 
diff --git a/gtk/rtp_player_prefs.h b/gtk/prefs_rtp_player.h
index 2b0e4be110..2b0e4be110 100644
--- a/gtk/rtp_player_prefs.h
+++ b/gtk/prefs_rtp_player.h
diff --git a/gtk/stream_prefs.c b/gtk/prefs_stream.c
index 197ff01b04..0940109cd6 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/prefs_stream.c
@@ -35,7 +35,7 @@
 #include "../print.h"
 
 #include "gtk/color_utils.h"
-#include "gtk/stream_prefs.h"
+#include "gtk/prefs_stream.h"
 #include "gtk/keys.h"
 #include "gtk/follow_tcp.h"
 #include "gtk/main_packet_list.h"
diff --git a/gtk/stream_prefs.h b/gtk/prefs_stream.h
index 921d745b80..921d745b80 100644
--- a/gtk/stream_prefs.h
+++ b/gtk/prefs_stream.h