Start the process of removing GTK1.

svn path=/trunk/; revision=24770

4 files changed, 4 insertions, 133 deletions

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 2cd700e56c..f0078b1a36 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -11,23 +11,10 @@ include ../../config.nmake
 
 UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
 
-!IFDEF GTK1_ONLY
-# define installer name and undefine GTK2_DIR to get a separate
-# installer for Wireshark GTK1 version
-DEST=wireshark-gtk1
-!IFDEF GTK2_DIR
-!UNDEF GTK2_DIR
-!ENDIF
-!ENDIF
-
-
 !IFDEF GTK2_ONLY
 # define installer name and undefine GTK1_DIR to get a separate
 # installer for Wireshark GTK2 version
 DEST=wireshark-gtk2
-!IFDEF GTK1_DIR
-!UNDEF GTK1_DIR
-!ENDIF
 !ENDIF
 
 !IFNDEF DEST
@@ -36,9 +23,6 @@ DEST=wireshark
 !ENDIF
 
 EXE=../../tshark.exe ../../editcap.exe \
-!IFDEF GTK1_DIR
-	../../wireshark.exe \
-!ENDIF
 !IFDEF GTK2_DIR
 	../../wireshark-gtk2.exe \
 !ENDIF
@@ -128,9 +112,6 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm
 !IF "$(ENABLE_LIBWIRESHARK)" != ""
 	/DENABLE_LIBWIRESHARK=$(ENABLE_LIBWIRESHARK) \
 !ENDIF
-!IFDEF GTK1_DIR
-	/DGTK1_DIR=$(GTK1_DIR) \
-!ENDIF
 !IFDEF GTK2_DIR
 	/DGTK2_DIR=$(GTK2_DIR) \
 	/DGTK2_LIB_DIR=$(GTK2_LIB_DIR) \
@@ -156,7 +137,6 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm
 	/DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
 !ENDIF
 	/DGLIB_DIR=$(GLIB_DIR) \
-	/DGLIB_GTK1_HACK_DIR=$(GLIB_GTK1_HACK_DIR) \
 !IFDEF ICONV_DIR
 	/DICONV_DIR=$(ICONV_DIR) \
 !ENDIF
@@ -191,14 +171,12 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm
 
 clean:
 	rm -f wireshark-setup-$(VERSION).exe
-	rm -f wireshark-gtk1-setup-$(VERSION).exe
 	rm -f wireshark-gtk2-setup-$(VERSION).exe
 	rm -f NEWS.txt
 	rm -f user-guide.chm
 
 distclean: clean
 	rm -f wireshark-setup-*.exe
-	rm -f wireshark-gtk1-setup-*.exe
 	rm -f wireshark-gtk2-setup-*.exe
 
 maintainer-clean: distclean
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index caafa64238..34a44df209 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -11,11 +11,6 @@
 ; So if you get an error here, please update to at least NSIS 2.07!
 SetCompressor /SOLID lzma
 
-!ifdef GTK1_DIR & GTK2_DIR
-InstType "Wireshark (GTK2 user interface)"
-InstType "Wireshark (legacy GTK1 user interface)"
-!endif
-
 InstType "un.Default (keep Personal Settings and WinPcap)"
 InstType "un.All (remove all)"
 
@@ -290,9 +285,6 @@ Section "-Required"
 ;
 ; Install for every user
 ;
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2 RO
-!endif
 SetShellVarContext all
 
 
@@ -304,6 +296,7 @@ File "..\..\epan\libwireshark.dll"
 !endif
 File "${GLIB_DIR}\bin\libglib-2.0-0.dll"
 File "${GLIB_DIR}\bin\libgobject-2.0-0.dll"
+File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll"
 !ifdef ICONV_DIR
 File "${ICONV_DIR}\bin\iconv.dll"
 !endif
@@ -675,30 +668,11 @@ SectionEnd ; "Required"
 
 SectionGroup "!Wireshark" SecWiresharkGroup
 
-!ifdef GTK1_DIR
-Section "Wireshark GTK1" SecWiresharkGTK1
-;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 2 RO
-!endif
-SetOutPath $INSTDIR
-File "..\..\wireshark.exe"
-File "${GLIB_GTK1_HACK_DIR}\bin\libgmodule-2.0-0.dll"
-File "${GTK1_DIR}\lib\libgtk-0.dll"
-File "${GTK1_DIR}\lib\libgdk-0.dll"
-SectionEnd
-!endif
-
 !ifdef GTK2_DIR
 Section "Wireshark GTK2" SecWiresharkGTK2
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 RO
-!endif
 SetOutPath $INSTDIR
 File /oname=wireshark.exe "..\..\wireshark-gtk2.exe"
-; libgmodule should be moved back to the Required section if we ever drop GTK1
-File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll"
 File "${GTK2_DIR}\bin\libgdk-win32-2.0-0.dll"
 File "${GTK2_DIR}\bin\libgdk_pixbuf-2.0-0.dll"
 File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll"
@@ -749,9 +723,6 @@ SectionGroupEnd	; "Wireshark"
 
 Section "TShark" SecTShark
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "..\..\tshark.exe"
 File "..\..\doc\tshark.html"
@@ -759,9 +730,6 @@ SectionEnd
 
 Section "Rawshark" SecRawshark
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "..\..\rawshark.exe"
 File "..\..\doc\rawshark.html"
@@ -771,9 +739,6 @@ SectionGroup "Plugins / Extensions" SecPluginsGroup
 
 Section "Dissector Plugins" SecPlugins
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR\plugins\${VERSION}
 File "..\..\plugins\agentx\agentx.dll"
 File "..\..\plugins\artnet\artnet.dll"
@@ -806,9 +771,6 @@ SectionEnd
 
 Section "Tree Statistics Plugin" SecStatsTree
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR\plugins\${VERSION}
 File "..\..\plugins\stats_tree\stats_tree.dll"
 SectionEnd
@@ -823,9 +785,6 @@ SectionEnd
 !ifdef NET_SNMP_DIR
 Section "SNMP MIBs" SecMIBs
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR\snmp\mibs
 File "${NET_SNMP_DIR}\mibs\*.txt"
 SectionEnd
@@ -834,9 +793,6 @@ SectionEnd
 !ifdef SMI_DIR
 Section "SNMP MIBs" SecMIBs
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR\snmp\mibs
 File "${SMI_DIR}\mibs\*"
 SectionEnd
@@ -849,9 +805,6 @@ SectionGroup "Tools" SecToolsGroup
 
 Section "Editcap" SecEditcap
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "..\..\editcap.exe"
 File "..\..\doc\editcap.html"
@@ -859,9 +812,6 @@ SectionEnd
 
 Section "Text2Pcap" SecText2Pcap
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "..\..\text2pcap.exe"
 File "..\..\doc\text2pcap.html"
@@ -869,9 +819,6 @@ SectionEnd
 
 Section "Mergecap" SecMergecap
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "..\..\mergecap.exe"
 File "..\..\doc\mergecap.html"
@@ -879,9 +826,6 @@ SectionEnd
 
 Section "Capinfos" SecCapinfos
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "..\..\capinfos.exe"
 File "..\..\doc\capinfos.html"
@@ -892,9 +836,6 @@ SectionGroupEnd	; "Tools"
 !ifdef HHC_DIR
 Section "User's Guide" SecUsersGuide
 ;-------------------------------------------
-!ifdef GTK1_DIR & GTK2_DIR
-SectionIn 1 2
-!endif
 SetOutPath $INSTDIR
 File "user-guide.chm"
 SectionEnd
@@ -979,7 +920,6 @@ DeleteRegKey HKCR "${WIRESHARK_ASSOC}\Shell\open\command"
 DeleteRegKey HKCR "${WIRESHARK_ASSOC}\DefaultIcon"
 !insertmacro UpdateIcons
 
-; regardless if we currently installed GTK1 or 2, try to uninstall GTK2 files too
 Delete "$INSTDIR\etc\gtk-2.0\*.*"
 Delete "$INSTDIR\etc\pango\*.*"
 Delete "$INSTDIR\lib\gtk-2.0\2.2.0\engines\*.*"
@@ -1126,9 +1066,6 @@ SectionEnd
 ; ============================================================================
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGroup} "${PROGRAM_NAME} is a GUI network protocol analyzer."
-!ifdef GTK1_DIR
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGTK1} "${PROGRAM_NAME} using the classical GTK1 user interface."
-!endif
 !ifdef GTK2_DIR
   !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGTK2} "${PROGRAM_NAME} using the modern GTK2 user interface."
 !ifdef GTK_WIMP_DIR
@@ -1168,38 +1105,10 @@ SectionEnd
 ; ============================================================================
 ; Callback functions
 ; ============================================================================
-!ifdef GTK1_DIR & GTK2_DIR
-;Disable GTK-Wimp for GTK1
-
-Function .onSelChange
-	Push $0
-	SectionGetFlags ${SecWiresharkGTK1} $0
-	IntOp  $0 $0 & 1
-	IntCmp $0 1 onSelChange.disableGTK2Sections
-	;enable GTK2Sections
-	!insertmacro EnableSection ${SecGTKWimp}
-	Goto onSelChange.end
-onSelChange.disableGTK2Sections:
-	!insertmacro DisableSection ${SecGTKWimp}
-	Goto onSelChange.end
-onSelChange.end:
-	Pop $0
-FunctionEnd
-
-!else
-!ifdef GTK1_DIR | GTK2_DIR
+!ifdef GTK2_DIR
 ; Disable FileExtension if Wireshark isn't selected
 Function .onSelChange
 	Push $0
-!ifdef GTK1_DIR
-	SectionGetFlags ${SecWiresharkGTK1} $0
-	IntOp  $0 $0 & 1
-	IntCmp $0 0 onSelChange.unselect
-	SectionGetFlags ${SecFileExtensions} $0
-	IntOp  $0 $0 & 16
-	IntCmp $0 16 onSelChange.unreadonly
-	Goto onSelChange.end
-!else
 	SectionGetFlags ${SecWiresharkGTK2} $0
 	IntOp  $0 $0 & 1
 	IntCmp $0 0 onSelChange.unselect
@@ -1207,7 +1116,6 @@ Function .onSelChange
 	IntOp  $0 $0 & 16
 	IntCmp $0 16 onSelChange.unreadonly
 	Goto onSelChange.end
-!endif
 onSelChange.unselect:
 	SectionGetFlags ${SecFileExtensions} $0
 	IntOp $0 $0 & 0xFFFFFFFE
@@ -1223,7 +1131,6 @@ onSelChange.end:
 	Pop $0
 FunctionEnd
 !endif
-!endif
 
 
 !include "GetWindowsVersion.nsh"
diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl
index ad2c704d34..407f976c3e 100644
--- a/packaging/portableapps/win32/makenmake.pl
+++ b/packaging/portableapps/win32/makenmake.pl
@@ -52,14 +52,7 @@ while($line = <>) {
 		    print "!ENDIF\n";
 		}
 		$define = $1;
-		print "!IF DEFINED($define)";
-
-		if($define eq "GTK1_DIR") {
-		    # only include this if GTK2_DIR is not defined
-		    print "& !DEFINED(GTK2_DIR)";
-		}
-
-		print "\n";
+		print "!IF DEFINED($define)\n";
 	    }
 	} else {
 	    
diff --git a/packaging/u3/win32/makenmake.pl b/packaging/u3/win32/makenmake.pl
index 266f357489..60796ae9ac 100644
--- a/packaging/u3/win32/makenmake.pl
+++ b/packaging/u3/win32/makenmake.pl
@@ -58,14 +58,7 @@ while($line = <>) {
 		    print "!ENDIF\n";
 		}
 		$define = $1;
-		print "!IF DEFINED($define)";
-
-		if($define eq "GTK1_DIR") {
-		    # only include this if GTK2_DIR is not defined
-		    print "& !DEFINED(GTK2_DIR)";
-		}
-
-		print "\n";
+		print "!IF DEFINED($define)\n";
 	    }
 	} else {