reloadall should also look in the plugins directory

git-svn-id: svn://svn.code.sf.net/p/xchat/svn@1396 893a96be-7f27-4fdf-9d1e-6aeec9d3cce1

diff --git a/plugins/perl/Xchat.pm b/plugins/perl/Xchat.pm
index 9c7654fa5fb59710aebb3faea0d6e9f24bdb5e30..c537f98af37e9b8553906a6e7bd27e7eda4fb211 100644 (file)
--- a/plugins/perl/Xchat.pm
+++ b/plugins/perl/Xchat.pm
@@ -623,19 +623,22 @@ sub reload {
 }
 
 sub reload_all {
-       my $dir = Xchat::get_info( "xchatdirfs" ) || Xchat::get_info( "xchatdir" );
-       my $auto_load_glob = File::Spec->catfile( $dir, "*.pl" );
-       my @scripts = map { $_->{filename} }
-               sort { $a->{loaded_at} <=> $b->{loaded_at} } values %scripts;
-       push @scripts, File::Glob::bsd_glob( $auto_load_glob );
-
-       my %seen;
-       @scripts = grep { !$seen{ $_ }++ } @scripts;
-
-       unload_all();
-       for my $script ( @scripts ) {
-               if( !pkg_info( file2pkg( $script ) ) ) {
-                       load( $script );
+       my @dirs = Xchat::get_info( "xchatdirfs" ) || Xchat::get_info( "xchatdir" );
+       push @dirs, File::Spec->catdir( $dirs[0], "plugins" );
+       for my $dir ( @dirs ) {
+               my $auto_load_glob = File::Spec->catfile( $dir, "*.pl" );
+               my @scripts = map { $_->{filename} }
+                       sort { $a->{loaded_at} <=> $b->{loaded_at} } values %scripts;
+               push @scripts, File::Glob::bsd_glob( $auto_load_glob );
+
+               my %seen;
+               @scripts = grep { !$seen{ $_ }++ } @scripts;
+
+               unload_all();
+               for my $script ( @scripts ) {
+                       if( !pkg_info( file2pkg( $script ) ) ) {
+                               load( $script );
+                       }
                }
        }
 }