[Tkabber-dev] r1980 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Sep 26 16:31:10 MSD 2011


Author: sergei
Date: 2011-09-26 16:31:10 +0400 (Mon, 26 Sep 2011)
New Revision: 1980

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/muc.tcl
   trunk/tkabber/pixmaps.tcl
Log:
	* muc.tcl: Normalized group JID before activating its chat window
	  (thanks to Vitaly Takmazov).

	* pixmaps.tcl: Don't catch the error on loading the default pixmaps
	  theme.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2011-03-06 06:05:47 UTC (rev 1979)
+++ trunk/tkabber/ChangeLog	2011-09-26 12:31:10 UTC (rev 1980)
@@ -1,3 +1,11 @@
+2011-09-26  Sergei Golovan  <sgolovan at nes.ru>
+
+	* muc.tcl: Normalized group JID before activating its chat window
+	  (thanks to Vitaly Takmazov).
+
+	* pixmaps.tcl: Don't catch the error on loading the default pixmaps
+	  theme.
+
 2011-03-06  Sergei Golovan  <sgolovan at nes.ru>
 
 	* msgs/de.msg: Updated German translation (thanks to Roger Sondermann).

Modified: trunk/tkabber/muc.tcl
===================================================================
--- trunk/tkabber/muc.tcl	2011-03-06 06:05:47 UTC (rev 1979)
+++ trunk/tkabber/muc.tcl	2011-09-26 12:31:10 UTC (rev 1980)
@@ -728,7 +728,7 @@
 
     join_group $xlib $group $nick $password
 
-    chat::activate [chat::chatid $xlib $group]
+    chat::activate [chat::chatid $xlib [::xmpp::jid::normalize $group]]
 }
 
 proc muc::join_group {xlib group nick {password ""} {retries 2}} {

Modified: trunk/tkabber/pixmaps.tcl
===================================================================
--- trunk/tkabber/pixmaps.tcl	2011-03-06 06:05:47 UTC (rev 1979)
+++ trunk/tkabber/pixmaps.tcl	2011-09-26 12:31:10 UTC (rev 1980)
@@ -50,9 +50,7 @@
 proc pixmaps::load_stored_theme {args} {
     variable options
 
-    catch {
-	load_theme $options(pixmaps_theme)
-    }
+    load_theme $options(pixmaps_theme)
 
     hook::run set_theme_hook
 }
@@ -122,7 +120,7 @@
     variable themes
 
     load_dir $themes(Default)
-    load_dir $themes($theme)
+    catch { load_dir $themes($theme) }
 }
 
 ###############################################################################



More information about the Tkabber-dev mailing list