From 9b11bb274f3dbbe65843ee2d08d0e678636460fc Mon Sep 17 00:00:00 2001 From: erikb Date: Thu, 13 Mar 2008 15:34:51 +0000 Subject: 54 updates git-svn-id: http://mediamods.com/public-svn/camera-activity/tags/54@1056 574bc980-5f2d-0410-acbc-c8f9f0eb14e0 --- diff --git a/NEWS b/NEWS index a0247cf..e07ef4b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +54 +* #6679 fixed + 53 * #6417 fixed diff --git a/activity/activity.info b/activity/activity.info index 21bb2a5..5d1c63a 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,5 +3,5 @@ name = Record service_name = org.laptop.RecordActivity class = record.Record icon = activity-record -activity_version = 53 +activity_version = 54 show_launcher = yes \ No newline at end of file diff --git a/constants.py b/constants.py index 7bb2eb5..64fbc4f 100644 --- a/constants.py +++ b/constants.py @@ -17,7 +17,7 @@ import pangocairo class Constants: - VERSION = 53 + VERSION = 54 SERVICE = "org.laptop.Record" IFACE = SERVICE diff --git a/utils.py b/utils.py index 19ac57e..7244ab0 100644 --- a/utils.py +++ b/utils.py @@ -47,12 +47,12 @@ def loadSvg( data, stroke, fill ): def getUniqueFilepath( path, i ): pathOb = os.path.abspath( path ) - if (os.path.exists(pathOb)): - i = i+1 - newPath = os.path.join( os.path.dirname(pathOb), str( str(i) + os.path.basename(pathOb) ) ) - return getUniqueFilepath( str(newPath), i ) + newPath = os.path.join( os.path.dirname(pathOb), str( str(i) + os.path.basename(pathOb) ) ) + if (os.path.exists(newPath)): + i = i + 1 + return getUniqueFilepath( pathOb, i ) else: - return os.path.abspath( path ) + return os.path.abspath( newPath ) def md5File( filepath ): -- cgit v0.9.1