Fix #577 adding torrents by drag n' drop in windows

ChangeLog

@@ -1,3 +1,7 @@
+Deluge 1.0.5 (In Development)
+ Windows:
+  * Fix #577 adding torrents by drag n' drop
+
 Deluge 1.0.4 (31 October 2008)
  Core:
   * Fix #560 force an int value for global max connections

deluge/ui/gtkui/addtorrentdialog.py

@@ -198,7 +198,7 @@ class AddTorrentDialog(component.Component):
                 filedump = lt.bdecode(filedump)
                 _file.close()
             except Exception, e:
-                log.warning("Unable to open %s: e", filename, e)
+                log.warning("Unable to open %s: %s", filename, e)
                 continue
 
             try:

deluge/ui/gtkui/ipcinterface.py

@@ -88,6 +88,8 @@ def process_args(args):
         return
     config = ConfigManager("gtkui.conf")
     for arg in args:
+        if not arg:
+            continue
         if deluge.common.is_url(arg):
             log.debug("Attempting to add %s from external source..",
                 arg)
@@ -105,4 +107,3 @@ def process_args(args):
                 component.get("AddTorrentDialog").show(config["focus_add_dialog"])
             else:
                 client.add_torrent_file([os.path.abspath(arg)])
-        

deluge/ui/gtkui/mainwindow.py

@@ -194,8 +194,8 @@ class MainWindow(component.Component):
         args = []
         for uri in selection_data.data.split():
             if deluge.common.windows_check():
-                uri = uri[7:]
-                uri = urllib.url2pathname(uri).strip("\r\n\x00")
+                args.append(urllib.url2pathname(uri[7:]))
+            else:
                 args.append(urllib.unquote(urlparse(uri).path))
         process_args(args)
         drag_context.finish(True, True)