Ticket #636: config_chg.diff

deluge/ui/gtkui/connectionmanager.py

@@ -118 +118 @@
 
         # If classic mode is set, we just start up a localhost daemon and connect to it
         if self.gtkui_config["classic_mode"]:
-            uri = "http://localhost:58846"
-            self.start_localhost(58846)
+            uri = "http://" + DEFAULT_CONFIG["hosts"][0]
+            port = uri[7:].split(":")[1]
+            self.start_localhost(port)
             # We need to wait for the host to start before connecting
             while not self.test_online_status(uri):
                 time.sleep(0.01)
@@ -393 +394 @@
         log.debug("on_button_startdaemon_clicked")
         if self.liststore.iter_n_children(None) < 1:
             # There is nothing in the list, so lets create a localhost entry
-            self.add_host("localhost", 58846)
+            port = DEFAULT_CONFIG["hosts"][0].split(":")[1]
+            self.add_host(DEFAULT_CONFIG["hosts"][0].split(":")[0], 
+                port)
             # ..and start the daemon.
-            self.start_localhost(58846)
+            self.start_localhost(port)
             return
 
         paths = self.hostlist.get_selection().get_selected_rows()[1]
@@ -425 +428 @@
         if deluge.common.windows_check():
             win32api.WinExec("deluged -p %s" % port)
         else:
-            subprocess.call(["deluged", "-p %s" % port])
+            subprocess.call(["deluged", "--port=%s" % port,
+                "--config=%s" % self.gtkui_config["config_location"]])
 
     def on_button_close_clicked(self, widget):
         log.debug("on_button_close_clicked")

deluge/ui/gtkui/filtertreeview.py

@@ -71 +71 @@
         self.scrolled = glade.get_widget("scrolledwindow_sidebar")
         self.sidebar = component.get("SideBar")
         self.config = ConfigManager("gtkui.conf")
-        self.tracker_icons = TrackerIcons()
+        self.tracker_icons = TrackerIcons(self.config["config_location"])
 
         self.label_view = gtk.TreeView()
         self.sidebar.add_tab(self.label_view, "filters", _("Filters"))

deluge/ui/tracker_icons.py

@@ -60 +60 @@
     return data
 
 class TrackerIcons(object):
-    def __init__(self):
+    def __init__(self, config_dir=None):
         #set image cache dir
-        self.image_dir = get_default_config_dir("icons")
+        if config_dir == None:
+            self.image_dir = get_default_config_dir("icons")
+        else:
+            self.image_dir = os.path.join(config_dir, "icons")
         if not os.path.exists(self.image_dir):
             os.mkdir(self.image_dir)