Merge branch 'domainsocket' of ssh://sun@yggdrasil.mitch.h.shuttle.de/home/mitch...

diff --git a/xmlrtorrent.pl b/xmlrtorrent.pl
index 460d9b3..4f63ba7 100644 (file)
--- a/xmlrtorrent.pl
+++ b/xmlrtorrent.pl
@@ -30,7 +30,7 @@ my $PARAMS = {
 };
 
 # activate debug here
-my $debug = 1;
+my $debug = 0;
 
 # "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
 signal_add_last("message public" => sub {check_for_link(\@_,1,4,2,0);});
@@ -321,13 +321,13 @@ sub cmd_talker {
         foreach $p (@talkers) {
             if (($p->{'NAME'} eq $target) && ($p->{'TYPE'} eq 'talker')) {
                 $talker = $p;
-                $conf->{'videosite'}->{'talker'} = $target;
+                $conf->{'xmlrtorrent'}->{'talker'} = $target;
                 return;
             }
         }
         write_irssi('No such talker');
     } else {
-        write_irssi('Current talker: %s', $conf->{'videosite'}->{'talker'});
+        write_irssi('Current talker: %s', $conf->{'xmlrtorrent'}->{'talker'});
     }
 }
 
@@ -429,8 +429,12 @@ sub init_xmlrtorrent {
         }
     }
     write_debug('Selected %s as talker', $talker->{'NAME'});
-    $conf->{'videosite'}->{'talker'} = $talker->{'NAME'};
+    $conf->{'xmlrtorrent'}->{'talker'} = $talker->{'NAME'};
 
+    # Loop through all plugins and load the config
+    foreach $p (@talkers) {
+        $conf->{'xmlrtorrent'}->{'config'}->{$p->{'NAME'}} = $p->mergeconfig($conf->{'xmlrtorrent'}->{'config'}->{$p->{'NAME'}});
+    }
 
     # Restore the queue
     %torrentlist = %{$conf->{'xmlrtorrent'}->{'_QUEUE'}};