From 9fab5b8a216e283e563f3457315715672bc8b55a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 13 Dec 2009 06:26:27 +0000
Subject: Update to Trinity 3.5.11 Will need to watch for commit warnings and
 rebuild test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1061808 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ksirc/KSPrefs/page_generalbase.ui | 2 +-
 ksirc/dsirc                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ksirc')

diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui
index d3b4db06..e8ae7e8f 100644
--- a/ksirc/KSPrefs/page_generalbase.ui
+++ b/ksirc/KSPrefs/page_generalbase.ui
@@ -101,7 +101,7 @@
                                 <string>unlimited</string>
                             </property>
                             <property name="maxValue">
-                                <number>1000</number>
+                                <number>10000</number>
                             </property>
                             <property name="toolTip" stdset="0">
                                 <string>Stores up to this many lines of chat from each window as history</string>
diff --git a/ksirc/dsirc b/ksirc/dsirc
index c6e0b63c..f358fcd7 100755
--- a/ksirc/dsirc
+++ b/ksirc/dsirc
@@ -114,8 +114,8 @@ $set{"IRCNAME"}=$opt_i || $ENV{"SIRCNAME"} || $ENV{"IRCNAME"} || "sirc user";
 $nick=$opt_n || $ARGV[0] || $ENV{"SIRCNICK"} || $ENV{"IRCNICK"} || $username;
 $set{"FINGER"}=$ENV{"IRCFINGER"} || "keep your fingers to yourself";
 $set{"USERINFO"}=$ENV{"USERINFO"} || "yep, I'm a user";
-if ($server =~ /^\[([^\]]+)\]:([0-9]*):?([^:]*)$/
-    or $server =~ /^([^:]+):([0-9]*):?([^:]*)$/)
+if ($server =~ /^\[([^\]]+)\]:([0-9]*):?(.*)$/
+    or $server =~ /^([^:]+):([0-9]*):?(.*)$/)
 {
 	($server, $port, $pass)=($1, $2, $3);
 }
-- 
cgit v1.2.1