summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/AVS/src/cache.cpp3
-rw-r--r--plugins/MenuItemEx/src/main.cpp27
-rw-r--r--plugins/SmileyAdd/src/smileyroutines.cpp2
3 files changed, 15 insertions, 17 deletions
diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp
index 846ec14013..9ca7415ba9 100644
--- a/plugins/AVS/src/cache.cpp
+++ b/plugins/AVS/src/cache.cpp
@@ -270,12 +270,11 @@ void PicLoader(LPVOID param)
ace_temp.hbmPic = 0;
int result = CreateAvatarInCache(node->ace.hContact, &ace_temp, NULL);
-
if (result == -2) {
char *szProto = GetContactProto(node->ace.hContact);
if (szProto == NULL || Proto_NeedDelaysForAvatars(szProto))
QueueAdd(node->ace.hContact);
- else if (FetchAvatarFor(node->ace.hContact, szProto) == GAIR_SUCCESS) // Try yo create again
+ else if (FetchAvatarFor(node->ace.hContact, szProto) == GAIR_SUCCESS) // Try to create again
result = CreateAvatarInCache(node->ace.hContact, &ace_temp, NULL);
}
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index d2b0a2be58..bbed4dd6db 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -1,18 +1,17 @@
#include "menuex.h"
-#define MS_SETINVIS "MenuEx/SetInvis"
-#define MS_SETVIS "MenuEx/SetVis"
-#define MS_HIDE "MenuEx/Hide"
-#define MS_IGNORE "MenuEx/Ignore"
-#define MS_PROTO "MenuEx/ChangeProto"
-#define MS_ADDED "MenuEx/SendAdded"
-#define MS_AUTHREQ "MenuEx/SendAuthReq"
-#define MS_COPYID "MenuEx/CopyID"
-#define MS_RECVFILES "MenuEx/RecvFiles"
-#define MS_STATUSMSG "MenuEx/CopyStatusMsg"
-#define MS_COPYIP "MenuEx/CopyIP"
-#define MS_COPYMIRVER "MenuEx/CopyMirVer"
-
+#define MS_SETINVIS "MenuEx/SetInvis"
+#define MS_SETVIS "MenuEx/SetVis"
+#define MS_HIDE "MenuEx/Hide"
+#define MS_IGNORE "MenuEx/Ignore"
+#define MS_PROTO "MenuEx/ChangeProto"
+#define MS_ADDED "MenuEx/SendAdded"
+#define MS_AUTHREQ "MenuEx/SendAuthReq"
+#define MS_COPYID "MenuEx/CopyID"
+#define MS_RECVFILES "MenuEx/RecvFiles"
+#define MS_STATUSMSG "MenuEx/CopyStatusMsg"
+#define MS_COPYIP "MenuEx/CopyIP"
+#define MS_COPYMIRVER "MenuEx/CopyMirVer"
const int vf_default = VF_VS|VF_HFL|VF_IGN|VF_CID|VF_SHOWID|VF_RECV|VF_STAT|VF_SMNAME|VF_CIDN|VF_CIP;
@@ -1025,7 +1024,7 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
hmenuOff = Menu_AddContactMenuItem(&mi);
mi.position++;
- mi.ptszName = NULL;
+ mi.ptszName = LPGENT("Hide from list");
mi.pszService = MS_HIDE;
hmenuHide = Menu_AddContactMenuItem(&mi);
diff --git a/plugins/SmileyAdd/src/smileyroutines.cpp b/plugins/SmileyAdd/src/smileyroutines.cpp
index 651c34b0c3..67c011d1ea 100644
--- a/plugins/SmileyAdd/src/smileyroutines.cpp
+++ b/plugins/SmileyAdd/src/smileyroutines.cpp
@@ -192,7 +192,7 @@ void ReplaceSmileys(HWND hwnd, SmileyPackType* smp, SmileyPackCType* smcp, const
if (RichEditOle == NULL)
return;
- ITextDocument* TextDocument;
+ ITextDocument* TextDocument = NULL;
if (RichEditOle->QueryInterface(IID_ITextDocument, (void**)&TextDocument) != S_OK) {
RichEditOle->Release();
return;