diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-30 18:59:38 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-30 18:59:38 +0000 |
| commit | 10bc9e42dfba6ed8be41199243d688c2e367dc0d (patch) | |
| tree | 891aca91eeb2feddb6c76498c4eb880689360fe6 /src/core | |
| parent | 5dac5be47f2d9af8cbceead6511ff4c0fc40bab5 (diff) | |
MS_CLIST_GETSTATUSMODEDESCRIPTION & MS_CLIST_GETCONTACTDISPLAYNAME replaced with pcli->* members
git-svn-id: http://svn.miranda-ng.org/main/trunk@14459 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdauth/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdaway/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdchat/src/chat.h | 1 | ||||
| -rw-r--r-- | src/core/stdclist/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdemail/src/commonheaders.h | 2 | ||||
| -rw-r--r-- | src/core/stdfile/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdfile/src/filerecvdlg.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdhelp/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdidle/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdmsg/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdssl/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stduihist/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdurl/commonheaders.h | 2 | ||||
| -rw-r--r-- | src/core/stduserinfo/src/commonheaders.h | 2 | ||||
| -rw-r--r-- | src/core/stduseronline/src/commonheaders.h | 2 |
15 files changed, 5 insertions, 15 deletions
diff --git a/src/core/stdauth/src/commonheaders.h b/src/core/stdauth/src/commonheaders.h index 9ac9abbf2a..209a0a9813 100644 --- a/src/core/stdauth/src/commonheaders.h +++ b/src/core/stdauth/src/commonheaders.h @@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_crypto.h>
#include <m_langpack.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdaway/src/commonheaders.h b/src/core/stdaway/src/commonheaders.h index cac3b84b67..9003105e93 100644 --- a/src/core/stdaway/src/commonheaders.h +++ b/src/core/stdaway/src/commonheaders.h @@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_langpack.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h index d2706c8605..da9ed84090 100644 --- a/src/core/stdchat/src/chat.h +++ b/src/core/stdchat/src/chat.h @@ -48,7 +48,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_button.h>
#include <m_protosvc.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_clui.h>
#include <m_message.h>
#include <m_icolib.h>
diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h index fb41436634..deff5b4d14 100644 --- a/src/core/stdclist/src/commonheaders.h +++ b/src/core/stdclist/src/commonheaders.h @@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <win2k.h>
#include <newpluginapi.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_clui.h>
#include <m_system.h>
#include <m_database.h>
diff --git a/src/core/stdemail/src/commonheaders.h b/src/core/stdemail/src/commonheaders.h index 5d64b310f8..9515f7b34d 100644 --- a/src/core/stdemail/src/commonheaders.h +++ b/src/core/stdemail/src/commonheaders.h @@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_utils.h>
#include <m_netlib.h>
#include <m_langpack.h>
-#include <m_clistint.h>
+#include <m_clist.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdfile/src/commonheaders.h b/src/core/stdfile/src/commonheaders.h index c028084e09..7c71d453e0 100644 --- a/src/core/stdfile/src/commonheaders.h +++ b/src/core/stdfile/src/commonheaders.h @@ -53,7 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_crypto.h>
#include <m_langpack.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index 21842deb6e..84808b6c2b 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -136,7 +136,7 @@ void GetContactReceivedFilesDir(MCONTACT hContact, TCHAR *szDir, int cchDir, BOO REPLACEVARSARRAY rvaVarsToReplace[4];
rvaVarsToReplace[0].key.t = _T("nick");
- rvaVarsToReplace[0].value.t = mir_tstrdup((TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));
+ rvaVarsToReplace[0].value.t = mir_tstrdup((TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0));
rvaVarsToReplace[1].key.t = _T("userid");
rvaVarsToReplace[1].value.t = GetContactID(hContact);
rvaVarsToReplace[2].key.t = _T("proto");
diff --git a/src/core/stdhelp/src/commonheaders.h b/src/core/stdhelp/src/commonheaders.h index ef3c230d8f..cc3471325e 100644 --- a/src/core/stdhelp/src/commonheaders.h +++ b/src/core/stdhelp/src/commonheaders.h @@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_langpack.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdidle/src/commonheaders.h b/src/core/stdidle/src/commonheaders.h index 565408f1ba..defe5a7a76 100644 --- a/src/core/stdidle/src/commonheaders.h +++ b/src/core/stdidle/src/commonheaders.h @@ -50,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_langpack.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdmsg/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h index 82b52cbfc3..db3d85499d 100644 --- a/src/core/stdmsg/src/commonheaders.h +++ b/src/core/stdmsg/src/commonheaders.h @@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_langpack.h>
#include <m_button.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_clc.h>
#include <m_clui.h>
#include <m_options.h>
diff --git a/src/core/stdssl/src/commonheaders.h b/src/core/stdssl/src/commonheaders.h index 1ad4b81011..fcfad31b67 100644 --- a/src/core/stdssl/src/commonheaders.h +++ b/src/core/stdssl/src/commonheaders.h @@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_langpack.h>
#include <m_button.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_clc.h>
#include <m_clui.h>
#include <m_options.h>
diff --git a/src/core/stduihist/src/commonheaders.h b/src/core/stduihist/src/commonheaders.h index 52ab245752..1779af3b6b 100644 --- a/src/core/stduihist/src/commonheaders.h +++ b/src/core/stduihist/src/commonheaders.h @@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_langpack.h>
#include <m_clist.h>
-#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h index 3acf6d5748..38a6e03725 100644 --- a/src/core/stdurl/commonheaders.h +++ b/src/core/stdurl/commonheaders.h @@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_crypto.h>
#include <m_langpack.h>
-#include <m_clistint.h>
+#include <m_clist.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stduserinfo/src/commonheaders.h b/src/core/stduserinfo/src/commonheaders.h index 49583b6a21..7f9b1dd414 100644 --- a/src/core/stduserinfo/src/commonheaders.h +++ b/src/core/stduserinfo/src/commonheaders.h @@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_clui.h>
#include <m_crypto.h>
#include <m_langpack.h>
-#include <m_clistint.h>
+#include <m_clist.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
diff --git a/src/core/stduseronline/src/commonheaders.h b/src/core/stduseronline/src/commonheaders.h index df5c89598e..e654e02b1c 100644 --- a/src/core/stduseronline/src/commonheaders.h +++ b/src/core/stduseronline/src/commonheaders.h @@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_database.h>
#include <m_netlib.h>
#include <m_langpack.h>
-#include <m_clistint.h>
+#include <m_clist.h>
#include <m_button.h>
#include <m_protosvc.h>
#include <m_protocols.h>
|