Merge branch 'development' into MUSHclient

MUSHclient/AardwolfPackageChanges.txt

@@ -1,5 +1,9 @@
 Aardwolf Client Package Major Changes List
 
+r1987 snapshot
+- misc change: Pwar's soundpack plugin will be automatically installed now. It starts with everything off unless you're using the non-visual package, so I don't see a good reason to not load it.
+- bug fix: The communication log window was sometimes preserving message contents across restarts too, but I don't want that.
+
 r1986 snapshot
 - new feature: The communication log window will now preserve its message contents when switching color themes.
 - new feature: Themes can now optionally override the background pattern behavior. The "Pink Neon" theme gives a decent demonstration.

MUSHclient/lua/aard_requirements.lua

@@ -29,6 +29,7 @@ if not GetVariable("just_reloading") then
    do_plugin_check_now("55616ea13339bc68e963e1f8", "aard_chat_echo") -- gmcp channels in main display
    do_plugin_check_now("520bc4f29806f7af0017985f", "Hyperlink_URL2") -- make hyperlinks from urls
    do_plugin_check_now("04d9e64f835452b045b427a7", "aard_Copy_Colour_Codes") -- Ctrl+D to copy selected text with color codes
+   do_plugin_check_now("23832d1089f727f5f34abad8", "aard_soundpack") -- pre-made collection of common sound triggers
 end
 
 DeleteVariable("just_reloading")

MUSHclient/worlds/plugins/aard_channels_fiendish.xml

@@ -607,24 +607,22 @@ function setupDisplay ()
    drawTabs()
 end
 
-function OnPluginConnect ()
-   -- first time after connect, get tags right
-end --  OnPluginConnect
-
 function OnPluginClose ()
-   -- if enabled
-   if GetPluginInfo(GetPluginID(), 17) then
-      OnPluginDisable()
-   end -- if enabled
    WindowDelete(win)
+   if GetVariable("just_reloading") then
+      local temp_tabs_data = {}
+      for i,v in ipairs(tabs_rects) do
+         temp_tabs_data[i] = {
+            ["contents"] = v:serializeContents(),
+            ["activity"] = tabs_activity[i]
+         }
+      end
+      SetVariable("temp_tabs_data", serialize.save_simple(temp_tabs_data))
+   end
 end -- OnPluginClose
 
 function OnPluginEnable ()
    WindowShow(win, true)
-   -- if we are connected when the plugin loads, it must have been reloaded while playing
-   if IsConnected() then
-      OnPluginConnect()
-   end -- if already connected
 end -- OnPluginEnable
 
 function OnPluginDisable()
@@ -657,17 +655,6 @@ function OnPluginSaveState()
    SetVariable("tabs_names", serialize.save("tabs_names"))
    SetVariable("tabs_channel_captures", serialize.save("tabs_channel_captures"))
    SetVariable("tabs_nonchannel_captures", serialize.save("tabs_nonchannel_captures"))
-
-   if GetVariable("just_reloading") then
-      local temp_tabs_data = {}
-      for i,v in ipairs(tabs_rects) do
-         temp_tabs_data[i] = {
-            ["contents"] = v:serializeContents(),
-            ["activity"] = tabs_activity[i]
-         }
-      end
-      SetVariable("temp_tabs_data", serialize.save_simple(temp_tabs_data))
-   end
 end
 
 function sanitize_filename(str)