[Tkabber-dev] r894 - in trunk/tkabber: . plugins/chat plugins/general plugins/unix

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Jan 31 10:36:19 MSK 2007


Author: sergei
Date: 2007-01-31 10:36:17 +0300 (Wed, 31 Jan 2007)
New Revision: 894

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/plugins/chat/update_tab.tcl
   trunk/tkabber/plugins/general/headlines.tcl
   trunk/tkabber/plugins/unix/wmdock.tcl
Log:
	* plugins/unix/wmdock.tcl: Fixed bug with processing messages from
	  chat history.

	* plugins/chat/update_tab.tcl: Don't update tab label color on
	  messages from chat history.

	* plugins/general/headlines.tcl: Fixed subject background definition.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-01-30 20:53:03 UTC (rev 893)
+++ trunk/tkabber/ChangeLog	2007-01-31 07:36:17 UTC (rev 894)
@@ -1,3 +1,13 @@
+2007-01-31  Sergei Golovan  <sgolovan at nes.ru>
+
+	* plugins/unix/wmdock.tcl: Fixed bug with processing messages from
+	  chat history.
+
+	* plugins/chat/update_tab.tcl: Don't update tab label color on
+	  messages from chat history.
+
+	* plugins/general/headlines.tcl: Fixed subject background definition.
+
 2007-01-30  Sergei Golovan  <sgolovan at nes.ru>
 
 	* ifacetk/iface.tcl: Fixed description.

Modified: trunk/tkabber/plugins/chat/update_tab.tcl
===================================================================
--- trunk/tkabber/plugins/chat/update_tab.tcl	2007-01-30 20:53:03 UTC (rev 893)
+++ trunk/tkabber/plugins/chat/update_tab.tcl	2007-01-31 07:36:17 UTC (rev 894)
@@ -9,6 +9,17 @@
     set jid [chat::get_jid $chatid]
     set cw [chat::winid $chatid]
 
+    foreach xelem $x {
+	jlib::wrapper:splitxml $xelem tag vars isempty chdata children
+	
+	# Don't update tab if this 'empty' tag is present. It indicates
+	# messages history in chat window.
+	if {[cequal $tag ""] && \
+		[cequal [jlib::wrapper:getattr $vars xmlns] tkabber:x:nolog]} {
+	    return
+	}
+    }
+
     if {![catch {::plugins::mucignore::is_ignored $connid $from $type} ignore] && \
 	    $ignore != ""} {
 	return

Modified: trunk/tkabber/plugins/general/headlines.tcl
===================================================================
--- trunk/tkabber/plugins/general/headlines.tcl	2007-01-30 20:53:03 UTC (rev 893)
+++ trunk/tkabber/plugins/general/headlines.tcl	2007-01-31 07:36:17 UTC (rev 894)
@@ -150,7 +150,7 @@
 			  -highlightthickness 0 \
 			  -relief flat \
 			  -state disabled \
-			  -background [option get $dw.subject background Frame]
+			  -background [lindex [$dw.subject configure -background] 4]
     pack $dw.subject -fill x
     pack $dw.subject.lsubj -side left
     pack $dw.subject.subj -side left -fill x -expand yes

Modified: trunk/tkabber/plugins/unix/wmdock.tcl
===================================================================
--- trunk/tkabber/plugins/unix/wmdock.tcl	2007-01-30 20:53:03 UTC (rev 893)
+++ trunk/tkabber/plugins/unix/wmdock.tcl	2007-01-31 07:36:17 UTC (rev 894)
@@ -7,7 +7,7 @@
 }
 
 namespace eval ::wmdock {
-    set save_status ""
+    set save_status unavailable
     set balloon_msg ""
     set msgs 0
     array set msgsc {}
@@ -40,7 +40,18 @@
     if {[chat::is_our_jid $chatid $from] || ![cequal $type chat]} {
 	return
     }
-    
+
+    foreach xelem $x {
+	jlib::wrapper:splitxml $xelem tag vars isempty chdata children
+	
+	# Don't count message if this 'empty' tag is present. It indicates
+	# messages history in chat window.
+	if {[cequal $tag ""] && \
+		[cequal [jlib::wrapper:getattr $vars xmlns] tkabber:x:nolog]} {
+	    return
+	}
+    }
+
     set cw [chat::winid $chatid]
     set page [crange [win_id tab $cw] 1 end]
     if {$::usetabbar && $page != [.nb raise]} {



More information about the Tkabber-dev mailing list