Commit: f7b1312800df1acd912942f80aa3e6fd7698387b - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: f7b1312800df1acd912942f80aa3e6fd7698387b (tree)
• Time: 2009-01-25 18:38:19
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_59_0_774'.

Change Summary

• modified: Editor.pas
• modified: Giko.pas
• modified: Setting.pas
• modified: gikoNavi.res
• modified: readme/gikoSetup.iss
• modified: readme/gikoUSetup.iss
• modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
• modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -1882,61 +1882,31 @@ const
 	VAL_PON		= 'PON=';
 	EXPIRES_MARK = 'expires=';
 var
-	i, pos: Integer;
+//	i: Integer;
 	tmp : string;
 	val : string;
-    curCookies : TStringList;
-    tmpCookieName : string;
 begin
-    // 2008.12.14 –³ðŒƒNƒŠƒA‚µ‚Ä‚Í‚¢‚¯‚È‚¢ by ‚à‚¶‚ã
-    curCookies := TStringList.Create;
-    curCookies.Delimiter := ';';
-    curCookies.DelimitedText := ABoard.Cookie;
 	ABoard.Cookie := '';
-    try
-        while  (AnsiPos(COOKIE_MARK, Rawtext) > 0 ) do begin
-            tmp := Copy(Rawtext, AnsiPos(COOKIE_MARK, Rawtext) + Length(COOKIE_MARK), Length(Rawtext));
-            Delete(Rawtext, 1, AnsiPos('Set-Cookie', Rawtext)+ Length(COOKIE_MARK));
-            //Cookie‚ðØ‚èo‚·
-            val := Trim(GikoSys.GetTokenIndex(tmp, ';', 0));
-            if( AnsiPos(VAL_SPID, val) > 0 ) then begin
-                ABoard.SPID := Copy(val, AnsiPos(VAL_SPID, val) + Length(VAL_SPID), Length(val));
-            end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
-                ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
-            end else begin
-                // Šù‘¶‚ÌCookie‚̏ꍇ‚Í’l‚¾‚¯•t‚¯‘Ö‚¦‚é
-                pos := AnsiPos('=', val);
-                if pos > 0 then begin
-                    tmpCookieName := Copy(val, 0, pos - 1);
-                    for i := 0 to curCookies.Count - 1 do begin
-                        if (curCookies.IndexOfName(tmpCookieName) >= 0) then begin
-                            curCookies.Values[tmpCookieName] := Copy(val, pos + 1, Length(val));
-                            tmpCookieName := '';
-                            break;
-                        end;
-                    end;
-                    if (tmpCookieName <> '') then begin
-                        curCookies.Add(val);
-                    end;
-                end;
-                //tmpCookie := tmpCookie + val + '; ';
-            end;
-            //expires‚ðØ‚èo‚·
-            val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));
-            if( AnsiPos(EXPIRES_MARK, val) > 0) then begin
-                Delete(val, 1, AnsiPos(EXPIRES_MARK, val) + Length(EXPIRES_MARK) - 1);
-                ABoard.Expires := GMTToLocalDateTime(val);
-            end;
-        end;
-        for i := 0 to curCookies.Count - 1 do begin
-            if (curCookies.Strings[i] <> '') then begin
-                ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; ';
-            end;
-        end;
-
-    finally
-        curCookies.Free;
-    end;
+	while  (AnsiPos(COOKIE_MARK, Rawtext) > 0 ) do begin
+		//i := 0;
+		tmp := Copy(Rawtext, AnsiPos(COOKIE_MARK, Rawtext) + Length(COOKIE_MARK), Length(Rawtext));
+		Delete(Rawtext, 1, AnsiPos('Set-Cookie', Rawtext)+ Length(COOKIE_MARK));
+		//Cookie‚ðØ‚èo‚·
+		val := Trim(GikoSys.GetTokenIndex(tmp, ';', 0));
+		if( AnsiPos(VAL_SPID, val) > 0 ) then begin
+			ABoard.SPID := Copy(val, AnsiPos(VAL_SPID, val) + Length(VAL_SPID), Length(val));
+		end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
+			ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
+		end else begin
+			ABoard.Cookie := ABoard.Cookie + val + '; ';
+		end;
+		//expires‚ðØ‚èo‚·
+		val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));
+		if( AnsiPos(EXPIRES_MARK, val) > 0) then begin
+			Delete(val, 1, AnsiPos(EXPIRES_MARK, val) + Length(EXPIRES_MARK) - 1);
+			ABoard.Expires := GMTToLocalDateTime(val);
+		end;
+	end;
 end;
 //! hiddenƒf[ƒ^Žæ“¾
 procedure TEditorForm.GetHiddenParameter(Rawtext: String; ABoard: TBoard);

--- a/Giko.pas
+++ b/Giko.pas
@@ -1560,7 +1560,6 @@ begin
 
 	Application.UnhookMainWindow(Hook);
     //ƒAƒvƒŠƒP[ƒVƒ‡ƒ“I—¹‚Ì‘O‚Ƀ_ƒEƒ“ƒ[ƒhƒXƒŒƒbƒh‚ɐ³íI—¹‚𑣂·
-    FControlThread.DownloadAbort;
     FControlThread.Terminate;
 
     //OnDestory‚¾‚ƍċN“®‚ð‚©‚¯‚½‚Æ‚«‚È‚Ç‚É•Û‘¶‚³‚ê‚È‚¢‚Ì‚ÅOnCloseQuery‚Őݒè•Û‘¶
@@ -1611,11 +1610,23 @@ begin
 			GikoSys.Setting.ResRange := FResRangeMenuSelect;
 	except
 	end;
-    //¡‚Ìwinodw‚̃Xƒ^ƒCƒ‹‚ÅCoolBar‚̈ʒuAƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•Û‘¶
-    SaveCoolBarSettings;
-    GikoSys.Setting.WriteWindowSettingFile;
-    // –¼‘O‚ƃ[ƒ‹‚Ì•Û‘¶‚Ȃ̂ŃGƒfƒBƒ^‚ª•Â‚¶‚½Œã‚È‚ç‚¢‚Â‚Å‚à‚¢‚¢
-    GikoSys.Setting.WriteNameMailSettingFile;
+
+    //ˆêŽž“I‚ɒʏíƒXƒ^ƒCƒ‹‚É–ß‚µ‚ÄCoolBar‚̈ʒuAƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•Û‘¶
+        //¦’ˆÓFOnDestroyAOnCloseQuery‚ÅŽg‚¤‚±‚Æ‚µ‚©l—¶‚³‚ê‚Ä‚¢‚È‚¢
+  	if WindowState <> wsNormal then begin
+   		WindowState := wsNormal;
+    end;
+
+    try
+    	SaveCoolBarSettings;
+    except
+    end;
+
+	try
+		GikoSys.Setting.WriteWindowSettingFile;
+		GikoSys.Setting.WriteNameMailSettingFile;
+	except
+	end;
 
 	//“ü—̓AƒVƒXƒg‹@\‚̐ݒè‚Ì•Û‘¶
 	InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName);
@@ -1648,12 +1659,6 @@ begin
 		RoundList.SaveRoundFile;
 	except
 	end;
-
-    // ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ
-    if (FIconData.uID <> 0) then begin
-        Shell_NotifyIcon(NIM_DELETE, @FIconData);
-    end;
-
 end;
 
 procedure TGikoForm.FormDestroy(Sender: TObject);
@@ -1661,16 +1666,9 @@ var
 	i				: Integer;
 	tmpBool	: Boolean;
 begin
-    //ˆêŽž“I‚ɒʏíƒXƒ^ƒCƒ‹‚É–ß‚µ‚ÄCoolBar‚̈ʒuAƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•Û‘¶
-    //¦’ˆÓFOnDestroy‚ÅŽg‚¤‚±‚Æ‚µ‚©l—¶‚³‚ê‚Ä‚¢‚È‚¢
-    //        ‘¼‚Å‚â‚é‚ƍĕ`‰æ‚ª”­¶‚·‚é
-  	if WindowState <> wsNormal then begin
-   		WindowState := wsNormal;
-        try
-        	SaveCoolBarSettings;
-		    GikoSys.Setting.WriteWindowSettingFile;
-    	except
-	    end;
+    // ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ
+    if (FIconData.uID <> 0) then begin
+        Shell_NotifyIcon(NIM_DELETE, @FIconData);
     end;
 
 	// ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[ŠJ•ú
@@ -1755,7 +1753,7 @@ begin
 
 	try
         try
-            //FControlThread.DownloadAbort;
+            FControlThread.DownloadAbort;
             FControlThread.Terminate;
             FControlThread.WaitFor;
         except

--- a/Setting.pas
+++ b/Setting.pas
@@ -1333,15 +1333,6 @@ begin
 
         FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
         FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
-
-        // ƒMƒRƒiƒrXV‚Å—˜—p‚µ‚½ƒCƒ“ƒXƒg[ƒ‰‚̍폜
-        s := ini.ReadString('Update', 'Remove0', '');
-        if (FileExists(s)) then begin
-            SysUtils.DeleteFile(s);
-            // íœ‚ÉŽ¸”s‚µ‚Ä‚à–³Ž‹‚·‚é
-            ini.DeleteKey('Update', 'Remove0');
-        end;
-
 		ini.UpdateFile;
 	finally
 		ini.Free;

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -56,9 +56,6 @@ Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
 
 [Code]
 procedure CurStepChanged(CurStep: TSetupStep);
-var
-  path :String;
-  srcpath: String;
 begin
   case CurStep of
     ssInstall:
@@ -78,15 +75,6 @@ begin
               end;
           end;
       end;
-    ssPostInstall:
-      begin
-        path := ExpandConstant('{app}') + '\gikoNavi.ini';
-        srcpath := ExpandConstant('{srcexe}');
-        if (FileExists(path)) then
-        begin
-          SetIniString('Update', 'Remove0', srcpath, path);
-        end;
-      end;
   end;
 
 end;

--- a/readme/gikoUSetup.iss
+++ b/readme/gikoUSetup.iss
@@ -18,8 +18,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.59.0.778
-OutputBaseFilename=gikoNavi_b59_778_usetup
+VersionInfoVersion=1.59.0.774
+OutputBaseFilename=gikoNavi_b59_774_usetup
 CreateUninstallRegKey=no
 
 [Tasks]
@@ -103,9 +103,6 @@ begin
 end;
 
 procedure CurStepChanged(CurStep: TSetupStep);
-var
-  path :String;
-  srcpath: String;
 begin
   case CurStep of
     ssInstall:
@@ -125,15 +122,6 @@ begin
               end;
           end;
       end;
-      ssPostInstall:
-      begin
-        path := ExpandConstant('{app}') + '\gikoNavi.ini';
-        srcpath := ExpandConstant('{srcexe}');
-        if (FileExists(path)) then
-        begin
-          SetIniString('Update', 'Remove0', srcpath, path);
-        end;
-      end;
   end;
 
 end;

--- a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
@@ -2,7 +2,7 @@ library ShitarabaJBBSPlugIn;
 
 {
 	ShitarabaJBBSPlugIn
-	$Id: ShitarabaJBBSPlugIn.dpr,v 1.46 2008/12/20 04:02:40 h677 Exp $
+	$Id: ShitarabaJBBSPlugIn.dpr,v 1.45 2008/08/03 02:45:48 h677 Exp $
 }
 
 uses
@@ -83,7 +83,7 @@ const
 	MAJOR_VERSION			= 1;
 	MINOR_VERSION			= 1;
 	RELEASE_VERSION		= 'alpha';
-	REVISION_VERSION	= 18;
+	REVISION_VERSION	= 17;
 
 	SYNCRONIZE_MENU_CAPTION	= '‚µ‚½‚ç‚ÎJBBS”XV';
 
@@ -880,10 +880,11 @@ begin
 						tmpLine := AnsiLowerCase(tmpHTML[i]);
 						tS := AnsiPos('<a href="mailto:', tmpLine);
 						if tS > 0 then begin //ƒƒ‹—“ƒAƒŠ
- 							tE := AnsiPos('">', tmpLine);
- 							tmpDatToken[2] := Copy(tmpHTML[i], tS + 16, tE - (tS + 16));
- 							tmpHTML[i] := Copy(tmpHTML[i], tE + 5, Length(tmpHTML[i]));
- 							tmpHTML[i] := CustomStringReplace(tmpHTML[i], '</a>', '', true);						end else begin	//ƒƒ‹—“–³‚µ
+							tE := AnsiPos('">', tmpLine);
+							tmpDatToken[2] := Copy(tmpHTML[i], tS + 16, tE - (tS + 16));
+							tmpHTML[i] := Copy(tmpHTML[i], tE + 5, Length(tmpHTML[i]));
+							tmpHTML[i] := CustomStringReplace(tmpHTML[i], '</a>', '', true);
+						end else begin	//ƒƒ‹—“–³‚µ
 							tmpDatToken[2] := '';
 						end;
 						//====================//
@@ -896,16 +897,7 @@ begin
 							tmpDatToken[1] := CustomStringReplace(tmpDatToken[1], '</b>', '', true);
 							tmpHTML[i] := Copy(tmpHTML[i], tE + 8, Length(tmpHTML[i]));
 						end else begin
-                            // “Še“ú‚Ì‚È‚¢ƒpƒ^[ƒ“‚ð‹~‚¤
-                            tE := AnsiPos('F', tmpLine);
-                            if tE > 0 then begin
-							    tmpDatToken[1] := Trim(Copy(tmpHTML[i], 1, tE - 1 ));
-    							tmpDatToken[1] := CustomStringReplace(tmpDatToken[1], '<b>', '', true);
-	    						tmpDatToken[1] := CustomStringReplace(tmpDatToken[1], '</b>', '', true);
-		    					tmpHTML[i] := Copy(tmpHTML[i], tE + 2, Length(tmpHTML[i]));
-			    			end else begin
-    							tmpDatToken[1] := '';
-                            end;
+							tmpDatToken[1] := '';
 						end;
 						//====================//
 						//==“ú•tŽž‚̎擾==//

Binary files a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res and b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res differ