[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 57178] a leading " /" makes the string appear in the wrong
From:       Andrew Stanley-Jones <asj () cban ! com>
Date:       2003-04-17 2:27:52
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=57178     
asj@cban.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From asj@cban.com  2003-04-17 04:27 -------
Subject: kdenetwork/ksirc

CVS commit by asj: 

This is a few clean ups of some really fugly code to it right.

It also happens to fix bug 57178.

CCMAIL: 57178-done@bugs.kde.org


  M +4 -3      dsirc   1.69
  M +8 -8      toplevel.cpp   1.275


--- kdenetwork/ksirc/dsirc  #1.68:1.69
@@ -1653,10 +1653,11 @@
   } elsif ($cmd eq 'JOIN' || $cmd eq 'J') {
     $args=$invited if $args eq '';
-    unless ($args =~ /^[\#\&\+]/) {
-      $args='#'.$args;
+    if ($args !~ /^[\#\&\+]/) {
+      $query = $args;
     }
-    if (grep(&eq($_, $args), @channels)) {
+    elsif (grep(&eq($_, $args), @channels)) {
 #      &tell("*** Talking to $args now"); # KSIRC MOD
       $talkchannel=$args;
+      $query = "";
       &dostatus;
     } else {

--- kdenetwork/ksirc/toplevel.cpp  #1.274:1.275
@@ -1163,12 +1163,12 @@ void KSircTopLevel::gotFocus()
     if(isVisible() == TRUE){
         if(have_focus == 0){
-            if(m_channelInfo.channel()[0] == '#' || m_channelInfo.channel()[0] == \
                '&'){
-                QString str = QString("/join %1 \
                %2\n").arg(m_channelInfo.channel()).arg(m_channelInfo.key());
-                emit outputUnicodeLine(str);
-                emit outputLine("/eval $query=''\n");
+            if(m_channelInfo.channel()[0] != '!' ){
+                QString str = QString("/join %1").arg(m_channelInfo.channel());
+                if(m_channelInfo.key().length() > 0){
+                    str.append(" " + m_channelInfo.key());
             }
-            else if (m_channelInfo.channel()[0] != '!')
-            {
-                emit outputUnicodeLine(QString("/eval \
$query='%1'\n").arg(m_channelInfo.channel())); +                str.append("\n");
+
+                emit outputUnicodeLine(str);
             }
             have_focus = 1;


[prev in list] [next in list] [prev in thread] [next in thread]