# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: effingoose@gmail.com-20110224071533-olpz22wjlnkt8mfc
# target_branch: http://bazaar.launchpad.net/~jonoomph/openshot/main/
# testament_sha1: 4ffc312417a81829415ea684fab18a61633e45f6
# timestamp: 2011-02-24 22:44:56 +1000
# base_revision_id: jonathan.oomph@gmail.com-20110222071608-\
#   nv7vn0x9gx8v5mcv
# 
# Begin patch
=== modified file 'openshot/classes/files.py'
--- openshot/classes/files.py	2011-02-22 05:28:24 +0000
+++ openshot/classes/files.py	2011-02-24 07:15:33 +0000
@@ -378,10 +378,10 @@
 		return path
 
 
-	def UpdateFileLabel(self, filename, value, refresh_tree=0):
+	def UpdateFileLabel(self, unique_id, value, refresh_tree=0):
 		#this will only be called when the treeview mode is selected, not the thumbview 
 		for item in self.items:
-			if item.name.endswith(filename):
+			if item.unique_id == unique_id:
 				item.label = value
 				
 		if refresh_tree == 1:

=== modified file 'openshot/classes/tree.py'
--- openshot/classes/tree.py	2010-12-03 23:07:42 +0000
+++ openshot/classes/tree.py	2011-02-24 07:15:33 +0000
@@ -70,6 +70,6 @@
 	#set the edit in the model
 	model.set(iter,3,new_text)
 	#update the file object with the label edit
-	filename = model.get_value(iter, 1)
-	project.project_folder.UpdateFileLabel(filename, new_text, 0)
+	unique_id = model.get_value(iter, 4)
+	project.project_folder.UpdateFileLabel(unique_id, new_text, 0)
 	

=== modified file 'openshot/windows/FileProperties.py'
--- openshot/windows/FileProperties.py	2010-11-22 23:15:11 +0000
+++ openshot/windows/FileProperties.py	2011-02-24 07:15:33 +0000
@@ -86,7 +86,7 @@
 		if self.txtLabel.get_text() == "":
 			return
 
-		self.project.project_folder.UpdateFileLabel(self.lblLocation1.get_text(), self.txtLabel.get_text(), 1)
+		self.project.project_folder.UpdateFileLabel(self.file.unique_id, self.txtLabel.get_text(), 1)
 		self.frmFileProperties.destroy()
 		
 def main():

=== modified file 'openshot/windows/TreeBlender.py'
--- openshot/windows/TreeBlender.py	2010-12-03 23:07:42 +0000
+++ openshot/windows/TreeBlender.py	2011-02-24 07:15:33 +0000
@@ -183,13 +183,6 @@
 	def cell_edited(self, cell, row, new_text, model, project=None):
 		
 		##Fired when the editable label cell is edited
-		#get the row that was edited
-		iter = model.get_iter_from_string(row)
-		column = cell.get_data(_("Label"))
-		#set the edit in the model
-		model.set(iter,3,new_text)
-		#update the file object with the label edit
-		filename = model.get_value(iter, 1)
-		project.project_folder.UpdateFileLabel(filename, new_text, 0)
+		pass
 
 

=== modified file 'openshot/windows/TreeEffects.py'
--- openshot/windows/TreeEffects.py	2011-01-29 06:32:37 +0000
+++ openshot/windows/TreeEffects.py	2011-02-24 07:15:33 +0000
@@ -275,13 +275,5 @@
 	def cell_edited(self, cell, row, new_text, model, project=None):
 		
 		##Fired when the editable label cell is edited
-		#get the row that was edited
-		iter = model.get_iter_from_string(row)
-		column = cell.get_data(_("Label"))
-		#set the edit in the model
-		model.set(iter,3,new_text)
-		#update the file object with the label edit
-		filename = model.get_value(iter, 1)
-		project.project_folder.UpdateFileLabel(filename, new_text, 0)
-
+		pass
 

=== modified file 'openshot/windows/TreeFiles.py'
--- openshot/windows/TreeFiles.py	2009-10-14 05:19:35 +0000
+++ openshot/windows/TreeFiles.py	2011-02-24 07:15:33 +0000
@@ -139,8 +139,8 @@
 		#set the edit in the model
 		model.set(iter,3,new_text)
 		#update the file object with the label edit
-		filename = model.get_value(iter, 1)
-		self.project.project_folder.UpdateFileLabel(filename, new_text, 0)
+		unique_id = model.get_value(iter, 4)
+		self.project.project_folder.UpdateFileLabel(unique_id, new_text, 0)
 		
 	def set_project(self, project):
 		self.project = project

=== modified file 'openshot/windows/TreeHistory.py'
--- openshot/windows/TreeHistory.py	2010-01-31 22:50:27 +0000
+++ openshot/windows/TreeHistory.py	2011-02-24 07:15:33 +0000
@@ -127,14 +127,7 @@
 	def cell_edited(self, cell, row, new_text, model, project=None):
 		
 		##Fired when the editable label cell is edited
-		#get the row that was edited
-		iter = model.get_iter_from_string(row)
-		column = cell.get_data(_("Label"))
-		#set the edit in the model
-		model.set(iter,3,new_text)
-		#update the file object with the label edit
-		filename = model.get_value(iter, 1)
-		project.project_folder.UpdateFileLabel(filename, new_text, 0)
+		pass
 
 	def set_project(self, project):
 		self.project = project

# Begin bundle
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
FS93l4A=