remove remap

6 files changed, 1 insertions, 81 deletions

diff --git a/ChangeLog b/ChangeLog
index 49456bd69..7c569f319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,6 @@ Deluge 0.5.7 (xx November 2007)
   * Manual force-recheck
   * Blocklist plugin will now display errors, instead of just crashing on a bad
   list or wrong type
-  * Local discovery of peers
   * Add torrent in paused state option
   * Fix bug where loaded plugins were forgotten if Deluge crashed
   * Fix ratio bugs (hopefully for the last time)
diff --git a/glade/file_tab_menu.glade b/glade/file_tab_menu.glade
index 7cef23e55..f93eef209 100644
--- a/glade/file_tab_menu.glade
+++ b/glade/file_tab_menu.glade
@@ -63,29 +63,6 @@
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="rename_file">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="label" translatable="yes">_Rename File</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="rename_file"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image8">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="stock">gtk-edit</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="rename_file_separator">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-      </widget>
-    </child>
-    <child>
       <widget class="GtkImageMenuItem" id="priority_dont_download">
         <property name="visible">True</property>
         <property name="label" translatable="yes">Don't download</property>
diff --git a/libtorrent/src/lsd.cpp b/libtorrent/src/lsd.cpp
index f4bee3610..06e570f3c 100644
--- a/libtorrent/src/lsd.cpp
+++ b/libtorrent/src/lsd.cpp
@@ -183,9 +183,9 @@ void lsd::on_announce(udp::endpoint const& from, char* buffer
 
 void lsd::close()
 {
+	m_socket.close();
 	m_broadcast_timer.cancel();
 	m_disabled = true;
 	m_callback.clear();
-	m_socket.close();
 }
 
diff --git a/libtorrent/src/session_impl.cpp b/libtorrent/src/session_impl.cpp
index 3132b80c9..c41079fdc 100755
--- a/libtorrent/src/session_impl.cpp
+++ b/libtorrent/src/session_impl.cpp
@@ -2317,8 +2317,6 @@ namespace detail
 	void session_impl::stop_lsd()
 	{
 		mutex_t::scoped_lock l(m_mutex);
-		if (m_lsd.get())
-			m_lsd->close();
 		m_lsd = 0;
 	}
 	
diff --git a/plugins/TorrentFiles/tab_files.py b/plugins/TorrentFiles/tab_files.py
index dfca6d3c0..eb7917fc5 100644
--- a/plugins/TorrentFiles/tab_files.py
+++ b/plugins/TorrentFiles/tab_files.py
@@ -106,54 +106,6 @@ an error trying to launch the file."))
         except KeyError:
             pass
 
-    def rename_file(self, widget=None):
-        import os, gtk
-        import deluge.common
-        dlg = gtk.Dialog(_("Rename File"), None, 0,
-            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,gtk.STOCK_OK, gtk.RESPONSE_OK))
-        dlg.set_default_response(gtk.RESPONSE_OK)
-        dlg.set_modal(True)
-        dlg.set_default_size(300, 150)
-        dlg.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        dlg.set_icon(deluge.common.get_logo(32))
-        label = gtk.Label(_("Enter the new name of the file"))
-        entry = gtk.Entry()
-        entry.connect("activate", lambda w : dlg.response(gtk.RESPONSE_OK))
-        dlg.vbox.pack_start(label)
-        dlg.vbox.pack_start(entry)
-        save_dir = self.manager.unique_IDs[self.file_unique_id].save_dir
-        selected_paths = self.file_view.get_selection().get_selected_rows()[1]
-        try:
-            for path in selected_paths:
-                self.new_paths = []
-                self.new_sizes = []
-                self.child_path = self.file_store_sorted.\
-                                 convert_path_to_child_path(path)
-                self.file_name = self.file_store.get_value(
-                                self.file_store.get_iter(self.child_path), 0)
-                self.file_size = self.file_store.get_value(
-                                self.file_store.get_iter(self.child_path), 1)
-
-                for x in self.manager.get_torrent_file_info(self.file_unique_id):
-                    if x['path'] != self.file_name:
-                        self.new_paths.append(x['path'])
-                        self.new_sizes.append(x['size'])
-                entry.set_text(self.file_name)
-                gtk.gdk.threads_enter()
-                dlg.show_all()
-                response = dlg.run()
-                if response == gtk.RESPONSE_OK:
-                    new_name = entry.get_text().decode("utf_8")
-                    dlg.destroy()
-                    self.new_paths.append(new_name)
-                    self.new_sizes.append(self.file_size)
-                    self.manager.rename_file(self.file_unique_id, self.new_paths, self.new_sizes)
-                else:
-                    dlg.destroy()
-                gtk.gdk.threads_leave()
-        except:
-            pass
-
     # From core to UI
     def prepare_file_store(self):
         if not self.file_store_dict:
diff --git a/src/files.py b/src/files.py
index 01ffc0e3b..49c1087cb 100644
--- a/src/files.py
+++ b/src/files.py
@@ -51,7 +51,6 @@ class FilesBaseManager(object):
         self.file_menu = self.glade.get_widget("file_tab_menu")
         self.glade.signal_autoconnect({
             "open_file" : self.open_file,
-            "rename_file" : self.rename_file,
             "select_all": self.file_select_all,
             "unselect_all": self.file_unselect_all,
             "priority_dont_download": self.priority_clicked,
@@ -70,9 +69,6 @@ class FilesBaseManager(object):
     def open_file(self):
         pass
 
-    def rename_file(self):
-        pass
-
     def build_file_view(self):
         def priority(column, cell, model, iter, data):
             priority = common.fpriority(model.get_value(iter, data))
@@ -158,8 +154,6 @@ class FilesDialogManager(FilesBaseManager):
         # not added yet
         self.glade.get_widget("open_file").hide()
         self.glade.get_widget("open_file_separator").hide()
-        self.glade.get_widget("rename_file").hide()
-        self.glade.get_widget("rename_file_separator").hide()
     
     def prepare_file_store(self):
         for file in self.dumped_torrent: