code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@16204 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 140 insertions, 191 deletions

diff --git a/plugins/StatusPlugins/StartupStatus/main.cpp b/plugins/StatusPlugins/StartupStatus/main.cpp
index 690dc1e39b..bb5ceaf515 100644
--- a/plugins/StatusPlugins/StartupStatus/main.cpp
+++ b/plugins/StatusPlugins/StartupStatus/main.cpp
@@ -1,21 +1,22 @@
 /*

-    StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

-    Copyright 2003-2006 P. Boon

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

+	Copyright 2003-2006 P. Boon

+

+	This program is free software; you can redistribute it and/or modify

+	it under the terms of the GNU General Public License as published by

+	the Free Software Foundation; either version 2 of the License, or

+	(at your option) any later version.

+

+	This program is distributed in the hope that it will be useful,

+	but WITHOUT ANY WARRANTY; without even the implied warranty of

+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+	GNU General Public License for more details.

+

+	You should have received a copy of the GNU General Public License

+	along with this program; if not, write to the Free Software

+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

+

 #include "../commonstatus.h"

 #include "startupstatus.h"

 

diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index eb9573b0ac..33c3c126b4 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -1,20 +1,20 @@
 /*

-    StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

-    Copyright 2003-2006 P. Boon

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

+	Copyright 2003-2006 P. Boon

+

+	This program is free software; you can redistribute it and/or modify

+	it under the terms of the GNU General Public License as published by

+	the Free Software Foundation; either version 2 of the License, or

+	(at your option) any later version.

+

+	This program is distributed in the hope that it will be useful,

+	but WITHOUT ANY WARRANTY; without even the implied warranty of

+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+	GNU General Public License for more details.

+

+	You should have received a copy of the GNU General Public License

+	along with this program; if not, write to the Free Software

+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 

 #include "../commonstatus.h"

diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/plugins/StatusPlugins/StartupStatus/profiles.cpp
index b3310eabe9..0eeb6d5225 100644
--- a/plugins/StatusPlugins/StartupStatus/profiles.cpp
+++ b/plugins/StatusPlugins/StartupStatus/profiles.cpp
@@ -1,21 +1,22 @@
 /*
-    StartupStatus Plugin for Miranda-IM (www.miranda-im.org)
-    Copyright 2003-2006 P. Boon
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	StartupStatus Plugin for Miranda-IM (www.miranda-im.org)
+	Copyright 2003-2006 P. Boon
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
 #include "../commonstatus.h"
 #include "startupstatus.h"
 #include "../resource.h"
@@ -50,94 +51,38 @@ static int ttbButtonCount = 0;
 
 HANDLE hTTBModuleLoadedHook;
 
-// these are some lame functions, if you have a better solution, mail me. :s
-static INT_PTR profileService0(WPARAM, LPARAM)
-{
-	LoadAndSetProfile((WPARAM)menuprofiles[0], 0);
-	return 0;
-}
-
-static INT_PTR profileService1(WPARAM, LPARAM)
-{
-	LoadAndSetProfile((WPARAM)menuprofiles[1], 0);
-	return 0;
-}
-
-static INT_PTR profileService2(WPARAM, LPARAM)
-{
-	LoadAndSetProfile((WPARAM)menuprofiles[2], 0);
-	return 0;
-}
-
-static INT_PTR profileService3(WPARAM, LPARAM)
-{
-	LoadAndSetProfile((WPARAM)menuprofiles[3], 0);
-	return 0;
-}
-
-static INT_PTR profileService4(WPARAM, LPARAM)
-{
-	LoadAndSetProfile((WPARAM)menuprofiles[4], 0);
-	return 0;
-}
-
-static INT_PTR profileService5(WPARAM, LPARAM)
+static INT_PTR profileService(WPARAM, LPARAM, LPARAM param)
 {
-	LoadAndSetProfile((WPARAM)menuprofiles[5], 0);
+	LoadAndSetProfile((WPARAM)menuprofiles[param], 0);
 	return 0;
 }
 
 static int CreateMainMenuItems(WPARAM, LPARAM)
 {
-	char servicename[128];
-	int i, count;
-
 	CMenuItem mi;
 	mi.position = 2000100000;
 	mi.flags = CMIF_TCHAR;
 	mcount = 0;
-	count = GetProfileCount(0, 0);
-	for (i = 0; i < count; i++) {
+	int count = GetProfileCount(0, 0);
+	for (int i = 0; i < count && mcount < MAX_MMITEMS; i++) {
 		TCHAR profilename[128];
 		if (!db_get_b(NULL, MODULENAME, OptName(i, SETTING_CREATEMMITEM), 0) || GetProfileName(i, (LPARAM)profilename))
 			continue;
 
-		if (db_get_b(NULL, MODULENAME, OptName(i, SETTING_INSUBMENU), 1)) {
+		if (db_get_b(NULL, MODULENAME, OptName(i, SETTING_INSUBMENU), 1) && !mi.root) {
 			mi.root = Menu_CreateRoot(MO_STATUS, LPGENT("Status profiles"), 2000100000);
-			Menu_ConfigureItem(mi.root, MCI_OPT_UID, "1AB30D51-BABA-4B27-9288-1A12278BAD8D");

+			Menu_ConfigureItem(mi.root, MCI_OPT_UID, "1AB30D51-BABA-4B27-9288-1A12278BAD8D");
 		}
 
+		char servicename[128];
+		mir_snprintf(servicename, "%s%d", MS_SS_MENUSETPROFILEPREFIX, mcount);
+		hProfileServices[mcount] = CreateServiceFunctionParam(servicename, profileService, mcount);
+
 		mi.name.t = profilename;
 		mi.position = 2000100000 + mcount;
-		mir_snprintf(servicename, "%s%d", MS_SS_MENUSETPROFILEPREFIX, mcount);
-		switch(mcount) {
-		case 0:
-			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService0);
-			break;
-		case 1:
-			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService1);
-			break;
-		case 2:
-			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService2);
-			break;
-		case 3:
-			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService3);
-			break;
-		case 4:
-			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService4);
-			break;
-		case 5:
-			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService5);
-			break;
-		default:
-			MessageBox(NULL, TranslateT("There is a maximum of 6 menu items"), TranslateT("StartupStatus"), MB_OK);
-			return 0;
-		}
 		mi.pszService = servicename;
-		if (Menu_AddStatusMenuItem(&mi)) {
-			menuprofiles[mcount] = i;
-			mcount += 1;
-		}
+		if (Menu_AddStatusMenuItem(&mi))
+			menuprofiles[mcount++] = i;
 	}
 
 	return 0;
@@ -157,17 +102,17 @@ INT_PTR GetProfileName(WPARAM wParam, LPARAM lParam)
 
 	TCHAR* buf = (TCHAR*)lParam;
 	if (count == 0) {
-		_tcsncpy(buf, TranslateT("default"), 128-1);
+		_tcsncpy(buf, TranslateT("default"), 128 - 1);
 		return 0;
 	}
 
 	DBVARIANT dbv;
 	char setting[80];
 	mir_snprintf(setting, "%d_%s", profile, SETTING_PROFILENAME);
-	if ( db_get_ts(NULL, MODULENAME, setting, &dbv))
+	if (db_get_ts(NULL, MODULENAME, setting, &dbv))
 		return -1;
 
-	_tcsncpy(buf, dbv.ptszVal, 128-1); buf[127] = 0;
+	_tcsncpy(buf, dbv.ptszVal, 128 - 1); buf[127] = 0;
 	db_free(&dbv);
 	return 0;
 }
@@ -190,11 +135,11 @@ TCHAR *GetStatusMessage(int profile, char *szProto)
 	char dbSetting[80];
 	DBVARIANT dbv;
 
-	for ( int i=0; i < pceCount; i++ ) {
-		if ( (pce[i].profile == profile) && (!mir_strcmp(pce[i].szProto, szProto))) {
+	for (int i = 0; i < pceCount; i++) {
+		if ((pce[i].profile == profile) && (!mir_strcmp(pce[i].szProto, szProto))) {
 			mir_snprintf(dbSetting, "%d_%s_%s", profile, szProto, SETTING_PROFILE_STSMSG);
 			if (!db_get_ts(NULL, MODULENAME, dbSetting, &dbv)) { // reload from db
-				pce[i].msg = ( TCHAR* )realloc(pce[i].msg, sizeof(TCHAR)*(mir_tstrlen(dbv.ptszVal)+1));
+				pce[i].msg = (TCHAR*)realloc(pce[i].msg, sizeof(TCHAR)*(mir_tstrlen(dbv.ptszVal) + 1));
 				if (pce[i].msg != NULL) {
 					mir_tstrcpy(pce[i].msg, dbv.ptszVal);
 				}
@@ -209,7 +154,7 @@ TCHAR *GetStatusMessage(int profile, char *szProto)
 			return pce[i].msg;
 		}
 	}
-	pce = (PROFILECE*)realloc(pce, (pceCount+1)*sizeof(PROFILECE));
+	pce = (PROFILECE*)realloc(pce, (pceCount + 1)*sizeof(PROFILECE));
 	if (pce == NULL)
 		return NULL;
 
@@ -223,35 +168,35 @@ TCHAR *GetStatusMessage(int profile, char *szProto)
 	}
 	pceCount++;
 
-	return pce[pceCount-1].msg;
+	return pce[pceCount - 1].msg;
 }
 
-int GetProfile( int profile, TSettingsList& arSettings )
+int GetProfile(int profile, TSettingsList& arSettings)
 {
-	if ( profile < 0 ) // get default profile
+	if (profile < 0) // get default profile
 		profile = db_get_w(NULL, MODULENAME, SETTING_DEFAULTPROFILE, 0);
 
 	int count = db_get_w(NULL, MODULENAME, SETTING_PROFILECOUNT, 0);
-	if ( profile >= count && count > 0 )
+	if (profile >= count && count > 0)
 		return -1;
 
 	arSettings.destroy();
 
 	// if count == 0, continue so the default profile will be returned
 	PROTOACCOUNT** protos;
-	Proto_EnumAccounts( &count, &protos );
+	Proto_EnumAccounts(&count, &protos);
 
-	for ( int i=0; i < count; i++ )
-		if ( IsSuitableProto( protos[i] ))
-			arSettings.insert( new TSSSetting( profile, protos[i] ));
+	for (int i = 0; i < count; i++)
+		if (IsSuitableProto(protos[i]))
+			arSettings.insert(new TSSSetting(profile, protos[i]));
 
-	return ( arSettings.getCount() == 0 ) ? -1 : 0;
+	return (arSettings.getCount() == 0) ? -1 : 0;
 }
 
-static void CALLBACK releaseTtbTimerFunction(HWND hwnd,UINT message, UINT_PTR idEvent,DWORD dwTime)
+static void CALLBACK releaseTtbTimerFunction(HWND hwnd, UINT message, UINT_PTR idEvent, DWORD dwTime)
 {
 	KillTimer(NULL, releaseTtbTimerId);
-	for(int i=0; i < ttbButtonCount; i++)
+	for (int i = 0; i < ttbButtonCount; i++)
 		CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)ttbButtons[i], 0);
 }
 
@@ -261,14 +206,14 @@ INT_PTR LoadAndSetProfile(WPARAM wParam, LPARAM lParam)
 	int profileCount = GetProfileCount(0, 0);
 	int profile = (int)wParam;
 
-	TSettingsList profileSettings( 10, CompareSettings );
-	if ( !GetProfile( profile, profileSettings)) {
-		profile = (profile >= 0)?profile:db_get_w(NULL, MODULENAME, SETTING_DEFAULTPROFILE, 0);
+	TSettingsList profileSettings(10, CompareSettings);
+	if (!GetProfile(profile, profileSettings)) {
+		profile = (profile >= 0) ? profile : db_get_w(NULL, MODULENAME, SETTING_DEFAULTPROFILE, 0);
 
 		char setting[64];
 		mir_snprintf(setting, "%d_%s", profile, SETTING_SHOWCONFIRMDIALOG);
 		if (!db_get_b(NULL, MODULENAME, setting, 0))
-			CallService(MS_CS_SETSTATUSEX,(WPARAM)&profileSettings, 0);
+			CallService(MS_CS_SETSTATUSEX, (WPARAM)&profileSettings, 0);
 		else
 			CallService(MS_CS_SHOWCONFIRMDLGEX, (WPARAM)&profileSettings, (LPARAM)db_get_dw(NULL, MODULENAME, SETTING_DLGTIMEOUT, 5));
 	}
@@ -284,21 +229,21 @@ static UINT GetFsModifiers(WORD wHotKey)
 {
 	UINT fsm = 0;
 	if (HIBYTE(wHotKey)&HOTKEYF_ALT)
-        fsm |= MOD_ALT;
+		fsm |= MOD_ALT;
 	if (HIBYTE(wHotKey)&HOTKEYF_CONTROL)
-        fsm |= MOD_CONTROL;
-    if (HIBYTE(wHotKey)&HOTKEYF_SHIFT)
-        fsm |= MOD_SHIFT;
-    if (HIBYTE(wHotKey)&HOTKEYF_EXT)
-        fsm |= MOD_WIN;
+		fsm |= MOD_CONTROL;
+	if (HIBYTE(wHotKey)&HOTKEYF_SHIFT)
+		fsm |= MOD_SHIFT;
+	if (HIBYTE(wHotKey)&HOTKEYF_EXT)
+		fsm |= MOD_WIN;
 
 	return fsm;
 }
 
 static DWORD CALLBACK MessageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	if ( msg == WM_HOTKEY ) {
-		for (int i=0; i < hkiCount; i++ )
+	if (msg == WM_HOTKEY) {
+		for (int i = 0; i < hkiCount; i++)
 			if ((int)hkInfo[i].id == wParam)
 				LoadAndSetProfile((WPARAM)hkInfo[i].profile, 0);
 	}
@@ -309,7 +254,7 @@ static DWORD CALLBACK MessageWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 static int UnregisterHotKeys()
 {
 	if (hkInfo != NULL) {
-		for (int i = 0; i < hkiCount; i ++) {
+		for (int i = 0; i < hkiCount; i++) {
 			UnregisterHotKey(hMessageWindow, (int)hkInfo[i].id);
 			GlobalDeleteAtom(hkInfo[i].id);
 		}
@@ -331,12 +276,12 @@ static int RegisterHotKeys()
 	SetWindowLongPtr(hMessageWindow, GWLP_WNDPROC, (LONG_PTR)MessageWndProc);
 
 	int count = GetProfileCount(0, 0);
-	for ( int i=0; i < count; i++ ) {
+	for (int i = 0; i < count; i++) {
 		if (!db_get_b(NULL, MODULENAME, OptName(i, SETTING_REGHOTKEY), 0))
 			continue;
 
 		WORD wHotKey = db_get_w(NULL, MODULENAME, OptName(i, SETTING_HOTKEY), 0);
-		hkInfo = ( HKINFO* )realloc(hkInfo, (hkiCount+1)*sizeof(HKINFO));
+		hkInfo = (HKINFO*)realloc(hkInfo, (hkiCount + 1)*sizeof(HKINFO));
 		if (hkInfo == NULL)
 			return -1;
 
@@ -347,8 +292,8 @@ static int RegisterHotKeys()
 			continue;
 
 		hkInfo[hkiCount].profile = i;
-		hkiCount ++;
-		RegisterHotKey(hMessageWindow, (int)hkInfo[hkiCount-1].id, GetFsModifiers(wHotKey), LOBYTE(wHotKey));
+		hkiCount++;
+		RegisterHotKey(hMessageWindow, (int)hkInfo[hkiCount - 1].id, GetFsModifiers(wHotKey), LOBYTE(wHotKey));
 	}
 
 	if (hkiCount == 0)
@@ -361,7 +306,7 @@ int LoadMainOptions()
 {
 	if (hTTBModuleLoadedHook) {
 		RemoveTopToolbarButtons();
-		CreateTopToolbarButtons(0,0);
+		CreateTopToolbarButtons(0, 0);
 	}
 
 	UnregisterHotKeys();
@@ -379,22 +324,22 @@ int InitProfileModule()
 {
 	hTTBModuleLoadedHook = HookEvent(ME_TTB_MODULELOADED, CreateTopToolbarButtons);
 
-	HookEvent( ME_CLIST_PREBUILDSTATUSMENU,  CreateMainMenuItems);
+	HookEvent(ME_CLIST_PREBUILDSTATUSMENU, CreateMainMenuItems);
 
-	CreateMainMenuItems(0,0);
+	CreateMainMenuItems(0, 0);
 	RegisterHotKeys();
 	return 0;
 }
 
 int DeinitProfilesModule()
 {
-	for ( int i=0; i < mcount; i++ )
+	for (int i = 0; i < mcount; i++)
 		DestroyServiceFunction(hProfileServices[i]);
 
-	if ( pce ) {
-		for ( int i=0; i < pceCount; i++ )
-			free( pce[i].szProto );
-		free( pce );
+	if (pce) {
+		for (int i = 0; i < pceCount; i++)
+			free(pce[i].szProto);
+		free(pce);
 	}
 
 	UnregisterHotKeys();
diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
index 9da5d6ccf5..2efe6d8466 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
@@ -1,21 +1,22 @@
 /*

-    StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

-    Copyright 2003-2006 P. Boon

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

+	Copyright 2003-2006 P. Boon

+

+	This program is free software; you can redistribute it and/or modify

+	it under the terms of the GNU General Public License as published by

+	the Free Software Foundation; either version 2 of the License, or

+	(at your option) any later version.

+

+	This program is distributed in the hope that it will be useful,

+	but WITHOUT ANY WARRANTY; without even the implied warranty of

+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+	GNU General Public License for more details.

+

+	You should have received a copy of the GNU General Public License

+	along with this program; if not, write to the Free Software

+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

+

 #include "../commonstatus.h"

 #include "startupstatus.h"

 

diff --git a/plugins/StatusPlugins/StartupStatus/toolbars.cpp b/plugins/StatusPlugins/StartupStatus/toolbars.cpp
index 4786230987..b2e2057da7 100644
--- a/plugins/StatusPlugins/StartupStatus/toolbars.cpp
+++ b/plugins/StatusPlugins/StartupStatus/toolbars.cpp
@@ -1,21 +1,22 @@
 /*

-    StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

-    Copyright 2003-2006 P. Boon

+	StartupStatus Plugin for Miranda-IM (www.miranda-im.org)

+	Copyright 2003-2006 P. Boon

 

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

+	This program is free software; you can redistribute it and/or modify

+	it under the terms of the GNU General Public License as published by

+	the Free Software Foundation; either version 2 of the License, or

+	(at your option) any later version.

 

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

+	This program is distributed in the hope that it will be useful,

+	but WITHOUT ANY WARRANTY; without even the implied warranty of

+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+	GNU General Public License for more details.

 

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	You should have received a copy of the GNU General Public License

+	along with this program; if not, write to the Free Software

+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

+

 #include "../commonstatus.h"

 #include "startupstatus.h"

 #include "../resource.h"

diff --git a/plugins/StatusPlugins/StartupStatus/version.h b/plugins/StatusPlugins/StartupStatus/version.h
index 52512c305f..1760bbdcfb 100644
--- a/plugins/StatusPlugins/StartupStatus/version.h
+++ b/plugins/StatusPlugins/StartupStatus/version.h
@@ -8,7 +8,7 @@
 #define __MAJOR_VERSION            0

 #define __MINOR_VERSION            8

 #define __RELEASE_NUM              0

-#define __BUILD_NUM               47

+#define __BUILD_NUM               48

 

 // other stuff for Version resource

 #include <stdver.h>

diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index cbf299a072..9221754198 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -17,7 +17,8 @@
 	You should have received a copy of the GNU General Public License

 	along with this program; if not, write to the Free Software

 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-	*/

+*/

+

 #include "commonstatus.h"

 

 // handles for hooks and other Miranda thingies

diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp
index e652dc004e..1b1f5b03fc 100644
--- a/plugins/StatusPlugins/confirmdialog.cpp
+++ b/plugins/StatusPlugins/confirmdialog.cpp
@@ -17,7 +17,7 @@
 	You should have received a copy of the GNU General Public License

 	along with this program; if not, write to the Free Software

 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-	*/

+*/

 

 #include "commonstatus.h"

 #include "resource.h"