From 773421e8ba17637d994088c393d406226b516a30 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 11 Oct 2013 14:01:25 +0000 Subject: - m_hNetlibUser moved to PROTO_INTERFACE; - unified protocol loggers git-svn-id: http://svn.miranda-ng.org/main/trunk@6435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/Xfire_proxy.cpp | 15 +++++++-------- protocols/Xfire/src/main.cpp | 13 +------------ 2 files changed, 8 insertions(+), 20 deletions(-) (limited to 'protocols/Xfire/src') diff --git a/protocols/Xfire/src/Xfire_proxy.cpp b/protocols/Xfire/src/Xfire_proxy.cpp index 3198f4dc80..3df221039a 100644 --- a/protocols/Xfire/src/Xfire_proxy.cpp +++ b/protocols/Xfire/src/Xfire_proxy.cpp @@ -71,11 +71,11 @@ int AfterSystemModulesLoaded(WPARAM wParam,LPARAM lParam) { //init netlib handle NETLIBUSER nlu = {0}; - nlu.cbSize = sizeof(nlu); - nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_INCOMING; - nlu.szSettingsModule = protocolname; - nlu.szDescriptiveName = "XFire server connection"; - hNetlib = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) & nlu); + nlu.cbSize = sizeof(nlu); + nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_INCOMING; + nlu.szSettingsModule = protocolname; + nlu.szDescriptiveName = "XFire server connection"; + hNetlib = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) & nlu); //init socet server NETLIBBIND nb = {0}; @@ -84,12 +84,11 @@ int AfterSystemModulesLoaded(WPARAM wParam,LPARAM lParam) nb.pExtra = NULL; nb.wPort = 25999; hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)hNetlib,(LPARAM) &nb); - - return 0; } -int initXfireProxy() { +int initXfireProxy() +{ //inits nach dem alle module geladen wurden HookEvent(ME_SYSTEM_MODULESLOADED, AfterSystemModulesLoaded); return 0; diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 2b3f93ee3a..1b1c48147a 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -921,18 +921,8 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam) strcat(servicefunction, PS_SETAWAYMSG); CreateServiceFunction(servicefunction, SetAwayMsg); - /*NETLIBUSER nlu; - ZeroMemory(&nlu, sizeof(nlu)); - nlu.cbSize = sizeof(nlu); - nlu.flags = NUF_NOHTTPSOPTION; - nlu.szSettingsModule = protocolname; - nlu.szDescriptiveName = "XFire Gamedetectionthread"; - hNetlibUser = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) & nlu);*/ - - // Variables support - if (ServiceExists(MS_VARS_REGISTERTOKEN)) - { + if (ServiceExists(MS_VARS_REGISTERTOKEN)) { TOKENREGISTER tr = {0}; tr.cbSize = sizeof(TOKENREGISTER); tr.memType = TR_MEM_MIRANDA; @@ -977,7 +967,6 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam) tr.parseFunction = Varmyxfirevoiceip; tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Voice ServerIP"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr); - } //File Association Manager support -- cgit v1.2.3