3 files changed, 32 insertions, 23 deletions
diff --git a/functions.js b/functions.js
index 3baaffa3a..ff35961e8 100644
--- a/functions.js
+++ b/functions.js
@@ -2156,3 +2156,33 @@ function quickAddFilter() {
 	displayDlg('quickAddFilter', '',
 	   function () {document.forms['filter_add_form'].reg_exp.focus();});
 }
+
+function unsubscribeFeed(feed_id, title) {
+
+	var msg = __("Unsubscribe from %s?").replace("%s", title);
+
+	if (title == undefined || confirm(msg)) {
+		notify_progress("Removing feed...");
+
+		var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
+
+		new Ajax.Request("backend.php", {
+			parameters: query,
+			onComplete: function(transport) {
+
+					closeInfoBox();
+
+					if (inPreferences()) {
+						updateFeedList();				
+					} else {
+						dlg_frefresh_callback(transport, feed_id);
+					}
+
+				} });
+	}
+
+	return false;
+}
+
+
+
diff --git a/prefs.js b/prefs.js
index 3212d0066..ee53cf27a 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1845,7 +1845,7 @@ function removeFilter(id, title) {
 	return false;
 }
 
-function unsubscribeFeed(id, title) {
+/*function unsubscribeFeed(id, title) {
 
 	try {
 
@@ -1874,7 +1874,7 @@ function unsubscribeFeed(id, title) {
 
 	return false;
 
-}
+} */
 
 function feedsEditSave() {
 	try {
diff --git a/tt-rss.js b/tt-rss.js
index 233de669a..85f335b28 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -626,27 +626,6 @@ function quickMenuGo(opid) {
 	}
 }
 
-function unsubscribeFeed(feed_id, title) {
-
-
-	var msg = __("Unsubscribe from %s?").replace("%s", title);
-
-	if (title == undefined || confirm(msg)) {
-		notify_progress("Removing feed...");
-
-		var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
-
-		new Ajax.Request("backend.php", {
-			parameters: query,
-			onComplete: function(transport) {
-					dlg_frefresh_callback(transport, feed_id);
-				} });
-	}
-
-	return false;
-}
-
-
 function updateFeedTitle(t) {
 	active_title_text = t;
 	updateTitle();