proto_draw -> main_proto_draw
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 12 Apr 2008 20:11:12 +0000 (20:11 +0000)
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 12 Apr 2008 20:11:12 +0000 (20:11 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24954 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/Makefile.common
gtk/expert_dlg.c
gtk/font_utils.c
gtk/gui_prefs.c
gtk/libui.vcproj
gtk/main.c
gtk/main.h
gtk/main_menu.c
gtk/main_proto_draw.c [moved from gtk/proto_draw.c with 99% similarity]
gtk/main_proto_draw.h [moved from gtk/proto_draw.h with 100% similarity]
gtk/packet_win.c

index 38cda12fc4403709481483687bea75f232092c9e..0d0ca873545435e9c0627832de3f34d6eda8fed5 100644 (file)
@@ -84,6 +84,7 @@ WIRESHARK_GTK_SRC = \
        main.c          \
        main_menu.c             \
        main_packet_list.c      \
+       main_proto_draw.c       \
        main_statusbar.c                \
        main_toolbar.c  \
        main_welcome.c          \
@@ -98,7 +99,6 @@ WIRESHARK_GTK_SRC = \
        profile_dlg.c   \
        progress_dlg.c  \
        proto_dlg.c     \
-       proto_draw.c    \
        proto_hier_stats_dlg.c  \
        range_utils.c   \
        recent.c        \
@@ -248,6 +248,7 @@ noinst_HEADERS = \
        main.h          \
        main_menu.h             \
        main_packet_list.h      \
+       main_proto_draw.h       \
        main_statusbar.h                \
        main_toolbar.h  \
        main_welcome.h          \
@@ -261,7 +262,6 @@ noinst_HEADERS = \
        print_prefs.h   \
        profile_dlg.h   \
        proto_dlg.h     \
-       proto_draw.h    \
        proto_hier_stats_dlg.h  \
        range_utils.h \
        recent.h        \
index 8870847d1c235f92935cb24caa47560c8ce4dd37..c1352965fe9bf3a47a0d87561611e99144ac81d7 100644 (file)
@@ -57,7 +57,7 @@
 
 #include <epan/prefs.h>
 #include "colors.h"
-#include "proto_draw.h"
+#include "main_proto_draw.h"
 #include "help_dlg.h"
 
 
index f415cff283f0a28c35f25e69f92ef27e8ccc6e32..0aadcc4d93d34dbb3b6024c9d2807cd899460bc2 100644 (file)
@@ -49,7 +49,7 @@
 #include "simple_dialog.h"
 
 #include "main_packet_list.h"
-#include "proto_draw.h"
+#include "main_proto_draw.h"
 #include "follow_tcp.h"
 
 
index 03642ce338f07190506aab89af4c142f47d53854..3892dc17e7202fbed7edeb595be28befaa93af5e 100644 (file)
 #include "gui_utils.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "proto_draw.h"
 #include "main.h"
+#include "main_packet_list.h"
+#include "main_proto_draw.h"
 #include "main_toolbar.h"
 #include "font_utils.h"
-#include "main_packet_list.h"
 #include "recent.h"
 #include "webbrowser.h"
 
index 0899059a76adc0798509ba79138e674ac93c78f6..71f5db57c6fa7717bbb82135c91cf1ca694b566b 100644 (file)
                                RelativePath=".\main_packet_list.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\main_proto_draw.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\main_statusbar.c"\r
                                >\r
                                RelativePath=".\proto_dlg.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\proto_draw.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\proto_hier_stats_dlg.c"\r
                                >\r
                                RelativePath=".\main_packet_list.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\main_proto_draw.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\main_statusbar.h"\r
                                >\r
                                RelativePath=".\proto_dlg.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\proto_draw.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\proto_hier_stats_dlg.h"\r
                                >\r
index 08ef368741f6d1c5e5b601bba7d53a378f2ff154..1133fa81775d45005750c22c21d852a3dd52efd3 100644 (file)
 #include "drag_and_drop.h"
 #include "capture_file_dlg.h"
 #include <epan/column.h>
-#include "proto_draw.h"
+#include "main_proto_draw.h"
 #include "keys.h"
 #include "packet_win.h"
 #include "stock_icons.h"
index 6d53b39b6091686ba59b596d295bfcdf3d75bfae..d8c28dd6449ed2918cb8cdf92f8c37f340ea8fc0 100644 (file)
@@ -39,8 +39,8 @@
       main [ label="main window" URL="\ref main.h"];
       menu [ label="menubar" URL="\ref main_menu.h"];
       toolbar [ label="toolbar" URL="\ref toolbar.h"];
-      packet_list [ label="packet list pane" URL="\ref packet_list.h"];
-      proto_draw [ label="packet details & bytes panes" URL="\ref proto_draw.h"];
+      packet_list [ label="packet list pane" URL="\ref main_packet_list.h"];
+      proto_draw [ label="packet details & bytes panes" URL="\ref main_proto_draw.h"];
       recent [ label="recent user settings" URL="\ref recent.h"];
       main -> menu [ arrowhead="open", style="solid" ];
       main -> toolbar [ arrowhead="open", style="solid" ];
index f66f999795b50d7916572209da1b46c3b9279af8..97c1471da36911abc798a2146dd9cad9e57d2676 100644 (file)
@@ -69,7 +69,7 @@
 #include "register.h"
 #include "recent.h"
 #include "../ui_util.h"
-#include "proto_draw.h"
+#include "main_proto_draw.h"
 #include "conversations_table.h"
 #include "hostlist_table.h"
 #include "simple_dialog.h"
similarity index 99%
rename from gtk/proto_draw.c
rename to gtk/main_proto_draw.c
index de7870995d5e1c52af30a93ec07e356d1d3e9957..bb72d33eb466e0e2615c420176f409963984cd19 100644 (file)
@@ -48,8 +48,6 @@
 
 #include "isprint.h"
 
-#include "main.h"
-#include "main_menu.h"
 #include <epan/packet.h>
 #include <epan/charsets.h>
 #include "keys.h"
@@ -57,7 +55,6 @@
 #include <epan/prefs.h>
 #include "colors.h"
 #include "capture_file_dlg.h"
-#include "proto_draw.h"
 #include "packet_win.h"
 #if 0
 #include "dlg_utils.h"
 #include "file_util.h"
 #include "webbrowser.h"
 
+#include "main.h"
+#include "main_menu.h"
+#include "main_proto_draw.h"
+
 #if _WIN32
 #include <gdk/gdkwin32.h>
 #include <windows.h>
similarity index 100%
rename from gtk/proto_draw.h
rename to gtk/main_proto_draw.h
index fbc17124477f50ceabc85cb5ff21f30c1e7008e5..701ba93cb20a4c664d981fb6f6f2ab282dfe16e7 100644 (file)
@@ -55,7 +55,7 @@
 #include <epan/addr_resolv.h>
 #include "packet_win.h"
 #include "simple_dialog.h"
-#include "proto_draw.h"
+#include "main_proto_draw.h"
 #include "keys.h"
 #include "gtkglobals.h"
 #include "gui_utils.h"