[Tkabber-dev] r1073 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Mar 30 13:47:05 MSD 2007


Author: sergei
Date: 2007-03-30 13:47:04 +0400 (Fri, 30 Mar 2007)
New Revision: 1073

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/splash.tcl
   trunk/tkabber/tkabber.tcl
Log:
	* splash.tcl, tkabber.tcl: Override bgerror even if splash screen is
	  not used. Also, don't show the second error message if the previous
	  one is shown.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-03-29 19:44:20 UTC (rev 1072)
+++ trunk/tkabber/ChangeLog	2007-03-30 09:47:04 UTC (rev 1073)
@@ -1,3 +1,9 @@
+2007-03-30  Sergei Golovan  <sgolovan at nes.ru>
+
+	* splash.tcl, tkabber.tcl: Override bgerror even if splash screen is
+	  not used. Also, don't show the second error message if the previous
+	  one is shown.
+
 2007-03-29  Sergei Golovan  <sgolovan at nes.ru>
 
 	* msgs/de.msg: Updated German translation (thanks to Roger

Modified: trunk/tkabber/splash.tcl
===================================================================
--- trunk/tkabber/splash.tcl	2007-03-29 19:44:20 UTC (rev 1072)
+++ trunk/tkabber/splash.tcl	2007-03-30 09:47:04 UTC (rev 1073)
@@ -9,6 +9,11 @@
 auto_load bgerror
 rename bgerror bgerror_default
 proc bgerror {msg} {
+    if {[winfo exists .bgerrorDialog]} {
+	# If there's another error message around then don't report the
+	# next error (questionnable).
+	return
+    }
     if {[winfo exists .splash]} {
 	wm withdraw .splash
     }
@@ -19,6 +24,10 @@
     }
 }
 
+if {[info exists show_splash_window] && !$show_splash_window} {
+    return
+}
+
 proc splash_start {{aboutP 0}} {
     global splash_count splash_image splash_info splash_max splash_text
     global tkabber_version toolkit_version

Modified: trunk/tkabber/tkabber.tcl
===================================================================
--- trunk/tkabber/tkabber.tcl	2007-03-29 19:44:20 UTC (rev 1072)
+++ trunk/tkabber/tkabber.tcl	2007-03-30 09:47:04 UTC (rev 1073)
@@ -209,11 +209,8 @@
 }
 if {[xmppmime::is_done]} exit
 
-if {![info exists show_splash_window] || $show_splash_window} {
-    load_source splash.tcl
-}
+load_source splash.tcl
 
-
 proc ::LOG {text} {
     debugmsg jlib $text
 }



More information about the Tkabber-dev mailing list