Consolidate plugin IDs

This breaks custom-chosen plugins for saved connections (with automatic fallback to 'auto')

1 files changed, 7 insertions, 7 deletions

diff --git a/UMain.pas b/UMain.pas
index e08eb10..5729c16 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -5359,7 +5359,7 @@ begin
   end else
     for i := 0 to PluginList.Count - 1 do begin
       MenuItem1 := TGTKMenuItem.CreateTyped(Self, itImageText);
-      MenuItem1.Caption := TVFSPlugin(PluginList[i]).VFSName;
+      MenuItem1.Caption := TVFSPlugin(PluginList[i]).ModuleName;
       MenuItem2 := TGTKMenuItem.CreateTyped(Self, itImageText);
       MenuItem2.Caption := LANGPluginAbout;
       MenuItem2.Tag := i;
@@ -5406,9 +5406,9 @@ begin
   VFSItem := PluginList[(Sender as TGTKMenuItem).Tag];
   InternalLock; 
   if (libGnomeUI2Handle = nil) or (@gnome_about_new = nil) then
-    Application.MessageBox(Format(LANGPluginAboutInside, [VFSItem.VFSName,  VFSItem.VFSAbout, VFSItem.VFSCopyright]))
+    Application.MessageBox(Format(LANGPluginAboutInside, [VFSItem.ModuleName, VFSItem.ModuleAbout, VFSItem.ModuleCopyright]))
     else begin
-           AboutBox := gnome_about_new(VFSItem.VFSName, nil, VFSItem.VFSCopyright, VFSItem.VFSAbout, @Authors, nil, nil, nil);
+           AboutBox := gnome_about_new(PChar(VFSItem.ModuleName), nil, PChar(VFSItem.ModuleCopyright), PChar(VFSItem.ModuleAbout), @Authors, nil, nil, nil);
            gtk_window_set_transient_for(GTK_WINDOW(AboutBox), GTK_WINDOW(FMain.FWidget));
            gtk_dialog_run(GTK_DIALOG(AboutBox));
     end;
@@ -6015,10 +6015,10 @@ begin
                  else Engine := RightPanelEngine;
 
     if Engine is TLocalTreeEngine then begin
-      DebugMsg(['Found plugin ''', Plugin.VFSName, ''', trying to open the file ''', FullPath, '''']);
+      DebugMsg(['Found plugin ''', Plugin.ModuleID, ''', trying to open the file ''', FullPath, '''']);
       ChangingDir(LeftPanel, TargetPath, FullPath, HighlightItem, False, False, Plugin);
     end else begin
-      DebugMsg(['Found plugin ''', Plugin.VFSName, ''', archive is nested in another archive, extracting first.']);
+      DebugMsg(['Found plugin ''', Plugin.ModuleID, ''', archive is nested in another archive, extracting first.']);
       NewPath := '';
       Result := ExtractFromArchive(NewPath, Engine, FullPath, False);
       if Result then begin
@@ -6096,7 +6096,7 @@ begin
                    AFConnectionProperties.URIEntry.Text := URI;
                    if (Engine.CustomPluginIDSave <> '') and (AFConnectionProperties.PluginOptionMenu.Items.Count > 0) then
                      for i := 0 to PluginList.Count - 1 do
-                       if TVFSPlugin(PluginList[i]).VFSName = Engine.CustomPluginIDSave
+                       if TVFSPlugin(PluginList[i]).ModuleID = Engine.CustomPluginIDSave
                          then AFConnectionProperties.PluginOptionMenu.ItemIndex := i + 1;
                    if AFConnectionProperties.Run = mbOK then begin
                      ReadConnections;
@@ -6109,7 +6109,7 @@ begin
                      ConnMgrItem.TargetDir := AFConnectionProperties.TargetDirEntry.Text;
                      ConnMgrItem.PluginID := '';
                      if AFConnectionProperties.PluginOptionMenu.ItemIndex <> 0 then
-                       ConnMgrItem.PluginID := TVFSPlugin(PluginList[AFConnectionProperties.PluginOptionMenu.ItemIndex - 1]).VFSName;
+                       ConnMgrItem.PluginID := TVFSPlugin(PluginList[AFConnectionProperties.PluginOptionMenu.ItemIndex - 1]).ModuleID;
                      ConfConnMgrActiveItem := ConnectionMgrList.Add(ConnMgrItem);
                      WriteConnections;
                    end;