diff options
Diffstat (limited to 'protocols/Xfire')
| -rw-r--r-- | protocols/Xfire/src/main.cpp | 34 | ||||
| -rw-r--r-- | protocols/Xfire/src/options.cpp | 4 | 
2 files changed, 2 insertions, 36 deletions
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index c76e364f38..9adbe4290b 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1517,49 +1517,17 @@ INT_PTR SetStatus(WPARAM wParam,LPARAM lParam)  			}
  			else
  			{
 -				CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv2.pszVal)+1,(LPARAM)dbv2.pszVal);
 -
  				if(myClient!=NULL)
  					delete myClient;
 -				//alter proxycode, entfernt da über netlib die proxysache geregelt wird
 -				/* if(db_get_b(NULL, protocolname, "useproxy" ,0))
 -				{
 -					//verbindung über proxy
 -					DBVARIANT dbv3;
 -					DBVARIANT dbv4;
 -					if(!db_get(NULL,protocolname,"proxyip",&dbv3))
 -					{
 -						if(!db_get(NULL,protocolname,"proxyport",&dbv4))
 -						{
 -							myClient = new XFireClient(dbv.pszVal,dbv2.pszVal,db_get_b(NULL,protocolname,"protover",0),1,dbv3.pszVal,atoi(dbv4.pszVal));
 -							db_free(&dbv4);
 -						}
 -						db_free(&dbv3);
 -					}
 -				}
 -				else */
 -					myClient = new XFireClient(dbv.pszVal,dbv2.pszVal,db_get_b(NULL,protocolname,"protover",0));
 +				myClient = new XFireClient(dbv.pszVal,dbv2.pszVal,db_get_b(NULL,protocolname,"protover",0));
  				//verbindung als thread
  				bpStatus = ID_STATUS_CONNECTING;
  				ProtoBroadcastAck(protocolname,NULL,ACKTYPE_STATUS,ACKRESULT_SUCCESS,(HANDLE)oldStatus,ID_STATUS_CONNECTING);
  				mir_forkthread(ConnectingThread,(LPVOID)wParam);
 -				//alte verb
 -				/*
 -				myClient->run();
 -				if(myClient->client->connected)
 -				{
 -					sendonrecieve=TRUE;
 -				}
 -				else
 -				{
 -					MSGBOXE(Translate("Unable to connect to XFire."));
 -					wParam =ID_STATUS_OFFLINE;
 -				}
 -				*/
  				//für die vars
  				db_unset(NULL,protocolname,"currentgamename");
  				db_unset(NULL,protocolname,"currentvoicename");
 diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index 9d7e519e93..004242dc63 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -179,7 +179,6 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR  			}
  			if(!db_get(NULL,protocolname,"password",&dbv)) {
  				//bit of a security hole here, since it's easy to extract a password from an edit box
 -				CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1,(LPARAM)dbv.pszVal);
  				SetDlgItemTextA(hwndDlg,IDC_PASSWORD,dbv.pszVal);
  				db_free(&dbv);
  			}
 @@ -298,8 +297,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR  					if(dbv.pszVal!=NULL) db_free(&dbv);
  					GetDlgItemTextA(hwndDlg,IDC_PASSWORD,str,sizeof(str));
 -					CallService(MS_DB_CRYPT_ENCODESTRING,sizeof(str),(LPARAM)str);
 -					dbv.pszVal=NULL;
 +					dbv.pszVal = NULL;
  					if(db_get(NULL,protocolname,"password",&dbv) || strcmp(str,dbv.pszVal))
  						reconnectRequired=1;
  					if(dbv.pszVal!=NULL) db_free(&dbv);
  | 
