rebuilds for beta release - added some updater compatibility, and more GUIDs for 0.8

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@144 4f64403b-2f21-0410-a795-97e2b3489a10
author: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10> 2007-04-25 13:49:06 +0000
committer: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10> 2007-04-25 13:49:06 +0000
commit: a44175dd565f39990ef57719313ef3a88a8d01b6 (patch)
tree: 957b9c8c58f21854450780bc2f29b1e0961dafdf
parent: 3224f00e30979b51332dac42c8652af0b2c0c748 (diff)
29 files changed, 219 insertions, 602 deletions
diff --git a/alarms/alarms.cpp b/alarms/alarms.cpp
index eb0ddc2..eb41ef4 100644
--- a/alarms/alarms.cpp
+++ b/alarms/alarms.cpp
@@ -33,7 +33,7 @@ WNDPROC old_clist_wndproc;
 PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),
 	"Alarms",
-	PLUGIN_MAKE_VERSION(0,4,0,0),
+	PLUGIN_MAKE_VERSION(0,4,0,1),
 	"Set once-off, daily, weekly and weekday alarms.",
 	"Scott Ellis",
 	"mail@scottellis.com.au",
@@ -218,6 +218,32 @@ static int InitTopToolbarButton(WPARAM wParam, LPARAM lParam) {
 }
 
 static int MainInit(WPARAM wparam,LPARAM lparam) {
+	if(ServiceExists(MS_UPDATE_REGISTER)) {
+		// register with updater
+		Update update = {0};
+		char szVersion[16];
+
+		update.cbSize = sizeof(Update);
+
+		update.szComponentName = pluginInfo.shortName;
+		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
+		update.cpbVersion = strlen((char *)update.pbVersion);
+
+		update.szUpdateURL = UPDATER_AUTOREGISTER;
+		
+		// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
+		// before the version that we use to locate it on the page
+		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
+		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
+		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/alarms.zip";
+		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_alarms.html";
+		update.pbBetaVersionPrefix = (BYTE *)" version ";
+		
+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+
+		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
+	}
+
 	/*
 	PROTOCOLDESCRIPTOR pd;
 	HANDLE hContact;
diff --git a/alarms/alarms.mdsp b/alarms/alarms.mdsp
index 55ed805..aca3feb 100644
--- a/alarms/alarms.mdsp
+++ b/alarms/alarms.mdsp
@@ -107,7 +107,8 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-..\..\include\m_genmenu.h,10664
-frame.cpp,2708
-trigger.cpp,669
-options.cpp,31180
+options.cpp,31167
+trigger.cpp,631
+frame.cpp,2679
+..\..\include\m_genmenu.h,10613
+alarms.cpp,3320
diff --git a/clist_classic_sje/clist.dsp b/clist_classic_sje/clist.dsp
index 94aea63..ef796ab 100644
--- a/clist_classic_sje/clist.dsp
+++ b/clist_classic_sje/clist.dsp
@@ -344,38 +344,14 @@ SOURCE=.\resource.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=.\res\addcontact.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\away.ico
-# End Source File
-# Begin Source File
-
 SOURCE=.\res\blank.ico
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\changefont.ico
-# End Source File
-# Begin Source File
-
 SOURCE=.\res\delete.ico
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\detailsl.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\dnd.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\downarrow.ico
-# End Source File
-# Begin Source File
-
 SOURCE=.\res\dragcopy.cur
 # End Source File
 # Begin Source File
@@ -384,152 +360,16 @@ SOURCE=.\res\dropuser.cur
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\emptyblo.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\file.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\filledbl.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\finduser.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\freechat.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\groupope.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\groupshu.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\help.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\history.ico
-# End Source File
-# Begin Source File
-
 SOURCE=.\res\hyperlin.cur
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\invisible.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\message.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\miranda.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\mirandaw.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\multisend.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\na2.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\notick.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\notick1.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\occupied.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\offline2.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\online2.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\onthepho.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\options.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\outtolun.ico
-# End Source File
-# Begin Source File
-
 SOURCE=.\res\rename.ico
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\reply.ico
-# End Source File
-# Begin Source File
-
 SOURCE=.\resource.rc
 # End Source File
-# Begin Source File
-
-SOURCE=.\res\searchal.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\sendmail.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\smalldot.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\sms.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\sortcold.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\sortcolu.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\timestamp.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\url.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\useronli.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\viewdetails.ico
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/clist_classic_sje/clist_8.vcproj b/clist_classic_sje/clist_8.vcproj
index af99a2c..3aa15bd 100644
--- a/clist_classic_sje/clist_8.vcproj
+++ b/clist_classic_sje/clist_8.vcproj
@@ -76,7 +76,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="$(OutDir)/clist_classic.dll"
+				OutputFile="$(OutDir)/clist_classic_sje.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -177,7 +177,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="$(OutDir)/clist_classic.dll"
+				OutputFile="$(OutDir)/clist_classic_sje.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -276,7 +276,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="$(OutDir)/clist_classic.dll"
+				OutputFile="$(OutDir)/clist_classic_sje.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -380,7 +380,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="$(OutDir)/clist_classic.dll"
+				OutputFile="$(OutDir)/clist_classic_sje.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalManifestDependencies="type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
diff --git a/clist_classic_sje/cluiopts.c b/clist_classic_sje/cluiopts.c
index 22c23fd..e150747 100644
--- a/clist_classic_sje/cluiopts.c
+++ b/clist_classic_sje/cluiopts.c
@@ -266,7 +266,7 @@ static BOOL CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		CheckDlgButton(hwndDlg, IDC_EQUALSECTIONS, DBGetContactSettingByte(NULL, "CLUI", "EqualSections", 0) ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hwndDlg, IDC_SBPANELBEVEL, DBGetContactSettingByte(NULL, "CLUI", "SBarBevel", 1) ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hwndDlg, IDC_SHOWGRIP, DBGetContactSettingByte(NULL, "CLUI", "ShowGrip", 1) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_CLCBKGND, DBGetContactSettingByte(NULL, "CLUI", "SBarCLCBkGnd", 0) ? BST_CHECKED : BST_UNCHECKED);
+		//CheckDlgButton(hwndDlg, IDC_CLCBKGND, DBGetContactSettingByte(NULL, "CLUI", "SBarCLCBkGnd", 0) ? BST_CHECKED : BST_UNCHECKED);
 		if (!IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) {
 			EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWICON), FALSE);
 			EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWPROTO), FALSE);
@@ -301,7 +301,7 @@ static BOOL CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			DBWriteContactSettingByte(NULL, "CLUI", "SBarRightClk", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA));
 			DBWriteContactSettingByte(NULL, "CLUI", "EqualSections", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS));
 			DBWriteContactSettingByte(NULL, "CLUI", "SBarBevel", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL));
-			DBWriteContactSettingByte(NULL, "CLUI", "SBarCLCBkGnd", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CLCBKGND));
+			//DBWriteContactSettingByte(NULL, "CLUI", "SBarCLCBkGnd", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CLCBKGND));
 			pcli->pfnLoadCluiGlobalOpts();
 			if (DBGetContactSettingByte(NULL, "CLUI", "ShowGrip", 1) != (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) {
 				HWND parent = GetParent(pcli->hwndStatus);
diff --git a/clist_classic_sje/resource.h b/clist_classic_sje/resource.h
index 4baa48f..1d4b398 100644
--- a/clist_classic_sje/resource.h
+++ b/clist_classic_sje/resource.h
@@ -1,171 +1,28 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
+// Microsoft Developer Studio generated include file.
 // Used by resource.rc
 //
-#define IDC_AUTHICON                    1
-#define IDC_NOTOALL                     3
-#define IDC_APPLY                       3
-#define IDI_MIRANDA                     102
-#define IDD_ABOUT                       103
-#define IDI_SMS                         103
-#define IDI_ONLINE                      104
-#define IDI_OFFLINE                     105
-#define IDD_GNUPL                       110
-#define IDD_ADDED                       115
-#define IDD_URLSEND                     119
-#define IDD_URLRECV                     120
-#define IDD_AUTHREQ                     121
-#define IDD_DETAILS                     125
 #define IDD_OPT_CLIST                   126
-#define IDD_HISTORY                     127
-#define IDI_AWAY                        128
-#define IDI_FREE4CHAT                   129
-#define IDI_INVISIBLE                   130
-#define IDI_NA                          131
-#define IDD_OPT_SOUND                   134
-#define IDI_SENDURL                     135
-#define IDI_RECVMSG                     136
-#define IDI_SENDMSG                     137
-#define IDI_URL                         138
-#define IDI_DND                         158
-#define IDI_OCCUPIED                    159
-#define IDI_USERDETAILS                 160
-#define IDI_FINDUSER                    161
-#define IDI_HELP                        162
-#define IDI_OPTIONS                     163
-#define IDI_MIRANDAWEBSITE              172
 #define IDI_RENAME                      173
-#define IDI_HISTORY                     174
 #define IDI_DELETE                      175
 #define IDR_CONTEXT                     180
 #define IDC_DROP                        183
 #define IDD_OPT_HOTKEY                  184
-#define IDD_HISTORY_FIND                192
-#define IDI_SENDEMAIL                   193
-#define IDD_FILERECV                    194
-#define IDD_PROFILEMANAGER              197
-#define IDD_NEWPROFILE                  198
 #define IDR_CLISTMENU                   199
 #define IDI_BLANK                       200
-#define IDD_FINDADD                     201
-#define IDI_USERONLINE                  201
-#define IDD_OPT_AUTOAWAY                202
-#define IDI_GROUPSHUT                   202
-#define IDD_OPTIONS                     203
-#define IDI_GROUPOPEN                   203
-#define IDD_PLUGINCONFLICT              204
-#define IDD_FILESEND                    205
-#define IDI_NOTICK                      205
-#define IDD_OPT_PLUGINS                 206
-#define IDI_TICK                        206
-#define IDD_OPT_ICONS                   207
-#define IDI_FILE                        207
-#define IDI_TIMESTAMP                   208
-#define IDI_CHANGEFONT                  209
-#define IDI_ADDCONTACT                  210
-#define IDI_SMALLDOT                    211
-#define IDI_FILLEDBLOB                  212
-#define IDD_READAWAYMSG                 213
-#define IDI_EMPTYBLOB                   213
-#define IDD_OPT_IGNORE                  214
 #define IDC_HYPERLINKHAND               214
-#define IDD_OPT_VISIBILITY              215
 #define IDC_DROPUSER                    215
-#define IDD_SETAWAYMSG                  216
-#define IDI_DETAILSLOGO                 216
-#define IDD_OPT_AWAYMSG                 217
 #define IDD_OPT_CLUI                    218
-#define IDD_INFO_SUMMARY                220
-#define IDD_INFO_CONTACT                221
-#define IDD_INFO_BACKGROUND             222
-#define IDD_INFO_NOTES                  223
-#define IDD_ADDEMAIL                    226
-#define IDD_ICONINDEX                   227
 #define IDD_OPT_CLC                     228
 #define IDD_OPT_CLCTEXT                 229
 #define IDD_OPT_CLCBKG                  230
-#define IDD_INFO_LOCATION               231
-#define IDD_INFO_WORK                   232
-#define IDD_ADDPHONE                    233
 #define IDD_OPT_SBAR                    234
-#define IDD_INSTALLINI                  235
-#define IDD_WARNINICHANGE               236
-#define IDD_INIIMPORTDONE               237
 #define IDD_OPT_CLCTEXTSIMPLE           239
-#define IDB_SORTCOLUP                   239
-#define IDB_SORTCOLDOWN                 240
-#define IDD_OPT_NETLIB                  246
-#define IDD_NETLIBLOGOPTS               247
-#define IDD_FILETRANSFERINFO            249
-#define IDD_OPT_FILETRANSFER            250
-#define IDD_FILEEXISTS                  251
 #define IDD_DELETECONTACT               254
-#define IDD_DENYREASON                  256
-#define IDD_ADDCONTACT                  257
-#define IDD_OPT_CONTACT                 261
-#define IDI_MULTISEND                   263
-#define IDI_DOWNARROW                   264
-#define IDD_CREDITS                     265
-#define IDD_OPT_IDLE                    268
-#define IDC_SAVE                        1001
-#define IDI_ONTHEPHONE                  1002
-#define IDC_MESSAGE                     1002
-#define IDI_OUTTOLUNCH                  1003
-#define IDC_AUTOCLOSE                   1004
-#define IDC_FROM                        1005
-#define IDC_AUTOMIN                     1005
-#define IDC_DATE                        1006
-#define IDC_DUMPRECV                    1006
-#define IDC_MSG                         1008
-#define IDC_PROXYDNS                    1008
-#define IDC_NAME                        1009
-#define IDC_PROXYTYPE                   1009
-#define IDC_STATIC23                    1010
-#define IDC_SPECIFYPORTS                1013
-#define IDC_ST_ENTERMSG                 1013
-#define IDC_ST_ENTERURL                 1014
-#define IDC_SPECIFYPORTSO               1014
-#define IDC_TEXT                        1019
-#define IDC_SHOWNAMES                   1024
-#define IDC_ABOUT                       1032
-#define IDC_MYNOTES                     1033
-#define IDC_URLS                        1037
-#define IDC_REPLY                       1039
-#define IDC_URL                         1041
-#define IDC_REASON                      1046
-#define IDC_EMAIL                       1048
-#define IDC_NAMENICK                    1049
-#define IDC_NAMEFIRST                   1050
-#define IDC_NAMELAST                    1051
-#define IDC_NICK                        1053
-#define IDC_GENDER                      1060
-#define IDC_CITY                        1061
-#define IDC_STATE                       1062
-#define IDC_COUNTRY                     1063
-#define IDC_AGE                         1064
-#define IDC_ZIP                         1064
-#define IDC_PHONE                       1065
-#define IDC_STREET                      1065
-#define IDC_COMPANY                     1066
-#define IDC_LANGUAGE1                   1066
-#define IDC_TIMEZONE                    1067
-#define IDC_DEPARTMENT                  1067
-#define IDC_LOCALTIME                   1068
-#define IDC_DETAILS                     1069
-#define IDC_POSITION                    1069
-#define IDC_LANGUAGE2                   1069
-#define IDC_ADD                         1070
-#define IDC_LANGUAGE3                   1070
-#define IDC_MOREOPTIONS                 1071
-#define IDC_USERMENU                    1071
 #define IDC_MIN2TRAY                    1073
 #define IDC_ONTOP                       1074
 #define IDC_SHOWMAINMENU                1075
 #define IDC_CLIENTDRAG                  1076
-#define IDC_EDIT                        1078
-#define IDC_LIST                        1079
-#define IDC_HISTORY                     1080
-#define IDC_USESOUND                    1085
 #define IDC_TOOLWND                     1097
 #define IDC_ONECLK                      1098
 #define IDC_SHOWCAPTION                 1098
@@ -184,105 +41,24 @@
 #define IDC_SORTBYPROTO                 1105
 #define IDC_SHOWOPTIONS                 1105
 #define IDC_SEARCHURL                   1106
-#define IDC_BUILDTIME                   1108
-#define IDC_NUMBER                      1113
-#define IDC_UIN                         1123
 #define IDC_TRANSPARENT                 1124
 #define IDC_TRANSINACTIVE               1126
 #define IDC_TRANSACTIVE                 1128
-#define IDC_FINDWHAT                    1131
-#define IDC_FIND                        1132
-#define IDC_FILE                        1133
-#define IDC_PROFILELIST                 1134
-#define IDC_NEWPROFILE                  1135
-#define IDC_NEWPROFILENAME              1136
-#define IDC_TABS                        1141
-#define IDC_RESULTS                     1142
-#define IDC_STATUS                      1144
-#define IDC_SCREENSAVE                  1145
-#define IDC_TIMED                       1146
-#define IDC_AWAYTIME                    1147
-#define IDC_USEPROXY                    1148
-#define IDC_SETNA                       1148
-#define IDC_PROXYAUTH                   1149
-#define IDC_NATIME                      1149
-#define IDC_PROXYHOST                   1150
-#define IDC_PROXYPORT                   1151
-#define IDC_PROXYUSER                   1152
-#define IDC_PROXYPASS                   1153
 #define IDC_STATIC11                    1154
 #define IDC_STATIC12                    1155
 #define IDC_STATIC21                    1156
 #define IDC_STATIC22                    1157
-#define IDC_STATIC31                    1158
-#define IDC_STATIC32                    1159
-#define IDC_PROXYAUTHNTLM               1160
 #define IDC_HKSHOWHIDE                  1162
 #define IDC_HKREADMSG                   1163
-#define IDC_SOUNDLIST                   1163
 #define IDC_HKSEARCH                    1164
-#define IDC_CHANGE                      1164
-#define IDC_PREVIEW                     1165
 #define IDC_HKSHOWOPTIONS               1165
-#define IDC_PLUGINLIST                  1167
-#define IDC_FEATURENAME                 1168
-#define IDC_CHOOSE                      1169
-#define IDC_TO                          1170
-#define IDC_ABOUTGROUP                  1175
-#define IDC_DESCRIPTION                 1176
-#define IDC_AUTHOR                      1177
-#define IDC_COPYRIGHT                   1178
-#define IDC_VERSION                     1179
-#define IDC_HOMEPAGE                    1181
-#define IDC_RESTARTREQD                 1182
-#define IDC_ICONSET                     1183
 #define IDC_BROWSE                      1184
-#define IDC_RUNATSTARTBROWSE            1185
-#define IDC_PAGETREE                    1186
-#define IDC_RUNNOW                      1186
 #define IDC_INACTIVEPERC                1187
 #define IDC_ACTIVEPERC                  1188
 #define IDC_SEARCHNEWWND                1188
-#define IDC_RETRIEVING                  1193
 #define IDC_TITLETEXT                   1196
-#define IDC_GETMORE                     1200
-#define IDC_VISIBLEICON                 1204
-#define IDC_INVISIBLEICON               1205
-#define IDC_FILEICON                    1206
-#define IDC_ONLINEICON                  1207
-#define IDC_FILENAMES                   1208
-#define IDC_ALLICON                     1208
-#define IDC_DONTREPLY                   1209
-#define IDC_NONEICON                    1209
-#define IDC_USEPREVIOUS                 1210
-#define IDC_NODIALOG                    1211
-#define IDC_USESPECIFIC                 1212
-#define IDC_FILEDIR                     1213
-#define IDC_ALLFILESPROGRESS            1217
-#define IDC_CURRENTSPEED                1219
-#define IDC_STAWAYTYPE                  1220
-#define IDC_WHITERECT                   1221
-#define IDC_ALLSPEED                    1221
-#define IDC_CURRENTFILEPROGRESS         1222
-#define IDC_CURRENTFILEGROUP            1223
-#define IDC_FIRSTNAME                   1224
-#define IDC_LASTNAME                    1225
-#define IDC_CURRENTTRANSFERRED          1225
-#define IDC_DOBDAY                      1226
-#define IDC_DOBMONTH                    1227
-#define IDC_WEBPAGE                     1228
-#define IDC_DOBYEAR                     1228
-#define IDC_UPDATING                    1231
-#define IDC_NAMEORDER                   1234
 #define IDC_AUTOHIDE                    1235
 #define IDC_HIDETIME                    1236
-#define IDC_RECONNECTREQD               1239
-#define IDC_IMPORT                      1241
-#define IDC_TOMAIN                      1243
-#define IDC_TOPROTO                     1244
-#define IDC_PROTOLIST                   1245
-#define IDC_TODEFICON                   1246
-#define IDC_IMPORTMULTI                 1247
 #define IDC_MAXSIZEHEIGHT               1254
 #define IDC_MAXSIZESPIN                 1255
 #define IDC_FONTID                      1256
@@ -321,14 +97,7 @@
 #define IDC_SCRIPT                      1300
 #define IDC_TILEV                       1301
 #define IDC_GAMMACORRECT                1302
-#define IDC_INTERESTS                   1305
-#define IDC_EMAILS                      1306
-#define IDC_PAST                        1307
 #define IDC_HIDEOFFLINEOPTS             1308
-#define IDC_PHONES                      1308
-#define IDC_SMS                         1310
-#define IDC_AREA                        1312
-#define IDC_UPDATE                      1313
 #define IDC_DONTCYCLE                   1315
 #define IDC_PRIMARYSTATUS               1316
 #define IDC_CYCLE                       1317
@@ -344,18 +113,6 @@
 #define IDC_SHOWSBAR                    1329
 #define IDC_RIGHTMIRANDA                1330
 #define IDC_RIGHTSTATUS                 1331
-#define IDC_ININAME                     1333
-#define IDC_VIEWINI                     1334
-#define IDC_SECURITYINFO                1335
-#define IDC_SETTINGNAME                 1336
-#define IDC_NEWVALUE                    1337
-#define IDC_WARNNOMORE                  1338
-#define IDC_DELETE                      1339
-#define IDC_RECYCLE                     1340
-#define IDC_NEWNAME                     1341
-#define IDC_MOVE                        1342
-#define IDC_LEAVE                       1343
-#define IDC_EXPERT                      1346
 #define IDC_SORTBYNAME                  1347
 #define IDC_STAUTOHIDESECS              1349
 #define IDC_STCLISTGROUP                1350
@@ -374,123 +131,15 @@
 #define IDC_BITMAP                      1363
 #define IDC_STWINDOWGROUP               1364
 #define IDC_STATIC01                    1365
-#define IDC_CATEGORYLIST                1366
-#define IDC_LOADICONS                   1369
-#define IDC_STICONSGROUP                1371
-#define IDC_MSGICON                     1375
-#define IDC_URLICON                     1376
-#define IDC_STNOPAGE                    1377
-#define IDC_STCHECKMARKS                1380
 #define IDC_STSAMETEXT                  1382
 #define IDC_STASTEXT                    1383
 #define IDC_STSIZETEXT                  1384
 #define IDC_STCOLOURTEXT                1385
 #define IDC_STHORZBAR                   1386
-#define IDC_MIRANDA                     1388
-#define IDC_STATUSBAR                   1389
-#define IDC_PROTOIDGROUP                1392
-#define IDC_BYPROTOID                   1393
-#define IDC_PROTOID                     1394
-#define IDC_EMAILGROUP                  1395
-#define IDC_BYEMAIL                     1396
-#define IDC_STNAMENICK                  1397
-#define IDC_NAMEGROUP                   1398
-#define IDC_BYNAME                      1399
-#define IDC_STNAMEFIRST                 1400
-#define IDC_STNAMELAST                  1401
-#define IDC_ADVANCEDGROUP               1402
-#define IDC_BYADVANCED                  1403
-#define IDC_ADVANCED                    1404
-#define IDC_STSIMPLERIGHT               1440
-#define IDC_NETLIBUSERS                 1443
-#define IDC_STOFTENPORT                 1445
-#define IDC_STATIC51                    1446
-#define IDC_STATIC52                    1447
-#define IDC_STATIC43                    1448
-#define IDC_LOGOPTIONS                  1449
-#define IDC_PORTSRANGE                  1450
-#define IDC_TOCONSOLE                   1451
-#define IDC_STATIC53                    1451
-#define IDC_SHOWCONSOLEATSTART          1452
-#define IDC_PORTSRANGEO                 1452
-#define IDC_STATIC54                    1453
-#define IDC_SHOWCONSOLE                 1454
-#define IDC_TOOUTPUTDEBUGSTRING         1455
-#define IDC_TOFILE                      1456
-#define IDC_CLEARCONSOLE                1457
-#define IDC_RUNATSTART                  1458
-#define IDC_DUMPSENT                    1464
-#define IDC_DUMPPROXY                   1466
-#define IDC_TEXTDUMPS                   1467
-#define IDC_AUTODETECTTEXT              1468
-#define IDC_TIMEFORMAT                  1469
-#define IDC_FILENAMEBROWSE              1470
-#define IDC_SHOWTHISDLGATSTART          1471
-#define IDC_FILEDIRBROWSE               1475
-#define IDC_ALLFILESGROUP               1476
-#define IDC_SCANCMDLINEBROWSE           1476
-#define IDC_ALLTRANSFERRED              1477
-#define IDC_OPENFOLDER                  1478
-#define IDC_OPENFILE                    1479
-#define IDC_TOTALSIZE                   1480
-#define IDC_APPENDNICKTODIR             1483
-#define IDC_AUTOACCEPT                  1484
-#define IDC_SCANCMDLINE                 1485
-#define IDC_WARNBEFOREOPENING           1488
-#define IDC_SCANDURINGDL                1489
-#define IDC_SCANAFTERDL                 1490
-#define IDC_NOSCANNER                   1491
-#define IDC_ST_CMDLINE                  1492
-#define IDC_ST_CMDLINEHELP              1493
-#define IDC_PROPERTIES                  1496
-#define IDC_RESUME                      1497
-#define IDC_EXISTINGICON                1499
-#define IDC_RESUMEALL                   1500
-#define IDC_OVERWRITE                   1501
-#define IDC_OVERWRITEALL                1502
-#define IDC_SKIP                        1503
-#define IDC_EXISTINGSIZE                1506
-#define IDC_EXISTINGDATE                1507
-#define IDC_EXISTINGTYPE                1508
-#define IDC_NEWICON                     1509
-#define IDC_NEWSIZE                     1510
-#define IDC_NEWDATE                     1511
-#define IDC_NEWTYPE                     1512
-#define IDC_SAVEAS                      1513
-#define IDC_ASK                         1516
-#define IDC_RENAME                      1519
-#define IDC_VIRUSSCANNERGROUP           1520
 #define IDC_HIDE                        1534
 #define IDC_TOPLINE                     1535
-#define IDC_GPLBTN                      1536
-#define IDC_MAIL                        1536
-#define IDC_MYHANDLE                    1540
-#define IDC_GROUP                       1541
-#define IDC_ADDED                       1542
-#define IDC_AUTH                        1543
-#define IDC_PLUGINSTATIC1               1559
-#define IDC_DELETEHISTORY               1560
 #define IDC_HOTKEYURLSTR                1567
-#define IDC_SETNASTR                    1568
-#define IDC_AAUTHOR                     1569
-#define IDC_AHOMEPAGE                   1570
-#define IDC_AVERSION                    1571
-#define IDC_ACOPYRIGHT                  1572
-#define IDC_ADESCRIPTION                1573
-#define IDC_PLUGINENABLE                1574
-#define IDC_AUTHREQ                     1577
-#define IDC_AUTHGB                      1578
 #define IDC_BRINGTOFRONT                1579
-#define IDC_PROTOCOL                    1580
-#define IDC_BRINGTOFRONT2               1580
-#define IDC_CONTRIBLINK                 1586
-#define IDC_HOMELINK                    1587
-#define IDC_SUPPORTLINK                 1588
-#define IDC_DEVS                        1589
-#define IDC_GPL                         1590
-#define IDC_LOGO                        1591
-#define IDC_CREDITSTEXT                 1595
-#define IDC_WSLOCK                      1599
 #define IDC_BLINKTIME                   1607
 #define IDC_BLINKSPIN                   1608
 #define IDC_DISABLEBLINK                1609
@@ -499,46 +148,18 @@
 #define IDC_DROPSHADOW                  1612
 #define IDC_SHOWGRIP                    1612
 #define IDC_NOSCROLLBAR                 1613
-#define IDC_SHOWGRIP2                   1613
-#define IDC_CLCBKGND                    1613
-#define IDC_BUTTON1                     1633
-#define IDC_IDLECHECK                   1636
-#define IDC_IDLEONWINDOWS               1637
-#define IDC_IDLEONMIRANDA               1638
-#define IDC_IDLEUSEGLI                  1639
-#define IDC_SCREENSAVER                 1642
-#define IDC_LOCKED                      1643
-#define IDC_IDLESHORT                   1644
-#define IDC_IDLELONG                    1645
-#define IDC_IDLE1STTIME                 1646
-#define IDC_IDLE2NDTIME                 1647
-#define IDC_IDLEPRIVATE                 1649
-#define IDC_AASTATUS                    1650
-#define IDC_AASHORTIDLE                 1651
-#define IDC_AALONGSTATUS                1652
-#define IDC_AALONGIDLE                  1656
 #define IDC_ONDESKTOP                   1657
 #define IDC_WINCOLOUR                   1659
 #define IDC_ICONBLINK                   1660
 #define IDC_STMSDELAY                   1661
 #define IDC_NOBORDER                    1662
-#define IDI_SEARCHALL                   32548
 #define ID_ICQ_EXIT                     40001
-#define IDM_COPY                        40001
-#define ID_RESET                        40002
 #define POPUP_HIDEEMPTYGROUPS           40003
 #define POPUP_NEWSUBGROUP               40004
 #define POPUP_HIDEOFFLINE               40005
 #define POPUP_GROUPHIDEOFFLINE          40006
 #define POPUP_HIDEOFFLINEROOT           40007
 #define POPUP_DISABLEGROUPS             40008
-#define IDC_SENDMESSAGE                 40009
-#define IDM_COPYALL                     40011
-#define IDM_SELECTALL                   40012
-#define IDM_CLEAR                       40013
-#define IDM_OPENNEW                     40014
-#define IDM_OPENEXISTING                40015
-#define IDM_COPYLINK                    40016
 #define POPUP_HIDEMIRANDA               40017
 #define POPUP_OPTIONS                   40018
 #define POPUP_EXIT                      40019
diff --git a/clist_classic_sje/resource.rc b/clist_classic_sje/resource.rc
index 1b1d78b..a1f5bf1 100644
--- a/clist_classic_sje/resource.rc
+++ b/clist_classic_sje/resource.rc
@@ -273,7 +273,7 @@ BEGIN
     CONTROL         "Make sections equal width",IDC_EQUALSECTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,78,142,10
     CONTROL         "Show bevels on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,107,10
     CONTROL         "Show resize grip indicator",IDC_SHOWGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,110,96,10
-    CONTROL         "Contact list background colour",IDC_CLCBKGND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,126,142,10
+    //CONTROL         "Contact list background colour",IDC_CLCBKGND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,126,142,10
 END
 
 IDD_OPT_CLCTEXTSIMPLE DIALOGEX 0, 0, 277, 240
diff --git a/iax/dllmain.cpp b/iax/dllmain.cpp
index 5e10508..f62a507 100644
--- a/iax/dllmain.cpp
+++ b/iax/dllmain.cpp
@@ -39,11 +39,16 @@ extern "C" __declspec (dllexport) PLUGININFOEX* __cdecl MirandaPluginInfoEx(DWOR
 }
 
 static const MUUID interfaces[] = {MIID_PROTOCOL, MIID_LAST};
-__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 {
 	return interfaces;
 }
 
+extern "C" __declspec (dllexport) PLUGININFO* __cdecl MirandaPluginInfo(DWORD mirandaVersion) {
+	pluginInfo.cbSize = sizeof(PLUGININFO);
+	return (PLUGININFO*)&pluginInfo;
+}
+
 int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 	if(ServiceExists(MS_UPDATE_REGISTER)) {
 		// register with updater
diff --git a/iax/private.h b/iax/private.h
index fe727c9..0215752 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				0
+#define VER_BUILD				1
 
 #define __STRINGIZE(x)			#x
 #define VER_STRING				__STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )
diff --git a/justtabs/justtabs.cpp b/justtabs/justtabs.cpp
index cac633a..990dc29 100644
--- a/justtabs/justtabs.cpp
+++ b/justtabs/justtabs.cpp
@@ -25,7 +25,7 @@ HFONT hFontTabs = 0;
 PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),
 	MODULE,
-	PLUGIN_MAKE_VERSION(0,1,0,0),
+	PLUGIN_MAKE_VERSION(0,1,0,1),
 	"Put SRMM windows into a single frame",
 	"Scott Ellis",
 	"mail@scottellis.com.au",
@@ -47,6 +47,12 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;
 }
 
+extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
+{
+	pluginInfo.cbSize = sizeof(PLUGININFO);
+	return (PLUGININFO*)&pluginInfo;
+}
+
 static const MUUID interfaces[] = {MIID_JUSTTABS, MIID_LAST};
 extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 {
diff --git a/justtabs/justtabs.mdsp b/justtabs/justtabs.mdsp
index 02f042c..b373b2a 100644
--- a/justtabs/justtabs.mdsp
+++ b/justtabs/justtabs.mdsp
@@ -93,9 +93,9 @@ extraResourceOptions=
 [Other]
 [History]
 win.cpp,15076
-..\tipper\tipper.cpp,7257
+..\tipper\tipper.cpp,7215
 ..\..\include\m_fontservice.h,0
 options.cpp,1924
 win.h,0
 ..\..\include\m_system.h,5690
-justtabs.cpp,7931
+justtabs.cpp,675
diff --git a/last_contact/LastContact.mdsp b/last_contact/LastContact.mdsp
index 240bd64..a239719 100644
--- a/last_contact/LastContact.mdsp
+++ b/last_contact/LastContact.mdsp
@@ -91,4 +91,4 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-LastContact.cpp,820
+LastContact.cpp,1209
diff --git a/message_notify/MessageNotify.mdsp b/message_notify/MessageNotify.mdsp
index 5b26eff..e1a2758 100644
--- a/message_notify/MessageNotify.mdsp
+++ b/message_notify/MessageNotify.mdsp
@@ -95,7 +95,7 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-common.h,643
-popups.cpp,6075
 options.cpp,5169
-messagenotify.cpp,1088
+popups.cpp,6075
+common.h,643
+messagenotify.cpp,0
diff --git a/metacontacts/MetaContacts.mdsp b/metacontacts/MetaContacts.mdsp
index 363e10f..86165cc 100644
--- a/metacontacts/MetaContacts.mdsp
+++ b/metacontacts/MetaContacts.mdsp
@@ -28,7 +28,7 @@ optimizeLevel=0
 // linker
 libraryPath=
 outputFilename=Debug\MetaContacts.dll
-libraries=gdi32
+libraries=gdi32,comctl32
 extraLinkerOptions=
 ignoreStartupFile=0
 ignoreDefaultLibs=0
@@ -66,7 +66,7 @@ optimizeLevel=2
 // linker
 libraryPath=
 outputFilename=Release\MetaContacts.dll
-libraries=gdi32
+libraries=gdi32,comctl32
 extraLinkerOptions=
 ignoreStartupFile=0
 ignoreDefaultLibs=0
@@ -89,6 +89,7 @@ extraResourceOptions=
 6=meta_options.c
 7=meta_services.c
 8=meta_utils.c
+9=icons.c
 [Header]
 1=m_metacontacts.h
 2=metacontacts.h
@@ -98,11 +99,12 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-meta_main.c,5028
-edit.c,10060
-metacontacts.h,1253
-addto.c,1011
-..\..\include\m_utils.h,12807
-meta_utils.c,30325
+meta_services.c,7878
 meta_api.c,9173
-meta_services.c,7881
+..\..\include\m_utils.h,12800
+addto.c,1011
+metacontacts.h,1021
+edit.c,4303
+meta_main.c,4980
+..\..\..\..\..\..\..\msys\include\commctrl.h,85596
+meta_utils.c,30562
diff --git a/metacontacts/edit.c b/metacontacts/edit.c
index 37cd8a1..2ff323e 100644
--- a/metacontacts/edit.c
+++ b/metacontacts/edit.c
@@ -120,10 +120,11 @@ void FillContactList(HWND hWndDlg, CHANGES *chg) {
 					sprintf(buff,"%d",dbv.wVal);
 					break;
 				case DBVT_DWORD:
-					sprintf(buff,"%d",dbv.dVal);
+					sprintf(buff,"%d",(int)dbv.dVal);
 					break;
 				default:
-					sprintf(buff,"");
+					//sprintf(buff,"");
+					buff[0] = 0;
 			}
 			DBFreeVariant(&dbv);
 
diff --git a/metacontacts/meta_utils.c b/metacontacts/meta_utils.c
index 22d6228..f844f99 100644
--- a/metacontacts/meta_utils.c
+++ b/metacontacts/meta_utils.c
@@ -828,7 +828,7 @@ int Meta_SetHandles(void) {
 					} else {
 						char buff[256];
 						// problem - contact number is greater than meta's number of contacts
-						sprintf(buff, "Subcontact contact number (%d) > meta num contacts (%d) - deleting MetaContact", contact_number, num_contacts);
+						sprintf(buff, "Subcontact contact number (%d) > meta num contacts (%d) - deleting MetaContact", (int)contact_number, (int)num_contacts);
 						MessageBox(0, buff, nick_buffer, MB_OK | MB_ICONERROR);
 						//CallService(MS_DB_CONTACT_DELETE, (WPARMA)hContact, 0);
 						hNextContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 );
diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h
index 39118da..22f77d6 100644
--- a/metacontacts/metacontacts.h
+++ b/metacontacts/metacontacts.h
@@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "resource.h"
 
 #include "m_metacontacts.h"
-#include "m_IcoLib.h"
+#include "../../include/m_icolib.h"
 
 #include "../../include/newpluginapi.h"
 #include "../../include/m_clist.h"
diff --git a/no_history/NoHistory.mdsp b/no_history/NoHistory.mdsp
index f04ba49..c6de567 100644
--- a/no_history/NoHistory.mdsp
+++ b/no_history/NoHistory.mdsp
@@ -95,8 +95,8 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-options.cpp,8160
-common.h,512
+dllmain.cpp,0
 ..\..\protocols\sametime_meanwhile\sametime\sametime.cpp,21223
-private.h,279
-dllmain.cpp,1542
+common.h,512
+options.cpp,8160
+private.h,278
diff --git a/otr/dllmain.cpp b/otr/dllmain.cpp
index 8be1df2..42aa052 100644
--- a/otr/dllmain.cpp
+++ b/otr/dllmain.cpp
@@ -1006,6 +1006,11 @@ int StopOTR(WPARAM wParam, LPARAM lParam) {
 }
 
 ///////////////////////////////////////////////
+/////// Send OTR termination message to all active contexts when going offline
+////////////////////////////////////////////////
+// TODO
+
+///////////////////////////////////////////////
 /////// Plugin init and deinit
 ////////////////////////////////////////////////
 
diff --git a/otr/otr.mdsp b/otr/otr.mdsp
index 2076694..cd54fdb 100644
--- a/otr/otr.mdsp
+++ b/otr/otr.mdsp
@@ -102,4 +102,9 @@ extraResourceOptions=
 utils.cpp,6882
 common.h,2043
 otr_private.h,149
-dllmain.cpp,1741
+libotr\src\context.h,6545
+libotr\src\context.c,1586
+libotr\src\message.h,6083
+libotr\src\proto.h,5014
+libotr\src\userstate.h,0
+dllmain.cpp,35209
diff --git a/ping/ping.cpp b/ping/ping.cpp
index 90ebf36..67a6165 100644
--- a/ping/ping.cpp
+++ b/ping/ping.cpp
@@ -89,6 +89,31 @@ int OnShutdown(WPARAM wParam, LPARAM lParam) {
 }
 
 int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
+	if(ServiceExists(MS_UPDATE_REGISTER)) {
+		// register with updater
+		Update update = {0};
+		char szVersion[16];
+
+		update.cbSize = sizeof(Update);
+
+		update.szComponentName = pluginInfo.shortName;
+		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
+		update.cpbVersion = strlen((char *)update.pbVersion);
+
+		update.szUpdateURL = UPDATER_AUTOREGISTER;
+		
+		// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
+		// before the version that we use to locate it on the page
+		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
+		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
+		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/ping.zip";
+		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_ping.html";
+		update.pbBetaVersionPrefix = (BYTE *)"Ping version ";
+		
+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+
+		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
+	}
 
 	NETLIBUSER nl_user = {0};
 	nl_user.cbSize = sizeof(nl_user);
diff --git a/ping/ping.mdsp b/ping/ping.mdsp
index 7d12ab0..e1b26d3 100644
--- a/ping/ping.mdsp
+++ b/ping/ping.mdsp
@@ -11,7 +11,7 @@ intermediateFilesDirectory=Debug
 outputFilesDirectory=Debug
 compilerPreprocessor=PING_EXPORTS
 extraCompilerOptions=
-compilerIncludeDirectory=
+compilerIncludeDirectory=..\..\include
 noWarning=0
 defaultWarning=0
 allWarning=1
@@ -49,7 +49,7 @@ intermediateFilesDirectory=Release
 outputFilesDirectory=Release
 compilerPreprocessor=PING_EXPORTS
 extraCompilerOptions=
-compilerIncludeDirectory=
+compilerIncludeDirectory=..\..\include
 noWarning=0
 defaultWarning=0
 allWarning=1
@@ -109,11 +109,11 @@ extraResourceOptions=
 1=ping.rc
 [Other]
 [History]
-utils.cpp,7005
-pinglist.cpp,3419
-pinggraph.cpp,7484
+utils.cpp,7003
+pinglist.cpp,3417
+pinggraph.cpp,7482
 collection.h,6339
-options.cpp,21263
+options.cpp,21233
 ..\..\..\..\..\..\..\msys\include\stlport\stl\_list.h,1137
-rawping.cpp,3607
+rawping.cpp,3605
 pingthread.cpp,13438
diff --git a/ping_protocol/pingproto.cpp b/ping_protocol/pingproto.cpp
index eb98e4e..5982c52 100644
--- a/ping_protocol/pingproto.cpp
+++ b/ping_protocol/pingproto.cpp
@@ -320,6 +320,32 @@ int OnShutdown(WPARAM wParam, LPARAM lParam) {
 }
 
 int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
+	if(ServiceExists(MS_UPDATE_REGISTER)) {
+		// register with updater
+		Update update = {0};
+		char szVersion[16];
+
+		update.cbSize = sizeof(Update);
+
+		update.szComponentName = pluginInfo.shortName;
+		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
+		update.cpbVersion = strlen((char *)update.pbVersion);
+
+		update.szUpdateURL = UPDATER_AUTOREGISTER;
+		
+		// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
+		// before the version that we use to locate it on the page
+		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
+		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
+		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/pingproto.zip";
+		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_pingproto.html";
+		update.pbBetaVersionPrefix = (BYTE *)"Ping Protocol version ";
+		
+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+
+		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
+	}
+
 	
 	// register for autoupdates
 	CallService(MS_UPDATE_REGISTERFL, (WPARAM)1826, (LPARAM)&pluginInfo);
diff --git a/ping_protocol/pingproto.mdsp b/ping_protocol/pingproto.mdsp
index 0396fac..6c9da34 100644
--- a/ping_protocol/pingproto.mdsp
+++ b/ping_protocol/pingproto.mdsp
@@ -110,8 +110,9 @@ extraResourceOptions=
 1=pingproto.rc
 [Other]
 [History]
-pinglist.h,604
-pinglist.cpp,0
+pingproto.rc,8074
+pingproto.h,752
 common.h,2379
-pingproto.h,757
-pingproto.rc,8940
+pinglist.cpp,0
+pinglist.h,604
+pingproto.cpp,4039
diff --git a/tipper/tipper.mdsp b/tipper/tipper.mdsp
index 04dea61..db8fb47 100644
--- a/tipper/tipper.mdsp
+++ b/tipper/tipper.mdsp
@@ -104,7 +104,7 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
+popwin.cpp,2562
+tipper.cpp,1269
 message_pump.cpp,4377
-tipper.cpp,1291
 version.h,150
-popwin.cpp,2562
diff --git a/worldtime/WorldTime.cpp b/worldtime/WorldTime.cpp
index e327261..d61eb9c 100644
--- a/worldtime/WorldTime.cpp
+++ b/worldtime/WorldTime.cpp
@@ -58,6 +58,32 @@ void CreatePluginServices() {
 }
 
 static int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
+	if(ServiceExists(MS_UPDATE_REGISTER)) {
+		// register with updater
+		Update update = {0};
+		char szVersion[16];
+
+		update.cbSize = sizeof(Update);
+
+		update.szComponentName = pluginInfo.shortName;
+		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
+		update.cpbVersion = strlen((char *)update.pbVersion);
+
+		update.szUpdateURL = UPDATER_AUTOREGISTER;
+		
+		// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
+		// before the version that we use to locate it on the page
+		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
+		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
+		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/WorldTime.zip";
+		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_worldtime.html";
+		update.pbBetaVersionPrefix = (BYTE *)"World Time version ";
+		
+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+
+		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
+	}
+
 	
 	HWND contact_list_hwnd = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);
 	addmypluginwindow1(contact_list_hwnd);
diff --git a/worldtime_protocol/common.h b/worldtime_protocol/common.h
index cde473e..f1a2b3d 100644
--- a/worldtime_protocol/common.h
+++ b/worldtime_protocol/common.h
@@ -32,6 +32,7 @@
 #include "../../include/m_clist.h"
 #include "../../include/m_clui.h"
 #include "../../include/m_utils.h"
+#include "../../include/m_updater.h"
 
 extern HINSTANCE hInst;
 
diff --git a/worldtime_protocol/worldtimeproto.cpp b/worldtime_protocol/worldtimeproto.cpp
index 9feb943..8301014 100644
--- a/worldtime_protocol/worldtimeproto.cpp
+++ b/worldtime_protocol/worldtimeproto.cpp
@@ -371,6 +371,32 @@ int OnShutdown(WPARAM wParam, LPARAM lParam) {
 }
 
 int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
+	if(ServiceExists(MS_UPDATE_REGISTER)) {
+		// register with updater
+		Update update = {0};
+		char szVersion[16];
+
+		update.cbSize = sizeof(Update);
+
+		update.szComponentName = pluginInfo.shortName;
+		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
+		update.cpbVersion = strlen((char *)update.pbVersion);
+
+		update.szUpdateURL = UPDATER_AUTOREGISTER;
+		
+		// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
+		// before the version that we use to locate it on the page
+		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
+		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
+		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/worldtimeproto.zip";
+		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_worldtimeproto.html";
+		update.pbBetaVersionPrefix = (BYTE *)"World Time Protocol version ";
+		
+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+
+		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
+	}
+
 	
 	// for database editor++ ver 3+
 	if(ServiceExists("DBEditorpp/RegisterSingleModule"))
diff --git a/yapp/YAPP.mdsp b/yapp/YAPP.mdsp
index 371d009..97a9cf2 100644
--- a/yapp/YAPP.mdsp
+++ b/yapp/YAPP.mdsp
@@ -110,15 +110,15 @@ extraResourceOptions=
 1=popups2.rc
 2=version.rc
 [History]
-message_pump.cpp,938
-..\..\include\newpluginapi.h,1183
-..\..\include\m_plugins.h,0
-popups2.cpp,1520
-popups2.rc,830
-resource.h,2162
-version.rc,24
-resource.rc,23
-popwin.cpp,583
-popup_history.cpp,2330
 common.h,2413
+popup_history.cpp,2330
+popwin.cpp,583
+resource.rc,23
+version.rc,24
+resource.h,2162
+popups2.rc,830
+popups2.cpp,1511
+..\..\include\m_plugins.h,0
+..\..\include\newpluginapi.h,1183
+message_pump.cpp,938
 version.h,150
author	sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>	2007-04-25 13:49:06 +0000
committer	sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>	2007-04-25 13:49:06 +0000
commit	a44175dd565f39990ef57719313ef3a88a8d01b6 (patch)
tree	957b9c8c58f21854450780bc2f29b1e0961dafdf
parent	3224f00e30979b51332dac42c8652af0b2c0c748 (diff)