• R/O
  • HTTP
  • SSH
  • HTTPS

PeerCastIM: Commit


Commit MetaInfo

Revisão888709c9080194410fd8bc21a474f94c17fa9d41 (tree)
Hora2007-12-20 02:12:57
Autoreru <eru01@user...>
Commitereru

Mensagem de Log

VP25-3

Mudança Sumário

Diff

--- 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)
757757 //-----------------------------
758758 void APICALL MyPeercastApp::notifyMessage(ServMgr::NOTIFY_TYPE type, const char *msg)
759759 {
760+ static bool shownUpgradeAlert=false;
761+
760762 currNotify = type;
761763
762- if (type == ServMgr::NT_UPGRADE)
764+ trayIcon.uFlags = 0;
765+
766+ if (!shownUpgradeAlert)
763767 {
764768 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;
769782 }
770783
771784 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 @@
125125 UseOfMFC="0"
126126 ATLMinimizesCRunTimeLibraryUsage="false"
127127 CharacterSet="2"
128- WholeProgramOptimization="4"
128+ WholeProgramOptimization="1"
129129 >
130130 <Tool
131131 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){
905905 bool firewalled = false;
906906 unsigned int numRelays = 0;
907907 int vp_ver = 0;
908- char ver_ex_prefix[2] = {' ',' '};
908+ char ver_ex_prefix[2] = {' ', ' '};
909909 int ver_ex_number = 0;
910910 // 直下ホスト情報チェック
911911 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)
757757 //-----------------------------
758758 void APICALL MyPeercastApp::notifyMessage(ServMgr::NOTIFY_TYPE type, const char *msg)
759759 {
760+ static bool shownUpgradeAlert=false;
761+
760762 currNotify = type;
761763
762- if (type == ServMgr::NT_UPGRADE)
764+ trayIcon.uFlags = 0;
765+
766+ if (!shownUpgradeAlert)
763767 {
764768 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;
769782 }
770783
771784 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 @@
125125 UseOfMFC="0"
126126 ATLMinimizesCRunTimeLibraryUsage="false"
127127 CharacterSet="2"
128- WholeProgramOptimization="4"
128+ WholeProgramOptimization="1"
129129 >
130130 <Tool
131131 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){
905905 bool firewalled = false;
906906 unsigned int numRelays = 0;
907907 int vp_ver = 0;
908- char ver_ex_prefix[2] = {' ',' '};
908+ char ver_ex_prefix[2] = {' ', ' '};
909909 int ver_ex_number = 0;
910910 // 直下ホスト情報チェック
911911 unsigned int totalRelays = 0;
Show on old repository browser