rename toolbar to main_toolbar

svn path=/trunk/; revision=24940

9 files changed, 15 insertions, 16 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8b5b02595e..89a821d4f4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -90,6 +90,7 @@ noinst_HEADERS = \
 	macros_dlg.h	\
 	main.h		\
 	main_statusbar.h		\
+	main_toolbar.h	\
 	main_welcome.h		\
 	menu.h		\
 	mtp3_stat.h	\
@@ -123,7 +124,6 @@ noinst_HEADERS = \
 	summary_dlg.h   \
 	supported_protos_dlg.h   \
 	text_page.h	\
-	toolbar.h	\
 	u3.h \
 	uat_gui.h \
 	voip_calls.h	\
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 4f676af8dd..24bcf76d5b 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -83,6 +83,7 @@ WIRESHARK_GTK_SRC = \
 	macros_dlg.c	\
 	main.c		\
 	main_statusbar.c		\
+	main_toolbar.c	\
 	main_welcome.c		\
 	menu.c		\
 	nameres_prefs.c	\
@@ -117,7 +118,6 @@ WIRESHARK_GTK_SRC = \
 	supported_protos_dlg.c	\
 	tap_dfilter_dlg.c	\
 	text_page.c	\
-	toolbar.c	\
 	u3.c		\
 	uat_gui.c	\
 	voip_calls.c	\
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index b7190cf871..46951ef8ec 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -56,9 +56,9 @@
 #include "dlg_utils.h"
 
 #include "main.h"
+#include "main_toolbar.h"
 #include "wtap.h"
 #include "help_dlg.h"
-#include "toolbar.h"
 #include "keys.h"
 
 #include "webbrowser.h"
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 7396583502..68d5ff53ec 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -42,9 +42,9 @@
 #include "dlg_utils.h"
 #include "proto_draw.h"
 #include "main.h"
+#include "main_toolbar.h"
 #include "font_utils.h"
 #include "packet_list.h"
-#include "toolbar.h"
 #include "recent.h"
 #include "webbrowser.h"
 
diff --git a/gtk/libui.vcproj b/gtk/libui.vcproj
index 0b76b4656c..65718e38d2 100644
--- a/gtk/libui.vcproj
+++ b/gtk/libui.vcproj
@@ -440,6 +440,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\main_toolbar.c"

+				>

+			</File>

+			<File

 				RelativePath=".\main_welcome.c"

 				>

 			</File>

@@ -664,10 +668,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\toolbar.c"

-				>

-			</File>

-			<File

 				RelativePath=".\u3.c"

 				>

 			</File>

@@ -910,6 +910,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\main_toolbar.h"

+				>

+			</File>

+			<File

 				RelativePath=".\main_welcome.h"

 				>

 			</File>

@@ -1046,10 +1050,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\toolbar.h"

-				>

-			</File>

-			<File

 				RelativePath=".\u3.h"

 				>

 			</File>

diff --git a/gtk/main.c b/gtk/main.c
index cd499e1a33..0d2de4341c 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -127,6 +127,7 @@
 
 #include "main.h"
 #include "main_statusbar.h"
+#include "main_toolbar.h"
 #include "main_welcome.h"
 #include "menu.h"
 #include "../main_window.h"
@@ -138,7 +139,6 @@
 #include "keys.h"
 #include "packet_win.h"
 #include "stock_icons.h"
-#include "toolbar.h"
 #include "find_dlg.h"
 #include "packet_list.h"
 #include "recent.h"
@@ -169,8 +169,6 @@
 #include "airpcap_dlg.h"
 #include "airpcap_gui_utils.h"
 
-#include "./gtk/toolbar.h"
-
 #include "./image/toolbar/wep_closed_24.xpm"
 #endif
 
diff --git a/gtk/toolbar.c b/gtk/main_toolbar.c
index a818330ac1..3298dd0d40 100644
--- a/gtk/toolbar.c
+++ b/gtk/main_toolbar.c
@@ -45,6 +45,7 @@
 #include <epan/prefs.h>
 #include "prefs_dlg.h"
 #include "main.h"
+#include "main_toolbar.h"
 #include "help_dlg.h"
 #include "gtkglobals.h"
 #include "stock_icons.h"
diff --git a/gtk/toolbar.h b/gtk/main_toolbar.h
index 39c8c6798f..39c8c6798f 100644
--- a/gtk/toolbar.h
+++ b/gtk/main_toolbar.h
diff --git a/gtk/menu.c b/gtk/menu.c
index bfd87ac8dd..3bb01730d9 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include "main.h"
+#include "main_toolbar.h"
 #include "menu.h"
 #include "../stat_menu.h"
 #include "gui_stat_menu.h"
@@ -69,7 +70,6 @@
 #include <epan/plugins.h>
 #include <epan/epan_dissect.h>
 #include "stock_icons.h"
-#include "toolbar.h"
 #include "gtkglobals.h"
 #include "register.h"
 #include "../menu.h"