code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@2886 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 3 insertions, 17 deletions

diff --git a/plugins/ContactsPlus/src/contacts.h b/plugins/ContactsPlus/src/contacts.h
index 742f577924..1feddfc923 100644
--- a/plugins/ContactsPlus/src/contacts.h
+++ b/plugins/ContactsPlus/src/contacts.h
@@ -72,6 +72,3 @@
 

 // Global Variables

 extern int g_UnicodeCore;

-extern int g_NewProtoAPI;

-extern int g_SendAckSupported;

-extern int g_Utf8EventsSupported;

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index d6aff5d371..0db72163fd 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -28,9 +28,6 @@ HINSTANCE hInst;
 

 int hLangpack;

 

-int g_NewProtoAPI = TRUE;

-

-int g_SendAckSupported = TRUE;

 int g_Utf8EventsSupported = TRUE;

 

 HANDLE ghSendWindowList;

diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index 86f70079c4..aa1099a68b 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -385,10 +385,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
           if (!wndData->SendContacts(hwndDlg))

             break;

 

-          if (g_SendAckSupported)

-            SetTimer(hwndDlg,TIMERID_MSGSEND,DBGetContactSettingDword(NULL,"SRMsg","MessageTimeout",TIMEOUT_MSGSEND),NULL);

-          else

-            SetTimer(hwndDlg,TIMERID_MSGSEND,1000,NULL); // wait one second - if no error occures

+          SetTimer(hwndDlg,TIMERID_MSGSEND,DBGetContactSettingDword(NULL,"SRMsg","MessageTimeout",TIMEOUT_MSGSEND),NULL);

 

           break;

         }

@@ -457,9 +454,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
       dbei.cbSize = sizeof(dbei);

       dbei.szModule =GetContactProto(ackData->hContact);

       dbei.eventType = EVENTTYPE_CONTACTS;

-      dbei.flags = DBEF_SENT;

-      if (g_UnicodeCore && g_Utf8EventsSupported)

-        dbei.flags |= DBEF_UTF;

+      dbei.flags = DBEF_SENT| DBEF_UTF;

       dbei.timestamp = time(NULL);

       //make blob

       TCTSend* maSend = (TCTSend*)_alloca(ackData->nContacts*sizeof(TCTSend));

@@ -469,10 +464,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
       int i;

       for (i=0; i<ackData->nContacts; i++)

       { // prepare data & count size

-        if (g_UnicodeCore && g_Utf8EventsSupported)

-          maSend[i].mcaNick = make_utf8_string((WCHAR*)GetContactDisplayNameT(ackData->aContacts[i]));

-        else

-          maSend[i].mcaNick = (unsigned char*)null_strdup((char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ackData->aContacts[i], 0));

+        maSend[i].mcaNick = make_utf8_string((WCHAR*)GetContactDisplayNameT(ackData->aContacts[i]));

         maSend[i].mcaUIN = GetContactUID(ackData->aContacts[i], FALSE);

         dbei.cbBlob += (DWORD)strlennull(maSend[i].mcaUIN) + (DWORD)strlennull((char*)maSend[i].mcaNick) + 2;

       }