.. lots of changes ..

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@197 dbcabf3a-b0e7-0310-adc4-f8d773084564

1 files changed, 33 insertions, 31 deletions

diff --git a/config b/config
index 98fb3c65..50015df9 100644
--- a/config
+++ b/config
@@ -1,19 +1,19 @@
-setupservers = (
-  {server = "irc.funet.fi"; ircnet = IRCNet; port = 6667; autoconnect = No;},
-  {server = "irc.efnet.net"; ircnet = EFNet; port = 6667; autoconnect = No;},
-  {server = "irc.undernet.net"; ircnet = Undernet; port = 6667; autoconnect = No;},
-  {server = "irc.dal.net"; ircnet = DALNet; port = 6667; autoconnect = No;},
-  {server = "irc.openprojects.net"; ircnet = OPN; port = 6667; autoconnect = No;},
-  {server = "irc.ptlink.net"; ircnet = PTlink; port = 6667; autoconnect = No;}
+servers = (
+  { address = "irc.funet.fi"; ircnet = IRCNet; port = 6667; },
+  { address = "irc.efnet.net"; ircnet = EFNet; port = 6667; },
+  { address = "irc.undernet.net"; ircnet = Undernet; port = 6667; },
+  { address = "irc.dal.net"; ircnet = DALNet; port = 6667; },
+  { address = "irc.openprojects.net"; ircnet = OPN; port = 6667; },
+  { address = "irc.ptlink.net"; ircnet = PTlink; port = 6667; }
 );
 
 ircnets = (
-  {name = IRCNet; max_kicks = 4; max_modes = 3; max_msgs = 5; max_whois = 4;},
-  {name = EFNet; max_kicks = 4; max_modes = 4; max_msgs = 3;},
-  {name = Undernet; max_kicks = 4; max_modes = 3; max_msgs = 3;},
-  {name = DALNet; max_kicks = 4; max_modes = 6; max_msgs = 3;},
-  {name = OPN; max_kicks = 1; max_modes = 6; max_msgs = 100;},
-  {name = PTlink; max_kicks = 1; max_modes = 6; max_msgs = 100;}
+  { name = IRCNet; max_kicks = 4; max_modes = 3; max_msgs = 5; max_whois = 4; },
+  { name = EFNet; max_kicks = 4; max_modes = 4; max_msgs = 3; },
+  { name = Undernet; max_kicks = 4; max_modes = 3; max_msgs = 3; },
+  { name = DALNet; max_kicks = 4; max_modes = 6; max_msgs = 3; },
+  { name = OPN; max_kicks = 1; max_modes = 6; max_msgs = 100; },
+  { name = PTlink; max_kicks = 1; max_modes = 6; max_msgs = 100; }
 );
 
 channels = (
@@ -28,6 +28,7 @@ channels = (
     autojoin = No;
   }
 );
+
 aliases = {
   J = "join";
   LEAVE = "part";
@@ -62,23 +63,24 @@ aliases = {
   WC = "window close";
   WN = "window new";
 };
+
 popups = (
-  {label = "<MULTICOMMA>Whois"; command = "/whois %s";},
-  {label = "DCC Send File"; command = "/dcc send %s";},
-  {label = "Open DCC Chat"; command = "/dcc chat %s";},
-  {label = Query; command = "/query %s";},
-  {label = "<MENU><OP>"; command = "Op";},
-  {label = "<MULTI>Op"; command = "/op %s";},
-  {label = "<MULTI>Deop"; command = "/deop %s";},
-  {label = "<MULTI>Voice"; command = "/voice %s";},
-  {label = "<MULTI>Devoice"; command = "/devoice %s";},
-  {label = "<KICK>Kick"; command = "/kick %s %s";},
-  {label = "<MULTI>Ban"; command = "/ban %s";},
-  {label = "<KICK>Kick+ban"; command = "/kickban %s %s";},
-  {label = "<KICK>Knockout"; command = "/knockout %s %s";},
-  {label = "</MENU>"; command = "";},
-  {label = "<MENU>"; command = "CTCP";},
-  {label = Ping; command = "/ping %s";},
-  {label = Version; command = "/ver %s";},
-  {label = "</MENU>"; command = "";}
+  { label = "<MULTICOMMA>Whois"; command = "/whois %s"; },
+  { label = "DCC Send File"; command = "/dcc send %s"; },
+  { label = "Open DCC Chat"; command = "/dcc chat %s"; },
+  { label = Query; command = "/query %s"; },
+  { label = "<MENU><OP>"; command = "Op"; },
+  { label = "<MULTI>Op"; command = "/op %s"; },
+  { label = "<MULTI>Deop"; command = "/deop %s"; },
+  { label = "<MULTI>Voice"; command = "/voice %s"; },
+  { label = "<MULTI>Devoice"; command = "/devoice %s"; },
+  { label = "<KICK>Kick"; command = "/kick %s %s"; },
+  { label = "<MULTI>Ban"; command = "/ban %s"; },
+  { label = "<KICK>Kick+ban"; command = "/kickban %s %s"; },
+  { label = "<KICK>Knockout"; command = "/knockout %s %s"; },
+  { label = "</MENU>"; command = ""; },
+  { label = "<MENU>"; command = "CTCP"; },
+  { label = Ping; command = "/ping %s"; },
+  { label = Version; command = "/ver %s"; },
+  { label = "</MENU>"; command = ""; }
 );