Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0>2008-03-13 15:34:51 (GMT)
committer erikb <erikb@574bc980-5f2d-0410-acbc-c8f9f0eb14e0>2008-03-13 15:34:51 (GMT)
commit9b11bb274f3dbbe65843ee2d08d0e678636460fc (patch)
tree47a3810a2807fe82e94cc516f49826615182e118
parent03b4a5ba0ae444cad3114b34350eec8707483203 (diff)
54 updates
git-svn-id: http://mediamods.com/public-svn/camera-activity/tags/54@1056 574bc980-5f2d-0410-acbc-c8f9f0eb14e0
-rw-r--r--NEWS3
-rwxr-xr-xactivity/activity.info2
-rw-r--r--constants.py2
-rw-r--r--utils.py10
4 files changed, 10 insertions, 7 deletions
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 ):