[meld: 52/63] filediff: Use the MeldBuffer-associated source file to get metadata set



commit 93a30043fb74b9bde8926693732792e7490f6057
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Oct 11 07:47:38 2015 +1000

    filediff: Use the MeldBuffer-associated source file to get metadata set
    
    Because we were recreating the source file that we passed along to the
    loader, none of the interesting attributes that the loader sets (e.g.,
    the newline type or encoding) ended up set on the file we actually had
    associated with our MeldBuffer. Since we'd like to move to using the
    loaded sourcefile for whatever attributes we can, we now use this when
    loading.

 meld/filediff.py |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index b72a6d4..f183857 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1036,12 +1036,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             self.msgarea_mgr[pane].clear()
 
             self.textbuffer[pane].data.reset(gfile)
-            sourcefile = GtkSource.File()
-            sourcefile.set_location(gfile)
 
             # TODO: Maybe re-add support for the 'detect-encodings' gsetting
             loader = GtkSource.FileLoader.new(
-                self.textbuffer[pane], sourcefile)
+                self.textbuffer[pane], self.textbuffer[pane].data.sourcefile)
             loader.load_async(
                 GLib.PRIORITY_HIGH,
                 callback=self.file_loaded,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]