From ebd0e5dfd0f1e594dc2b7b5bd1429c57a91e41e6 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 7 Jun 2012 10:01:20 +0000 Subject: IEView minor fix git-svn-id: http://svn.miranda-ng.org/main/trunk@353 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/Makefile | 41 ----------------------------------------- plugins/IEView/MakefileUbuntu | 41 ----------------------------------------- plugins/IEView/ieview_main.cpp | 2 +- 3 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 plugins/IEView/Makefile delete mode 100644 plugins/IEView/MakefileUbuntu diff --git a/plugins/IEView/Makefile b/plugins/IEView/Makefile deleted file mode 100644 index cef8e3a42e..0000000000 --- a/plugins/IEView/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Project: ieview - -CPP = g++.exe -CC = gcc.exe -WINDRES = windres.exe -RM = rm -UPX = upx -9 -q --compress-icons=0 -SRC = IEView.cpp ieview_services.cpp ieview_main.cpp HTMLBuilder.cpp ChatHTMLBuilder.cpp MUCCHTMLBuilder.cpp ScriverHTMLBuilder.cpp TabSRMMHTMLBuilder.cpp HistoryHTMLBuilder.cpp Options.cpp Template.cpp TemplateHTMLBuilder.cpp TextToken.cpp Utils.cpp -RES = ieview.res -OBJ = $(SRC:.cpp=.o) $(RES) -BIN = ieview.dll -INCS = -I"../../include" -CFLAGS = $(INCS) -DBUILDING_DLL=1 -DUNICODE -fexpensive-optimizations -O3 -Os -fno-exceptions -Wno-error -Wall -CXXFLAGS = $(INCS) -DBUILDING_DLL=1 -DUNICODE -fexpensive-optimizations -O3 -Os -fno-exceptions -Wno-error -Wall -# -save-temps -LIBS = -lversion -lwsock32 -lole32 -lcomctl32 -luuid -loleaut32 -LFLAGS = -s -mdll -mwindows --add-stdcall-alias -#LFLAGS = -mdll -mwindows -Wl,-Map,ieview.map --no-export-all-symbols --add-stdcall-alias -g3 -RCFLAGS = -I rc -O coff -# --add-stdcall-alias -s --no-export-all-symbols - -.PHONY: all all-before all-after clean clean-custom - -all: all-before $(BIN) all-after -ifdef PACK - $(UPX) $(BIN) -endif - -clean: clean-custom - $(RM) -f $(OBJ) $(BIN) - -depend : - $(CPP) -MM $(CFLAGS) $(SRC)>Makefile.dep - -$(RES): $(RES:.res=.rc) resource.h - $(WINDRES) $(RCFLAGS) -i $(RES:.res=.rc) -o $(RES) - -$(BIN): $(OBJ) - $(CPP) $(CFLAGS) $(OBJ) $(LIBS) $(LFLAGS) -o $(BIN) -Wl - --include Makefile.dep diff --git a/plugins/IEView/MakefileUbuntu b/plugins/IEView/MakefileUbuntu deleted file mode 100644 index 66b4c5be14..0000000000 --- a/plugins/IEView/MakefileUbuntu +++ /dev/null @@ -1,41 +0,0 @@ -# Project: ieview - -CXX = i586-mingw32msvc-g++ -CC = i586-mingw32msvc-gcc -WINDRES = i586-mingw32msvc-windres -RM = rm -UPX = upx -9 -q --compress-icons=0 -SRC = IEView.cpp ieview_services.cpp ieview_main.cpp HTMLBuilder.cpp ChatHTMLBuilder.cpp MUCCHTMLBuilder.cpp ScriverHTMLBuilder.cpp TabSRMMHTMLBuilder.cpp HistoryHTMLBuilder.cpp Options.cpp Template.cpp TemplateHTMLBuilder.cpp TextToken.cpp Utils.cpp -RES = ieview.res -OBJ = $(SRC:.cpp=.o) $(RES) -BIN = ieview.dll -INCS = -I"../../include" -CFLAGS = $(INCS) -DBUILDING_DLL=1 -DUNICODE -fexpensive-optimizations -O3 -Os -fno-exceptions -Wno-error -Wall -CXXFLAGS = $(INCS) -DBUILDING_DLL=1 -DUNICODE -fexpensive-optimizations -O3 -Os -fno-exceptions -Wno-error -Wall -# -save-temps -LIBS = -lversion -lwsock32 -lole32 -lcomctl32 -luuid -loleaut32 -LFLAGS = -O -s -mdll -mwindows --add-stdcall-alias -#LFLAGS = -mdll -mwindows -Wl,-Map,ieview.map --no-export-all-symbols --add-stdcall-alias -g3 -RCFLAGS = -J rc -O coff -DUNICODE -# --add-stdcall-alias -s --no-export-all-symbols - -.PHONY: all all-before all-after clean clean-custom - -all: all-before $(BIN) all-after -ifdef PACK - $(UPX) $(BIN) -endif - -clean: clean-custom - $(RM) -f $(OBJ) $(BIN) - -depend : - $(CXX) -MM $(CFLAGS) $(SRC)>Makefile.dep - -$(RES): $(RES:.res=.rc) resource.h - $(WINDRES) $(RCFLAGS) -i $(RES:.res=.rc) -o $(RES) - -$(BIN): $(OBJ) - $(CXX) $(CFLAGS) $(OBJ) $(LIBS) $(LFLAGS) -o $(BIN) -Wl - --include Makefile.dep diff --git a/plugins/IEView/ieview_main.cpp b/plugins/IEView/ieview_main.cpp index 9e189373f7..cc0facd49b 100644 --- a/plugins/IEView/ieview_main.cpp +++ b/plugins/IEView/ieview_main.cpp @@ -95,7 +95,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) Utils::createServiceFunction_Ex(MS_IEVIEW_WINDOW, HandleIEWindow); Utils::createServiceFunction_Ex(MS_IEVIEW_EVENT, HandleIEEvent); - Utils::createServiceFunction_Ex(MS_IEVIEW_EVENT, HandleIENavigate); + Utils::createServiceFunction_Ex(MS_IEVIEW_NAVIGATE, HandleIENavigate); hHookOptionsChanged = CreateHookableEvent(ME_IEVIEW_OPTIONSCHANGED); return 0; } -- cgit v1.2.3