[gedit/gnome-2-28] Update dnd snippets environment variables to new style



commit 84f31c0dcdab7de2b0ca14650b466a5d4f28a2a8
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date:   Mon Nov 9 16:12:08 2009 +0100

    Update dnd snippets environment variables to new style

 plugins/snippets/snippets/Document.py |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/plugins/snippets/snippets/Document.py b/plugins/snippets/snippets/Document.py
index 658f954..93db207 100644
--- a/plugins/snippets/snippets/Document.py
+++ b/plugins/snippets/snippets/Document.py
@@ -830,7 +830,7 @@ class Document:
                 else:
                         return components
         
-        def relative_filename(self, first, second, mime):
+        def relative_path(self, first, second, mime):
                 prot1 = re.match('(^[a-z]+:\/\/|\/)(.*)', first)
                 prot2 = re.match('(^[a-z]+:\/\/|\/)(.*)', second)
                 
@@ -880,11 +880,21 @@ class Document:
                         uri = gfile.get_path()
                 
                 # Set environmental variables
-                filename = self.env_get_filename(self.view.get_buffer())
+                buf = self.view.get_buffer()
+                filename = self.env_get_document_path(buf)
+                
+                variables = {
+                        'GEDIT_DROP_DOCUMENT_URI': self.env_get_document_uri,
+                        'GEDIT_DROP_DOCUMENT_NAME': self.env_get_document_name,
+                        'GEDIT_DROP_DOCUMENT_SCHEME': self.env_get_document_scheme,
+                        'GEDIT_DROP_DOCUMENT_PATH': self.env_get_document_path,
+                        'GEDIT_DROP_DOCUMENT_DIR': self.env_get_document_dir,
+                        'GEDIT_DROP_DOCUMENT_TYPE': self.env_get_document_type}
                 
-                os.environ['GEDIT_DROP_FILENAME'] = uri
-                os.environ['GEDIT_DROP_MIME_TYPE'] = mime
-                os.environ['GEDIT_DROP_REL_FILENAME'] = self.relative_filename(filename, uri, mime)
+                for var in variables:
+                        os.environ[var] = variables[var](buf)
+
+                os.environ['GEDIT_DROP_DOCUMENT_RELATIVE_PATH'] = self.relative_path(filename, uri, mime)
 
                 buf = self.view.get_buffer()
                 mark = buf.get_mark('gtk_drag_target')



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