ui/gtk/main_proto_draw.c isn't just used for the main window, it's also

used for popped-up packet windows, and it includes more than just code
to draw the protocol tree - it includes the hex dump pane code as well. 
Rename it packet_panes.c; the stuff specific to the main window should
be moved into a different file.

svn path=/trunk/; revision=43290

8 files changed, 8 insertions, 8 deletions

diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index f75feef32c..af8600b355 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -100,7 +100,7 @@ WIRESHARK_GTK_SRC = \
 	main_filter_toolbar.c	\
 	main_menubar.c	\
 	manual_addr_resolv.c	\
-	main_proto_draw.c	\
+	packet_panes.c	\
 	main_statusbar.c	\
 	main_titlebar.c	\
 	main_toolbar.c	\
@@ -295,7 +295,7 @@ noinst_HEADERS = \
 	main_filter_toolbar.h	\
 	main_menubar_private.h	\
 	menus.h		\
-	main_proto_draw.h	\
+	packet_panes.h	\
 	main_statusbar_private.h	\
 	main_titlebar.h	\
 	main_toolbar.h	\
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index afa70330db..32b9b6c5c3 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -49,7 +49,7 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/expert_indicators.h"
-#include "ui/gtk/main_proto_draw.h"
+#include "ui/gtk/packet_panes.h"
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/edit_packet_comment_dlg.h"
 
diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
index b02bbd965e..21d477e300 100644
--- a/ui/gtk/font_utils.c
+++ b/ui/gtk/font_utils.c
@@ -46,7 +46,7 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/font_utils.h"
-#include "ui/gtk/main_proto_draw.h"
+#include "ui/gtk/packet_panes.h"
 #include "ui/gtk/follow_tcp.h"
 #include "ui/gtk/new_packet_list.h"
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 7ec3440827..eae1bb3286 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -151,7 +151,7 @@ extern gint if_list_comparator_alph (const void *first_arg, const void *second_a
 #include "ui/gtk/main_welcome.h"
 #include "ui/gtk/drag_and_drop.h"
 #include "ui/gtk/capture_file_dlg.h"
-#include "ui/gtk/main_proto_draw.h"
+#include "ui/gtk/packet_panes.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/packet_win.h"
 #include "ui/gtk/stock_icons.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 7ab07e759c..6fab9051db 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -84,7 +84,7 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/main_proto_draw.h"
+#include "ui/gtk/packet_panes.h"
 #include "ui/gtk/conversations_table.h"
 #include "ui/gtk/hostlist_table.h"
 #include "ui/gtk/packet_history.h"
diff --git a/ui/gtk/main_proto_draw.h b/ui/gtk/packet_panes.h
index 864afa185a..864afa185a 100644
--- a/ui/gtk/main_proto_draw.h
+++ b/ui/gtk/packet_panes.h
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index fdd0bcaa2d..d0208d2adb 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -65,7 +65,7 @@
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/packet_win.h"
-#include "ui/gtk/main_proto_draw.h"
+#include "ui/gtk/packet_panes.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 242c34be1d..11ee201949 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -44,7 +44,7 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/new_packet_list.h"
-#include "ui/gtk/main_proto_draw.h"
+#include "ui/gtk/packet_panes.h"
 #include "ui/gtk/main_toolbar.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/webbrowser.h"