OSDN > Find Software > Multimedia > Sound/Audio > PeerCast IM > SCM > git > PeerCastIM > Commit

PeerCast IM
Fork

PeerCastIM: Commit

VP25-3

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

		@@ -757,15 +757,28 @@ void APICALL MyPeercastApp::channelUpdate(ChanInfo *info)
757	757	//-----------------------------
758	758	void APICALL MyPeercastApp::notifyMessage(ServMgr::NOTIFY_TYPE type, const char *msg)
759	759	{
	760	+ static bool shownUpgradeAlert=false;
	761	+
760	762	currNotify = type;
761	763
762		- if (type == ServMgr::NT_UPGRADE)
	764	+ trayIcon.uFlags = 0;
	765	+
	766	+ if (!shownUpgradeAlert)
763	767	{
764	768	trayIcon.uFlags = NIF_ICON;
765		- trayIcon.hIcon = icon2;
766		- }else{
767		- trayIcon.uFlags = NIF_ICON;
768		- trayIcon.hIcon = icon1;
	769	+
	770	+ if (type == ServMgr::NT_UPGRADE)
	771	+ {
	772	+ shownUpgradeAlert = true;
	773	+ trayIcon.hIcon = icon2;
	774	+ }else
	775	+ {
	776	+ trayIcon.hIcon = icon1;
	777	+ }
	778	+ }else
	779	+ {
	780	+ if (type == ServMgr::NT_UPGRADE)
	781	+ return;
769	782	}
770	783
771	784	const char *title="";

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

		@@ -125,7 +125,7 @@
125	125	UseOfMFC="0"
126	126	ATLMinimizesCRunTimeLibraryUsage="false"
127	127	CharacterSet="2"
128		- WholeProgramOptimization="4"
	128	+ WholeProgramOptimization="1"
129	129	>
130	130	<Tool
131	131	Name="VCPreBuildEventTool"

--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

		@@ -905,7 +905,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
905	905	bool firewalled = false;
906	906	unsigned int numRelays = 0;
907	907	int vp_ver = 0;
908		- char ver_ex_prefix[2] = {' ',' '};
	908	+ char ver_ex_prefix[2] = {' ', ' '};
909	909	int ver_ex_number = 0;
910	910	// 直下ホスト情報チェック
911	911	unsigned int totalRelays = 0;

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

		@@ -757,15 +757,28 @@ void APICALL MyPeercastApp::channelUpdate(ChanInfo *info)
757	757	//-----------------------------
758	758	void APICALL MyPeercastApp::notifyMessage(ServMgr::NOTIFY_TYPE type, const char *msg)
759	759	{
	760	+ static bool shownUpgradeAlert=false;
	761	+
760	762	currNotify = type;
761	763
762		- if (type == ServMgr::NT_UPGRADE)
	764	+ trayIcon.uFlags = 0;
	765	+
	766	+ if (!shownUpgradeAlert)
763	767	{
764	768	trayIcon.uFlags = NIF_ICON;
765		- trayIcon.hIcon = icon2;
766		- }else{
767		- trayIcon.uFlags = NIF_ICON;
768		- trayIcon.hIcon = icon1;
	769	+
	770	+ if (type == ServMgr::NT_UPGRADE)
	771	+ {
	772	+ shownUpgradeAlert = true;
	773	+ trayIcon.hIcon = icon2;
	774	+ }else
	775	+ {
	776	+ trayIcon.hIcon = icon1;
	777	+ }
	778	+ }else
	779	+ {
	780	+ if (type == ServMgr::NT_UPGRADE)
	781	+ return;
769	782	}
770	783
771	784	const char *title="";

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

		@@ -125,7 +125,7 @@
125	125	UseOfMFC="0"
126	126	ATLMinimizesCRunTimeLibraryUsage="false"
127	127	CharacterSet="2"
128		- WholeProgramOptimization="4"
	128	+ WholeProgramOptimization="1"
129	129	>
130	130	<Tool
131	131	Name="VCPreBuildEventTool"

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

		@@ -905,7 +905,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
905	905	bool firewalled = false;
906	906	unsigned int numRelays = 0;
907	907	int vp_ver = 0;
908		- char ver_ex_prefix[2] = {' ',' '};
	908	+ char ver_ex_prefix[2] = {' ', ' '};
909	909	int ver_ex_number = 0;
910	910	// 直下ホスト情報チェック
911	911	unsigned int totalRelays = 0;