diff options
| author | Manuel Quiñones <manuq@laptop.org> | 2013-04-11 02:52:22 (GMT) |
|---|---|---|
| committer | Ajay Garg <ajay@activitycentral.com> | 2013-04-13 04:18:05 (GMT) |
| commit | 99aff9727386e7346c28be38a39d60f41db4284c (patch) | |
| tree | 4d6e24bcaa704a53ce96e2dfb639cf4791a9472d | |
| parent | b8bbeed693db532d91a62fc42c567e480674b4dd (diff) | |
More frame drag and drop fixes - SL #3819
- Errors introduced in recent commit 0aca8e59,
jarabe.frame.clipboardobject.Format class doesn't have get_uri()
method.
- jarabe.frame.clipboardobject.ClipboardObject: if format is
'text/uri-list', Format.get_data() will contain only one URL.
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Signed-off-by: Ajay Garg <ajay@activitycentral.com>
| -rw-r--r-- | src/jarabe/frame/clipboardmenu.py | 8 | ||||
| -rw-r--r-- | src/jarabe/frame/clipboardobject.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index eef3861..ddba1c6 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -195,9 +195,9 @@ class ClipboardMenu(Palette): transfer_ownership = False if most_significant_mime_type == 'text/uri-list': - uris = format_.get_uris() - if len(uris) == 1 and uris[0].startswith('file://'): - parsed_url = urlparse.urlparse(uris[0]) + uri = format_.get_data() + if uri.startswith('file://'): + parsed_url = urlparse.urlparse(uri) file_path = parsed_url.path # pylint: disable=E1101 transfer_ownership = False mime_type = mime.get_for_file(file_path) @@ -207,7 +207,7 @@ class ClipboardMenu(Palette): mime_type = 'text/uri-list' else: if format_.is_on_disk(): - parsed_url = urlparse.urlparse(format_.get_uris()[0]) + parsed_url = urlparse.urlparse(format_.get_data()) file_path = parsed_url.path # pylint: disable=E1101 transfer_ownership = False mime_type = mime.get_for_file(file_path) diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py index 5a3c9fe..dc412df 100644 --- a/src/jarabe/frame/clipboardobject.py +++ b/src/jarabe/frame/clipboardobject.py @@ -103,8 +103,8 @@ class ClipboardObject(object): format_ = mime.choose_most_significant(self._formats.keys()) if format_ == 'text/uri-list': - uris = self._formats[format_].get_uris() - uri = urlparse.urlparse(uris[0], 'file') + uri_data = self._formats[format_].get_data() + uri = urlparse.urlparse(uri_data, 'file') scheme = uri.scheme # pylint: disable=E1101 if scheme == 'file': path = uri.path # pylint: disable=E1101 |