X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcvs.cpp;h=c1565caf8ae8ec79503279d4bad94c366e523d1a;hb=cadb5ae616105e83ba0c7603fef81a02618cda98;hp=67dccca806e206853d8f520aad826768c694fcf5;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/cvs.cpp b/synfig-studio/trunk/src/synfigapp/cvs.cpp
index 67dccca..c1565ca 100644
--- a/synfig-studio/trunk/src/synfigapp/cvs.cpp
+++ b/synfig-studio/trunk/src/synfigapp/cvs.cpp
@@ -5,16 +5,17 @@
 **	$Id: cvs.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package 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.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package 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.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -202,11 +203,11 @@ CVSInfo::in_repository()const
 bool
 CVSInfo::is_modified()const
 {
+	if(!in_sandbox() || !in_repository())
+		return false;
 #ifdef _DEBUG
 	synfig::info("%d-%d=%d",get_current_timestamp(),get_original_timestamp(),get_current_timestamp()-get_original_timestamp());
 #endif
-	if(!in_sandbox() || !in_repository())
-		return false;
 	return get_current_timestamp()!=get_original_timestamp() && abs(get_current_timestamp()-get_original_timestamp())!=3600;
 }
 
@@ -237,7 +238,10 @@ CVSInfo::get_current_timestamp()const
 		synfig::error("Unable to get file stats");
 		return false;
 	}
-	return st.st_mtime+timezone+(daylight-1)*3600;
+	time_t ret((daylight-1)*3600);
+	//ret+=timezone;
+	ret+=st.st_mtime;
+	return ret;
 }
 
 synfig::String