[Tkabber-dev] r773 - in trunk/tkabber: . plugins/chat

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Oct 28 00:13:10 MSD 2006


Author: sergei
Date: 2006-10-28 00:13:03 +0400 (Sat, 28 Oct 2006)
New Revision: 773

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/chat/irc_commands.tcl
   trunk/tkabber/plugins/chat/logger.tcl
Log:
	* plugins/chat/irc_commands.tcl: Fixed bug with joining conference
	  room from private chat window/tab.

	* plugins/chat/logger.tcl: Do not try to open log files when they
	  do not exist.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2006-10-25 19:39:14 UTC (rev 772)
+++ trunk/tkabber/ChangeLog	2006-10-27 20:13:03 UTC (rev 773)
@@ -1,3 +1,11 @@
+2006-10-27  Sergei Golovan  <sgolovan at nes.ru>
+
+	* plugins/chat/irc_commands.tcl: Fixed bug with joining conference
+	  room from private chat window/tab.
+
+	* plugins/chat/logger.tcl: Do not try to open log files when they
+	  do not exist.
+
 2006-10-25  Sergei Golovan  <sgolovan at nes.ru>
 
 	* jabberlib-tclxml/jlibsasl.tcl: Worked around bug 1545306 in

Modified: trunk/tkabber/plugins/chat/irc_commands.tcl
===================================================================
--- trunk/tkabber/plugins/chat/irc_commands.tcl	2006-10-25 19:39:14 UTC (rev 772)
+++ trunk/tkabber/plugins/chat/irc_commands.tcl	2006-10-27 20:13:03 UTC (rev 773)
@@ -96,9 +96,14 @@
 		    set room $room@[server_from_jid $jid]
 		}
 	    }
+	    if {[catch {
+		     get_our_groupchat_nick [chat::chatid $connid $room]
+		 } nick]} {
+		set nick [get_group_nick $room $::gr_nick]
+	    }
 	    muc::join_group $connid \
 			    $room \
-			    [get_our_groupchat_nick $chatid] \
+			    $nick \
 			    $password
 	    debugmsg plugins "JOIN: $room"
 	}

Modified: trunk/tkabber/plugins/chat/logger.tcl
===================================================================
--- trunk/tkabber/plugins/chat/logger.tcl	2006-10-25 19:39:14 UTC (rev 772)
+++ trunk/tkabber/plugins/chat/logger.tcl	2006-10-27 20:13:03 UTC (rev 773)
@@ -288,15 +288,12 @@
 	set filename $logfile
     } else {
 	set filename [file join \
-			  [file dirname $logfile] \
-			  $month \
-			  [file tail $logfile]]
-	if {![file exists $filename]} {
-	    unset filename
-	}
+			   [file dirname $logfile] \
+			   $month \
+			   [file tail $logfile]]
     }
 
-    if {[info exists filename]} {
+    if {[file exists $filename]} {
 	set fd [open $filename r]
 	fconfigure $fd -encoding utf-8
 	set hist [read $fd]



More information about the Tkabber-dev mailing list