summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alarms/alarms_8.vcproj4
-rw-r--r--alarms/common.h2
-rw-r--r--alarms/icons.cpp4
-rw-r--r--iax/common.h2
-rw-r--r--iax/iax_8.vcproj4
-rw-r--r--iax/icons.cpp4
-rw-r--r--iax/private.h2
-rw-r--r--no_history/NoHistory_8.vcproj18
-rw-r--r--no_history/common.h2
-rw-r--r--no_history/icons.cpp4
-rw-r--r--no_history/private.h2
-rw-r--r--otr/otr.mdsp6
-rw-r--r--otr/otr_private.h2
-rw-r--r--otr/utils.cpp2
-rw-r--r--ping/common.h2
-rw-r--r--ping/ping.cpp2
-rw-r--r--ping/ping_8.vcproj4
-rw-r--r--ping/utils.cpp4
-rw-r--r--worldtime/IcoLib.h37
-rw-r--r--worldtime/WorldTime.cpp2
-rw-r--r--worldtime/WorldTime.vcproj4
-rw-r--r--worldtime/plugwin.cpp4
-rw-r--r--worldtime/plugwin.h2
23 files changed, 24 insertions, 95 deletions
diff --git a/alarms/alarms_8.vcproj b/alarms/alarms_8.vcproj
index 2aa29d7..ed2b0bd 100644
--- a/alarms/alarms_8.vcproj
+++ b/alarms/alarms_8.vcproj
@@ -401,10 +401,6 @@
>
</File>
<File
- RelativePath="IcoLib.h"
- >
- </File>
- <File
RelativePath="icons.h"
>
</File>
diff --git a/alarms/common.h b/alarms/common.h
index 95199d4..0186d87 100644
--- a/alarms/common.h
+++ b/alarms/common.h
@@ -44,7 +44,7 @@
#include <m_alarms.h>
-#include "IcoLib.h"
+#include <m_icolib.h>
#define MODULE "Alarm"
diff --git a/alarms/icons.cpp b/alarms/icons.cpp
index e0a453f..ecc7f55 100644
--- a/alarms/icons.cpp
+++ b/alarms/icons.cpp
@@ -18,9 +18,9 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) {
void InitIcons() {
if(ServiceExists(MS_SKIN2_ADDICON)) {
- SKINICONDESC2 sid;
+ SKINICONDESC sid = {0};
- sid.cbSize = sizeof(SKINICONDESC2);
+ sid.cbSize = sizeof(SKINICONDESC);
sid.pszSection = Translate("Alarms");
sid.pszDescription = Translate("Menu: Set Alarm");
diff --git a/iax/common.h b/iax/common.h
index a20064c..827531a 100644
--- a/iax/common.h
+++ b/iax/common.h
@@ -28,7 +28,7 @@
#include <m_popup.h>
-#include "IcoLib.h"
+#include <m_icolib.h>
#define MODULE "IAX"
diff --git a/iax/iax_8.vcproj b/iax/iax_8.vcproj
index e7e39f0..275b7b4 100644
--- a/iax/iax_8.vcproj
+++ b/iax/iax_8.vcproj
@@ -242,10 +242,6 @@
>
</File>
<File
- RelativePath=".\IcoLib.h"
- >
- </File>
- <File
RelativePath=".\icons.h"
>
</File>
diff --git a/iax/icons.cpp b/iax/icons.cpp
index dd7298e..118ab63 100644
--- a/iax/icons.cpp
+++ b/iax/icons.cpp
@@ -14,8 +14,8 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) {
void InitIcons() {
if(ServiceExists(MS_SKIN2_ADDICON)) {
- SKINICONDESC2 sid = {0};
- sid.cbSize = sizeof(SKINICONDESC2);
+ SKINICONDESC sid = {0};
+ sid.cbSize = sizeof(SKINICONDESC);
sid.pszSection = MODULE;
diff --git a/iax/private.h b/iax/private.h
index 0215752..a21fd71 100644
--- a/iax/private.h
+++ b/iax/private.h
@@ -5,7 +5,7 @@
#define VER_MAJOR 0
#define VER_MINOR 1
#define VER_RELEASE 0
-#define VER_BUILD 1
+#define VER_BUILD 2
#define __STRINGIZE(x) #x
#define VER_STRING __STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )
diff --git a/no_history/NoHistory_8.vcproj b/no_history/NoHistory_8.vcproj
index 76381eb..c0fa645 100644
--- a/no_history/NoHistory_8.vcproj
+++ b/no_history/NoHistory_8.vcproj
@@ -225,10 +225,6 @@
>
</File>
<File
- RelativePath=".\IcoLib.h"
- >
- </File>
- <File
RelativePath=".\icons.h"
>
</File>
@@ -305,20 +301,6 @@
<File
RelativePath=".\resource.rc"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- />
- </FileConfiguration>
</File>
</Filter>
</Files>
diff --git a/no_history/common.h b/no_history/common.h
index 34b0371..eac82d5 100644
--- a/no_history/common.h
+++ b/no_history/common.h
@@ -23,7 +23,7 @@
#include <m_utils.h>
#include <m_updater.h>
-#include "IcoLib.h"
+#include <m_icolib.h>
#define MODULE "NoHistory"
#define DBSETTING_REMOVE "RemoveHistory"
diff --git a/no_history/icons.cpp b/no_history/icons.cpp
index 747b164..741ad37 100644
--- a/no_history/icons.cpp
+++ b/no_history/icons.cpp
@@ -15,8 +15,8 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) {
void InitIcons() {
if(ServiceExists(MS_SKIN2_ADDICON)) {
- SKINICONDESC2 sid = {0};
- sid.cbSize = sizeof(SKINICONDESC2);
+ SKINICONDESC sid = {0};
+ sid.cbSize = sizeof(SKINICONDESC);
sid.pszSection = MODULE;
diff --git a/no_history/private.h b/no_history/private.h
index daa8152..9474e7c 100644
--- a/no_history/private.h
+++ b/no_history/private.h
@@ -5,7 +5,7 @@
#define VER_MAJOR 0
#define VER_MINOR 1
#define VER_RELEASE 0
-#define VER_BUILD 0
+#define VER_BUILD 1
#define __STRINGIZE(x) #x
#define VER_STRING __STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )
diff --git a/otr/otr.mdsp b/otr/otr.mdsp
index 8d98d03..944adf4 100644
--- a/otr/otr.mdsp
+++ b/otr/otr.mdsp
@@ -93,7 +93,6 @@ extraResourceOptions=
5=otr_private.h
6=resource.h
7=utils.h
-8=IcoLib.h
[Resource]
1=otr_private.rc
2=resource.rc
@@ -123,8 +122,9 @@ extraResourceOptions=
23=libotr\src\userstate.h
24=libotr\src\version.h
[History]
+..\..\include\m_icolib.h,0
dllmain.cpp,41476
-utils.cpp,6882
+utils.cpp,7128
common.h,2043
libotr\src\context.h,6666
libotr\src\context.c,0
@@ -132,4 +132,4 @@ libotr\src\message.h,6083
libotr\src\proto.h,5014
libotr\src\userstate.h,1038
libotr\src\message.c,36329
-otr_private.h,171
+otr_private.h,634
diff --git a/otr/otr_private.h b/otr/otr_private.h
index 544012c..5c3f1bd 100644
--- a/otr/otr_private.h
+++ b/otr/otr_private.h
@@ -5,7 +5,7 @@
#define VER_MAJOR 0
#define VER_MINOR 5
#define VER_RELEASE 1
-#define VER_BUILD 1
+#define VER_BUILD 2
#define __STRINGIZE(x) #x
#define VER_STRING __STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )
diff --git a/otr/utils.cpp b/otr/utils.cpp
index cd5febf..84034d8 100644
--- a/otr/utils.cpp
+++ b/otr/utils.cpp
@@ -233,7 +233,7 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) {
void InitUtils() {
if(ServiceExists(MS_SKIN2_ADDICON)) {
- SKINICONDESC sid;
+ SKINICONDESC sid = {0};
sid.cbSize = sizeof(SKINICONDESC);
sid.pszSection = "OTR";
diff --git a/ping/common.h b/ping/common.h
index a701536..89a8fc9 100644
--- a/ping/common.h
+++ b/ping/common.h
@@ -59,7 +59,7 @@
#include <m_updater.h>
-#include "IcoLib.h"
+#include <m_icolib.h>
#include "collection.h"
diff --git a/ping/ping.cpp b/ping/ping.cpp
index 67a6165..90ee2d5 100644
--- a/ping/ping.cpp
+++ b/ping/ping.cpp
@@ -13,7 +13,7 @@ bool use_raw_ping = true;
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
"Ping Plugin",
- PLUGIN_MAKE_VERSION(0, 8, 0, 0),
+ PLUGIN_MAKE_VERSION(0, 8, 0, 1),
"Ping labelled IP addresses or domain names.",
"Scott Ellis",
"mail@scottellis.com.au",
diff --git a/ping/ping_8.vcproj b/ping/ping_8.vcproj
index 5209216..6f08f14 100644
--- a/ping/ping_8.vcproj
+++ b/ping/ping_8.vcproj
@@ -448,10 +448,6 @@
>
</File>
<File
- RelativePath="IcoLib.h"
- >
- </File>
- <File
RelativePath="log.h"
>
</File>
diff --git a/ping/utils.cpp b/ping/utils.cpp
index 06a89a0..a8aaaef 100644
--- a/ping/utils.cpp
+++ b/ping/utils.cpp
@@ -312,9 +312,9 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) {
void InitIcons() {
if(ServiceExists(MS_SKIN2_ADDICON)) {
- SKINICONDESC2 sid;
+ SKINICONDESC sid = {0};
- sid.cbSize = sizeof(SKINICONDESC2);
+ sid.cbSize = sizeof(SKINICONDESC);
sid.pszSection = "Ping";
sid.pszDescription = Translate("Responding");
diff --git a/worldtime/IcoLib.h b/worldtime/IcoLib.h
deleted file mode 100644
index 1817df6..0000000
--- a/worldtime/IcoLib.h
+++ /dev/null
@@ -1,37 +0,0 @@
-typedef struct {
- int cbSize;
- char *pszSection; //section name used to group icons
- char *pszDescription; //description for options dialog
- char *pszName; //name to refer to icon when playing and in db
- //this name is miranda-wide. so use prefixes of your plugin
- //e.g: "isee_connect", "clist_delete", etc
- char *pszDefaultFile; //default icon file to use
- int iDefaultIndex;
-} SKINICONDESC;
-
-typedef struct {
- int cbSize;
- char *pszSection;
- char *pszDescription;
- char *pszName;
- char *pszDefaultFile;
- int iDefaultIndex;
- HICON hDefaultIcon;
-} SKINICONDESC2;
-
-//
-// Add a icon into options UI
-//
-// wParam = (WPARAM)0
-// lParam = (LPARAM)(SKINICONDESC*)sid;
-//
-#define MS_SKIN2_ADDICON "Skin2/Icons/AddIcon"
-//
-// Retrieve HICON with name specified in lParam
-// Returned HICON SHOULDN'T be destroyed, it managed by IcoLib
-//
-#define MS_SKIN2_GETICON "Skin2/Icons/GetIcon"
-//
-// Icons change notification
-//
-#define ME_SKIN2_ICONSCHANGED "Skin2/IconsChanged"
diff --git a/worldtime/WorldTime.cpp b/worldtime/WorldTime.cpp
index d61eb9c..dc45dad 100644
--- a/worldtime/WorldTime.cpp
+++ b/worldtime/WorldTime.cpp
@@ -7,7 +7,7 @@ PLUGINLINK *pluginLink;
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
"World Time",
- PLUGIN_MAKE_VERSION(0, 3, 0, 0),
+ PLUGIN_MAKE_VERSION(0, 3, 0, 1),
"Display world times.",
"Scott Ellis",
"mail@scottellis.com.au",
diff --git a/worldtime/WorldTime.vcproj b/worldtime/WorldTime.vcproj
index a8b18c8..2a5583f 100644
--- a/worldtime/WorldTime.vcproj
+++ b/worldtime/WorldTime.vcproj
@@ -331,10 +331,6 @@
>
</File>
<File
- RelativePath="IcoLib.h"
- >
- </File>
- <File
RelativePath="plugwin.h"
>
</File>
diff --git a/worldtime/plugwin.cpp b/worldtime/plugwin.cpp
index cc7ae56..48bb576 100644
--- a/worldtime/plugwin.cpp
+++ b/worldtime/plugwin.cpp
@@ -762,9 +762,9 @@ static int PlugShowWindow(WPARAM wParam, LPARAM lParam) {
int InitIcons(WPARAM wParam, LPARAM lParam) {
if(ServiceExists(MS_SKIN2_ADDICON)) {
- SKINICONDESC2 sid;
+ SKINICONDESC sid = {0};
- sid.cbSize = sizeof(SKINICONDESC2);
+ sid.cbSize = sizeof(SKINICONDESC);
sid.pszSection = "WorldTime";
sid.pszDescription = Translate("Day");
diff --git a/worldtime/plugwin.h b/worldtime/plugwin.h
index 0e83d96..822fa51 100644
--- a/worldtime/plugwin.h
+++ b/worldtime/plugwin.h
@@ -27,7 +27,7 @@
#include <m_skin_eng.h>
-#include "IcoLib.h"
+#include <m_icolib.h>
#include <sstream>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 08:49:58 +0000