[Konversation-devel] [Bug 134132] konversationircprotocolhandler uses bashism and wrong (changed) dcop

[Eike Hein]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=134132         
sho eikehein com changed:

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



------- Additional Comments From sho eikehein com  2006-09-15 20:09 -------
SVN commit 584880 by hein:

Change the protocol handler to use the new DCOP interface
and don't hand bashisms to /bin/sh. Patch by Tom Vollerthun.
BUG:134132


 M  +2 -0      ChangeLog  
 M  +1 -1      src/commit.h  
 M  +3 -5      src/konversationircprotocolhandler  


--- trunk/extragear/network/konversation/ChangeLog #584879:584880
 @ -3,6 +3,8  @
 - Fix dcop irc::setBack.
 - Don't treat & in tab names as accels in treelist items.
 - Fix ignoring nicknames with [ or ] in them.
+- Make protocol handler work with the changed DCOP interface,
+  don't hand bashism to sh.
 
 -------------------------------------------------------------------------------
 
--- trunk/extragear/network/konversation/src/commit.h #584879:584880
 @ -1,4 +1,4  @
 // This COMMIT number is added to version string to be used as "patch level"
 #ifndef COMMIT
-#define COMMIT 3173
+#define COMMIT 3174
 #endif
--- trunk/extragear/network/konversation/src/konversationircprotocolhandler #584879:584880
 @ -1,4 +1,4  @
-#!/bin/sh
+#!/bin/bash
 # Copyright 2004-2005 by İsmail Dönmez <ismail kde org tr>
 
 # A script for Konversation to call connectToServer for each instance of Konversation.
 @ -13,12 +13,10  @
 
 if test -z "$port";then port=6667;fi;
 
-if test ! ${channel:0:1} == '#' && test ! -z $channel ;then channel="#"$channel;fi 
+if test ! ${channel:0:1} == '#' && test ! -z $channel ;then channel="#"$channel;fi
 
 if [ `pidof konversation` ]; then
-    dcop konversation Konversation connectToServer $server $port "$channel" "$password"
+    dcop konversation default connectToServer $server $port "$channel" "$password"
 else
     konversation --server $server --port $port --channel "$channel" --password "$password"
 fi
-
-