summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Clist_modern/res/MicroChat.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_modern/res/MicroLunch.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_modern/res/MicroPhone.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_modern/res/chat.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_modern/res/lunch.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_modern/res/phone.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_modern/res/resource.rc12
-rw-r--r--plugins/NewAwaySysMod/src/stdafx.h3
-rw-r--r--plugins/SimpleAR/src/Main.cpp27
9 files changed, 10 insertions, 32 deletions
diff --git a/plugins/Clist_modern/res/MicroChat.ico b/plugins/Clist_modern/res/MicroChat.ico
deleted file mode 100644
index a0eea80aae..0000000000
--- a/plugins/Clist_modern/res/MicroChat.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_modern/res/MicroLunch.ico b/plugins/Clist_modern/res/MicroLunch.ico
deleted file mode 100644
index 1b8fc46b81..0000000000
--- a/plugins/Clist_modern/res/MicroLunch.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_modern/res/MicroPhone.ico b/plugins/Clist_modern/res/MicroPhone.ico
deleted file mode 100644
index 5114368f56..0000000000
--- a/plugins/Clist_modern/res/MicroPhone.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_modern/res/chat.ico b/plugins/Clist_modern/res/chat.ico
deleted file mode 100644
index 8f065e41dc..0000000000
--- a/plugins/Clist_modern/res/chat.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_modern/res/lunch.ico b/plugins/Clist_modern/res/lunch.ico
deleted file mode 100644
index 1a5abaaa0e..0000000000
--- a/plugins/Clist_modern/res/lunch.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_modern/res/phone.ico b/plugins/Clist_modern/res/phone.ico
deleted file mode 100644
index 3aad71f13a..0000000000
--- a/plugins/Clist_modern/res/phone.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 8a32e977bc..ebfdc4212a 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -47,36 +47,24 @@ IDI_AVATAR_OVERLAY_OCCUPIED ICON "occupied.ico"
IDI_AVATAR_OVERLAY_OFFLINE ICON "offline.ico"
-IDI_AVATAR_OVERLAY_PHONE ICON "phone.ico"
-
IDI_AVATAR_OVERLAY_AWAY ICON "Away.ico"
IDI_AVATAR_OVERLAY_DND ICON "DND.ico"
IDI_AVATAR_OVERLAY_INVISIBLE ICON "invisible.ico"
-IDI_AVATAR_OVERLAY_LUNCH ICON "lunch.ico"
-
-IDI_AVATAR_OVERLAY_CHAT ICON "chat.ico"
-
IDI_STATUS_OVERLAY_NA ICON "MicroNA.ico"
IDI_STATUS_OVERLAY_OCCUPIED ICON "Microoccupied.ico"
IDI_STATUS_OVERLAY_OFFLINE ICON "Microoffline.ico"
-IDI_STATUS_OVERLAY_PHONE ICON "Microphone.ico"
-
IDI_STATUS_OVERLAY_AWAY ICON "MicroAway.ico"
IDI_STATUS_OVERLAY_DND ICON "MicroDND.ico"
IDI_STATUS_OVERLAY_INVISIBLE ICON "Microinvisible.ico"
-IDI_STATUS_OVERLAY_LUNCH ICON "Microlunch.ico"
-
-IDI_STATUS_OVERLAY_CHAT ICON "Microchat.ico"
-
IDI_ICQC1 ICON "1.ico"
IDI_ICQC2 ICON "2.ico"
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index 4f522729b1..d73d285e65 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -91,10 +91,7 @@
#define SF_NA 0x8
#define SF_OCC 0x10
#define SF_DND 0x20
-#define SF_FFC 0x40
#define SF_INV 0x80
-#define SF_OTP 0x100
-#define SF_OTL 0x200
#define SF_OTHER 0x80000000
#define MOREOPTDLG_DEF_DONTPOPDLG (SF_ONL | SF_INV)
diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp
index 593bc0f2c4..d3c87a0104 100644
--- a/plugins/SimpleAR/src/Main.cpp
+++ b/plugins/SimpleAR/src/Main.cpp
@@ -19,16 +19,14 @@ Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede
CMPlugin g_plugin;
HGENMENU hToggle, hEnableMenu;
-BOOL gbVarsServiceExist = FALSE;
-INT interval;
+int interval;
-wchar_t* ptszDefaultMsg[] = {
+wchar_t *ptszDefaultMsg[] =
+{
LPGENW("I am currently away. I will reply to you when I am back."),
LPGENW("I am currently very busy and can't spare any time to talk with you. Sorry..."),
LPGENW("I am not available right now."),
- LPGENW("I am now doing something, I will talk to you later."),
- LPGENW("I am on the phone right now. I will get back to you very soon."),
- LPGENW("I am having meal right now. I will get back to you very soon.")
+ LPGENW("I am now doing something, I will talk to you later.")
};
/////////////////////////////////////////////////////////////////////////////////////////
@@ -49,7 +47,8 @@ PLUGININFOEX pluginInfoEx =
CMPlugin::CMPlugin() :
PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
-{}
+{
+}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -93,8 +92,7 @@ INT CheckDefaults(WPARAM, LPARAM)
interval = g_plugin.getWord(KEY_REPEATINTERVAL, 300);
wchar_t *ptszVal = g_plugin.getWStringA(KEY_HEADING);
- if (ptszVal == nullptr)
- // Heading not set
+ if (ptszVal == nullptr) // Heading not set
g_plugin.setWString(KEY_HEADING, TranslateT("Dear %user%, the owner left the following message:"));
else
mir_free(ptszVal);
@@ -111,20 +109,15 @@ INT CheckDefaults(WPARAM, LPARAM)
if (c < ID_STATUS_OCCUPIED)
// This mode does not have a preset message
ptszDefault = ptszDefaultMsg[c - ID_STATUS_ONLINE - 1];
- else if (c > ID_STATUS_INVISIBLE)
- ptszDefault = ptszDefaultMsg[c - ID_STATUS_ONLINE - 3];
else
ptszDefault = nullptr;
if (ptszDefault)
g_plugin.setWString(szStatus, TranslateW(ptszDefault));
}
- else
- mir_free(ptszVal);
+ else mir_free(ptszVal);
}
}
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu);
- if (ServiceExists(MS_VARS_FORMATSTRING))
- gbVarsServiceExist = TRUE;
BOOL fEnabled = g_plugin.getByte(KEY_ENABLED, 1);
if (fEnabled)
@@ -140,7 +133,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent)
if (!fEnabled || !hContact || !hDBEvent)
return FALSE; /// unspecifyed error
- char* pszProto = GetContactProto(hContact);
+ char *pszProto = GetContactProto(hContact);
int status = Proto_GetStatus(pszProto);
if (status == ID_STATUS_ONLINE || status == ID_STATUS_INVISIBLE)
return FALSE;
@@ -201,7 +194,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent)
mir_free(ptszHead);
}
- wchar_t *ptszTemp2 = (wchar_t*)mir_alloc(sizeof(wchar_t) * (msgLen + 5));
+ wchar_t *ptszTemp2 = (wchar_t *)mir_alloc(sizeof(wchar_t) * (msgLen + 5));
mir_snwprintf(ptszTemp2, msgLen + 5, L"%s\r\n\r\n%s", ptszTemp.c_str(), ptszVal);
if (ServiceExists(MS_VARS_FORMATSTRING)) {
ptszTemp = variables_parse(ptszTemp2, nullptr, hContact);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 04:29:53 +0000