meld r1296 - trunk

[vincele svn gnome org]

Author: vincele
Date: Thu Mar 26 23:11:27 2009
New Revision: 1296
URL: http://svn.gnome.org/viewvc/meld?rev=1296&view=rev

Log:
Extract _single_file_open() method from open_paths()


Modified:
   trunk/meldapp.py

Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py	(original)
+++ trunk/meldapp.py	Thu Mar 26 23:11:27 2009
@@ -925,6 +925,16 @@
         if tab:
             tab.set_labels( options.label )
 
+    def _single_file_open(self, path):
+        doc = vcview.VcView(self.prefs)
+        def cleanup():
+            self.scheduler.remove_scheduler(doc.scheduler)
+        self.scheduler.add_task(cleanup)
+        self.scheduler.add_scheduler(doc.scheduler)
+        doc.set_location(os.path.dirname(path))
+        doc.connect("create-diff", lambda obj,arg: self.append_diff(arg))
+        doc.run_diff([path])
+
     def open_paths(self, paths, auto_compare=False):
         tab = None
         if len(paths) == 0:
@@ -933,14 +943,7 @@
         elif len(paths) == 1:
             a = paths[0]
             if os.path.isfile(a):
-                doc = vcview.VcView(self.prefs)
-                def cleanup():
-                    self.scheduler.remove_scheduler(doc.scheduler)
-                self.scheduler.add_task(cleanup)
-                self.scheduler.add_scheduler(doc.scheduler)
-                doc.set_location( os.path.dirname(a) )
-                doc.connect("create-diff", lambda obj,arg: self.append_diff(arg) )
-                doc.run_diff([a])
+                self._single_file_open(a)
             else:
                 tab = self.append_vcview([a], auto_compare)