Changeset 9610

Timestamp:

05/11/08 01:21:28 (7 months ago)

Author:

js

Message:

Fix DnD FT on Windows:
* Fix helpers.py so URL is decoded correctly.
* Fix code in roster_window.py so the \0 that's alway the last file

on win32 is ignored.

This also fixes and closes #2398.

Location:

trunk/src

Files:

• common/helpers.py (modified) (1 diff)
• roster_window.py (modified) (1 diff)

trunk/src/common/helpers.py

@@ -586 +586 @@
 
 def get_file_path_from_dnd_dropped_uri(uri):
-        path = urllib.url2pathname(uri) # escape special chars
+        path = urllib.unquote(uri) # escape special chars
         path = path.strip('\r\n\x00') # remove \r\n and NULL
         # get the path to file
-        if path.startswith('file:\\\\\\'): # windows
+        if re.match('^file:///[a-zA-Z]:/', path): # windows
                 path = path[8:] # 8 is len('file:///')
         elif path.startswith('file://'): # nautilus, rox

trunk/src/roster_window.py

@@ -3782 +3782 @@
                         uri = data.strip()
                         uri_splitted = uri.split() # we may have more than one file dropped
+                        try:
+                                uri_splitted.remove('\0') # This is always the last element in windows
+                        except ValueError:
+                                pass
                         nb_uri = len(uri_splitted)
                         # Check the URIs