Since the integration into the official GTK sources, the name of GTK-Wimp is now...

svn path=/trunk/; revision=22114

diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.xml b/docbook/wsdg_src/WSDG_chapter_libraries.xml
index a230b678ac8ffd1ac82351909c49f2347eff258e..ffd801fd78b485bacc99378225f6bd100a2b8125 100644 (file)
--- a/docbook/wsdg_src/WSDG_chapter_libraries.xml
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.xml
@@ -510,8 +510,9 @@ utilities."
        <ulink url="http://gtk-wimp.sourceforge.net/"/>.
        </para>
        <para>
-       Since GTK version 2.8 the GTK Wimp is included in the GTK releases, 
-       so no need to download/install it seperately if these versions used.
+       Since GTK version 2.8 the GTK Wimp is included in the GTK releases where 
+       it's called "GTK MS Windows Engine" now, so no need to download/install 
+       it seperately if these versions used.
        </para>
 
   </section>

diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index ab087ba2d1dab741df85cc6fedbda3e8eb80c073..d5ae01a9b65be2fe91b55a1b4cd611adf29b7282 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -485,7 +485,7 @@ pkg_add -r wireshark
        analyzer (using the modern GTK2 GUI toolkit, recommended).
        </para></listitem>
        <listitem><para>
-       <command>GTK-Wimp</command> - GTKWimp is the GTK2 windows impersonator 
+       <command>GTK MS Windows Engine</command> - GTK MS Windows Engine
        (native Win32 look and feel, recommended).
        </para></listitem>
        </itemizedlist>

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 11bfa94dfe89ff2e929c1bc7149ca6b22c801c58..c0abbf6540d0f0bfb6ccd9f181e70119ab1e2592 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -697,7 +697,7 @@ File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll"
 SectionEnd
 
 !ifdef GTK_WIMP_DIR
-Section "GTK-Wimp" SecGTKWimp
+Section "GTK MS Windows Engine" SecGTKWimp
 ;-------------------------------------------
 SectionIn 1
 SetOutPath $INSTDIR\${GTK_WIMP_DLLDST_DIR}
@@ -1057,7 +1057,7 @@ SectionEnd
 !ifdef GTK2_DIR
   !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGTK2} "${PROGRAM_NAME} using the modern GTK2 user interface."
 !ifdef GTK_WIMP_DIR
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGTKWimp} "GTK-Wimp is the GTK2 windows impersonator (native Win32 look and feel, for Win2000 and up)."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGTKWimp} "GTK MS Windows Engine - native Win32 look and feel, for Win2000 and up."
 !endif
 !endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "TShark is a text based network protocol analyzer."
@@ -1201,7 +1201,7 @@ lbl_winversion_supported:
        StrCmp $R0 '2000' lbl_select_wimp
        StrCmp $R0 'XP' lbl_select_wimp
        StrCmp $R0 '2003' lbl_select_wimp
-       DetailPrint "Windows $R0 doesn't support GTK-Wimp!"
+       DetailPrint "Windows $R0 doesn't support the GTK MS Windows Engine!"
 
        Goto lbl_ignore_wimp
 lbl_select_wimp: