diff options
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | docbook/edg_src/EDG_chapter_sources.xml | 2 | ||||
| -rw-r--r-- | gtk/win32-file-dlg.c | 12 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi (renamed from packaging/nsis/ethereal.nsi) | 0 |
6 files changed, 11 insertions, 11 deletions
diff --git a/config.nmake b/config.nmake index 5704c23e54..981da9c887 100644 --- a/config.nmake +++ b/config.nmake @@ -234,7 +234,7 @@ MAKENSIS="C:/program files/nsis/makensis.exe" # Choose modern style user interface for the installer. # When using this, make sure you have a supported NSIS -# version installed. See "packaging\nsis\ethereal.nsi" for details. +# version installed. See "packaging\nsis\wireshark.nsi" for details. # # If you don't want the modern UI (or don't have a recent NSIS version), # comment this line out, so that MAKENSIS_MODERN_UI isn't defined. diff --git a/docbook/edg_src/EDG_chapter_sources.xml b/docbook/edg_src/EDG_chapter_sources.xml index 27c1b89572..2dc96e700f 100644 --- a/docbook/edg_src/EDG_chapter_sources.xml +++ b/docbook/edg_src/EDG_chapter_sources.xml @@ -1053,7 +1053,7 @@ $Id$ based systems, instructions how to install it can be found in <xref linkend="ChToolsNSIS"/>. NSIS is script based, you will find the Wireshark installer - generation script at: <filename>packaging/nsis/ethereal.nsi</filename>. + generation script at: <filename>packaging/nsis/wireshark.nsi</filename>. </para> <para> You will probably have to modify the <filename>config.nmake</filename> diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c index 519b677f1b..b9e6acf001 100644 --- a/gtk/win32-file-dlg.c +++ b/gtk/win32-file-dlg.c @@ -159,7 +159,7 @@ win32_open_file (HWND h_wnd) { #endif ofn.hwndOwner = h_wnd; ofn.hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); - /* XXX - Grab the rest of the extension list from ethereal.nsi. */ + /* XXX - Grab the rest of the extension list from wireshark.nsi. */ ofn.lpstrFilter = FILE_TYPES_OPEN; ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; @@ -213,7 +213,7 @@ win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer a ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = h_wnd; ofn.hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); - /* XXX - Grab the rest of the extension list from ethereal.nsi. */ + /* XXX - Grab the rest of the extension list from wireshark.nsi. */ ofn.lpstrFilter = FILE_TYPES_SAVE; ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; @@ -304,7 +304,7 @@ win32_merge_file (HWND h_wnd) { ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = h_wnd; ofn.hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); - /* XXX - Grab the rest of the extension list from ethereal.nsi. */ + /* XXX - Grab the rest of the extension list from wireshark.nsi. */ ofn.lpstrFilter = FILE_TYPES_MERGE; ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; @@ -505,7 +505,7 @@ win32_export_raw_file(HWND h_wnd) { ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = h_wnd; ofn.hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); - /* XXX - Grab the rest of the extension list from ethereal.nsi. */ + /* XXX - Grab the rest of the extension list from wireshark.nsi. */ ofn.lpstrFilter = FILE_TYPES_RAW; ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; @@ -567,7 +567,7 @@ win32_export_color_file(HWND h_wnd) { ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = h_wnd; ofn.hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); - /* XXX - Grab the rest of the extension list from ethereal.nsi. */ + /* XXX - Grab the rest of the extension list from wireshark.nsi. */ ofn.lpstrFilter = FILE_TYPES_COLOR; ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; @@ -608,7 +608,7 @@ win32_import_color_file(HWND h_wnd) { ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = h_wnd; ofn.hInstance = (HINSTANCE) GetWindowLong(h_wnd, GWL_HINSTANCE); - /* XXX - Grab the rest of the extension list from ethereal.nsi. */ + /* XXX - Grab the rest of the extension list from wireshark.nsi. */ ofn.lpstrFilter = FILE_TYPES_COLOR; ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index 6b7d2c05ab..f080b64875 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - ethereal.nsi \ + wireshark.nsi \ ../../COPYING \ GetWindowsVersion.nsh \ servicelib.nsh \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 302ccb113f..f5ace8254c 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -92,7 +92,7 @@ PLUGINS=../../plugins/acn/acn.dll \ ../../plugins/stats_tree/stats_tree.dll \ ../../plugins/v5ua/v5ua.dll -NSI=ethereal.nsi \ +NSI=wireshark.nsi \ GetWindowsVersion.nsh \ servicelib.nsh \ AdditionalTasksPage.ini \ @@ -153,7 +153,7 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake !IFDEF HHC_DIR /DHHC_DIR=$(HHC_DIR) \ !ENDIF - ethereal.nsi + wireshark.nsi clean: rm -f wireshark-setup-$(VERSION).exe diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/wireshark.nsi index eb29a89c0a..eb29a89c0a 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/wireshark.nsi |