diff options
| -rw-r--r-- | plugins/CSList/res/cslist.rc | 19 | ||||
| -rw-r--r-- | plugins/CSList/src/cslist.cpp | 11 | ||||
| -rw-r--r-- | plugins/CSList/src/resource.h | 2 |
3 files changed, 15 insertions, 17 deletions
diff --git a/plugins/CSList/res/cslist.rc b/plugins/CSList/res/cslist.rc index 71f2eefa6b..f502b7e6c1 100644 --- a/plugins/CSList/res/cslist.rc +++ b/plugins/CSList/res/cslist.rc @@ -7,13 +7,12 @@ //
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
-
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Английский (США) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -81,7 +80,7 @@ IDD_OPTIONS DIALOGEX 0, 0, 300, 107 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CLIPSIBLINGS
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "List settings",IDC_STATIC,4,4,292,73
+ GROUPBOX "List settings",IDC_STATIC,4,4,292,57
CONTROL "Confirm deletion of items",IDC_CONFIRM_DELETION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,20,253,10
CONTROL "Delete entries in Custom status menu after Import",IDC_DELETE_AFTER_IMPORT,
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,24,32,253,10
@@ -146,24 +145,24 @@ END // TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"..\\src\\resource.h\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\0"
END
#endif // APSTUDIO_INVOKED
-#endif // Английский (США) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
@@ -173,7 +172,7 @@ END //
// Generated from the TEXTINCLUDE 3 resource.
//
-
-
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index f0d824fb7c..94b1235cb9 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -235,12 +235,11 @@ void forAllProtocols( pForAllProtosFunc pFunc, void *arg ) void addProtoStatusMenuItem(char *protoName, void *arg)
{
- char buf[200];
- PROTOACCOUNT *pdescr;
- pdescr = (PROTOACCOUNT*)CallService(MS_PROTO_GETACCOUNT, 0, (LPARAM)protoName);
+ PROTOACCOUNT *pdescr = ProtoGetAccount(protoName);
if (pdescr == NULL)
return;
+ char buf[200];
mir_snprintf(buf, SIZEOF(buf), "CSList/ShowList/%s", protoName);
if ( !ServiceExists(buf))
CreateServiceFunctionParam(buf, showList, (LPARAM)protoName);
@@ -324,7 +323,7 @@ CSWindow::~CSWindow() void CSWindow::initIcons()
{
- PROTOACCOUNT *pdescr = (PROTOACCOUNT*)CallService(MS_PROTO_GETACCOUNT, 0, (LPARAM)m_protoName);
+ PROTOACCOUNT *pdescr = ProtoGetAccount(m_protoName);
if (pdescr == NULL)
return;
@@ -468,13 +467,13 @@ CSAMWindow::~CSAMWindow() void CSAMWindow::exec()
{
- DialogBoxParam( g_hInst, MAKEINTRESOURCE( IDD_ADDMODIFY ), NULL, ( DLGPROC )CSAMWindowProc, (LPARAM)this );
+ DialogBoxParam( g_hInst, MAKEINTRESOURCE( IDD_ADDMODIFY ), NULL, CSAMWindowProc, (LPARAM)this );
}
void CSAMWindow::setCombo()
{
- PROTOACCOUNT *pdescr = (PROTOACCOUNT*)CallService(MS_PROTO_GETACCOUNT, 0, (LPARAM)m_parent->m_protoName);
+ PROTOACCOUNT *pdescr = ProtoGetAccount(m_parent->m_protoName);
if (pdescr == NULL)
return;
diff --git a/plugins/CSList/src/resource.h b/plugins/CSList/src/resource.h index 6a9a6f540d..65eb286097 100644 --- a/plugins/CSList/src/resource.h +++ b/plugins/CSList/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by cslist.rc
+// Used by C:\Users\xx\Documents\Visual Studio 2010\Projects\myranda\plugins\CSList\res\cslist.rc
//
#define IDCLOSE 8
#define IDC_CANCEL 9
|