From cf1f8d377549c6cb5ad9475dcd5ec5f48738a8e8 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sun, 4 Oct 2009 15:00:25 +0200
Subject: Consolidate plugin IDs

This breaks custom-chosen plugins for saved connections (with automatic fallback to 'auto')
---
 UConnectionManager.pas | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'UConnectionManager.pas')

diff --git a/UConnectionManager.pas b/UConnectionManager.pas
index 026a975..e441b24 100644
--- a/UConnectionManager.pas
+++ b/UConnectionManager.pas
@@ -335,7 +335,7 @@ begin
         ConnMgrItem.Password := PasswordEntry.Text;
         ConnMgrItem.TargetDir := TargetDirEntry.Text;
         ConnMgrItem.PluginID := '';
-        if PluginOptionMenu.ItemIndex <> 0 then ConnMgrItem.PluginID := TVFSPlugin(PluginList[PluginOptionMenu.ItemIndex - 1]).VFSName;
+        if PluginOptionMenu.ItemIndex <> 0 then ConnMgrItem.PluginID := TVFSPlugin(PluginList[PluginOptionMenu.ItemIndex - 1]).ModuleID;
       end;
       ConnectionMgrList.Add(ConnMgrItem);
       Item := ListView.Items.Add;
@@ -367,7 +367,7 @@ begin
     FConnectionProperties.ServiceTypeOptionMenuChanged(Sender);
     //  Find the plugin by PluginID
     for i := 0 to PluginList.Count - 1 do
-      if TVFSPlugin(PluginList[i]).VFSName = ConnMgrItem.PluginID then begin
+      if TVFSPlugin(PluginList[i]).ModuleID = ConnMgrItem.PluginID then begin
         FConnectionProperties.PluginOptionMenu.ItemIndex := i + 1;
         Break;
       end;
@@ -381,7 +381,7 @@ begin
         ConnMgrItem.Password := PasswordEntry.Text;
         ConnMgrItem.TargetDir := TargetDirEntry.Text;
         ConnMgrItem.PluginID := '';
-        if PluginOptionMenu.ItemIndex <> 0 then ConnMgrItem.PluginID := TVFSPlugin(PluginList[PluginOptionMenu.ItemIndex - 1]).VFSName;
+        if PluginOptionMenu.ItemIndex <> 0 then ConnMgrItem.PluginID := TVFSPlugin(PluginList[PluginOptionMenu.ItemIndex - 1]).ModuleID;
       end;
       Item.SetValue(1, ConnMgrItem.ConnectionName);
       Item.SetValue(2, FConnectionProperties.MakeURI(True));
@@ -408,7 +408,7 @@ begin
     FConnectionProperties.ServiceTypeOptionMenuChanged(Sender);
     //  Find the plugin by PluginID
     for i := 0 to PluginList.Count - 1 do
-      if TVFSPlugin(PluginList[i]).VFSName = ConnMgrItem.PluginID then begin
+      if TVFSPlugin(PluginList[i]).ModuleID = ConnMgrItem.PluginID then begin
         FConnectionProperties.PluginOptionMenu.ItemIndex := i + 1;
         Break;
       end;
@@ -423,7 +423,7 @@ begin
         ConnMgrItem.Password := PasswordEntry.Text;
         ConnMgrItem.TargetDir := TargetDirEntry.Text;
         ConnMgrItem.PluginID := '';
-        if PluginOptionMenu.ItemIndex <> 0 then ConnMgrItem.PluginID := TVFSPlugin(PluginList[PluginOptionMenu.ItemIndex - 1]).VFSName;
+        if PluginOptionMenu.ItemIndex <> 0 then ConnMgrItem.PluginID := TVFSPlugin(PluginList[PluginOptionMenu.ItemIndex - 1]).ModuleID;
       end;
       ConnectionMgrList.Add(ConnMgrItem);
       Item := ListView.Items.Add;
@@ -550,7 +550,7 @@ begin
   VFSPlugin := nil;
   if Length(FActiveConnInfo.PluginID) > 0 then
     for i := 0 to PluginList.Count - 1 do
-      if TVFSPlugin(PluginList[i]).VFSName = FActiveConnInfo.PluginID then begin
+      if TVFSPlugin(PluginList[i]).ModuleID = FActiveConnInfo.PluginID then begin
         VFSPlugin := PluginList[i];
         Break;
        end;
-- 
cgit v1.2.3