[Tkabber-dev] [tclxmpp] r139 committed - * xmpp/annotations.tcl, xmpp/blocking.tcl, xmpp/bob.tcl, ...

tclxmpp at googlecode.com tclxmpp at googlecode.com
Sat Jan 23 17:47:55 MSK 2010


Revision: 139
Author: sgolovan
Date: Sat Jan 23 06:47:26 2010
Log: 	* xmpp/annotations.tcl, xmpp/blocking.tcl, xmpp/bob.tcl,
	  xmpp/bookmarks.tcl, xmpp/delimiter.tcl, xmpp/disco.tcl,
	  xmpp/metacontacts.tcl, xmpp/ping.tcl, xmpp/privacy.tcl,
	  xmpp/private.tcl, xmpp/roster.tcl, xmpp/xmpp.tcl: Removed useless
	  errorcodes from error returns.

	* xmpp/auth.tcl, xmpp/disco.tcl, xmpp/register.tcl, xmpp/search.tcl,
	  xmpp/starttls.tcl: Fixed labels (capitalization) and error messages
	  which are displayed to a user.

http://code.google.com/p/tclxmpp/source/detail?r=139

Modified:
  /trunk/ChangeLog
  /trunk/xmpp/annotations.tcl
  /trunk/xmpp/auth.tcl
  /trunk/xmpp/blocking.tcl
  /trunk/xmpp/bob.tcl
  /trunk/xmpp/bookmarks.tcl
  /trunk/xmpp/delimiter.tcl
  /trunk/xmpp/disco.tcl
  /trunk/xmpp/metacontacts.tcl
  /trunk/xmpp/ping.tcl
  /trunk/xmpp/privacy.tcl
  /trunk/xmpp/private.tcl
  /trunk/xmpp/register.tcl
  /trunk/xmpp/roster.tcl
  /trunk/xmpp/search.tcl
  /trunk/xmpp/starttls.tcl
  /trunk/xmpp/xmpp.tcl

=======================================
--- /trunk/ChangeLog	Sat Jan 23 00:12:12 2010
+++ /trunk/ChangeLog	Sat Jan 23 06:47:26 2010
@@ -6,6 +6,16 @@
  	* xmpp/jid.tcl, doc/xmpp_jid.man: Renamed stripResource procedure to
  	  bareJid. The former name is retained for backward compatibility.

+	* xmpp/annotations.tcl, xmpp/blocking.tcl, xmpp/bob.tcl,
+	  xmpp/bookmarks.tcl, xmpp/delimiter.tcl, xmpp/disco.tcl,
+	  xmpp/metacontacts.tcl, xmpp/ping.tcl, xmpp/privacy.tcl,
+	  xmpp/private.tcl, xmpp/roster.tcl, xmpp/xmpp.tcl: Removed useless
+	  errorcodes from error returns.
+
+	* xmpp/auth.tcl, xmpp/disco.tcl, xmpp/register.tcl, xmpp/search.tcl,
+	  xmpp/starttls.tcl: Fixed labels (capitalization) and error messages
+	  which are displayed to a user.
+
  2010-01-18  Sergei Golovan  <sgolovan at nes.ru>

  	* xmpp/privacy.tcl: Fixed processing server replies in synchronous mode
=======================================
--- /trunk/xmpp/annotations.tcl	Sun Feb 15 11:18:56 2009
+++ /trunk/xmpp/annotations.tcl	Sat Jan 23 06:47:26 2010
@@ -32,7 +32,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -138,7 +138,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/auth.tcl	Tue Dec 29 05:00:26 2009
+++ /trunk/xmpp/auth.tcl	Sat Jan 23 06:47:26 2010
@@ -256,7 +256,7 @@
                                         -cdata $state(-username)]]

      ::xmpp::CallBack $xlib \
-                     status [::msgcat::mc "Waiting for non-SASL \
+                     status [::msgcat::mc "Waiting for non-SASL\
                                             authentication fields"]

      set state(id) \
=======================================
--- /trunk/xmpp/blocking.tcl	Mon Jan  4 06:58:37 2010
+++ /trunk/xmpp/blocking.tcl	Sat Jan 23 06:47:26 2010
@@ -47,7 +47,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -146,14 +146,14 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }

      if {[llength $items] == 0} {
          return -code error \
-               -errorcode [::msgcat::mc "Nothing to block"]
+               [::msgcat::mc "Nothing to block"]
      }

      ::xmpp::sendIQ $xlib set \
@@ -236,7 +236,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -302,7 +302,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/bob.tcl	Fri Mar 13 06:55:23 2009
+++ /trunk/xmpp/bob.tcl	Sat Jan 23 06:47:26 2010
@@ -129,7 +129,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -183,7 +183,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/bookmarks.tcl	Sun Feb 15 11:18:56 2009
+++ /trunk/xmpp/bookmarks.tcl	Sat Jan 23 06:47:26 2010
@@ -32,7 +32,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -152,7 +152,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/delimiter.tcl	Sun Feb 15 11:18:56 2009
+++ /trunk/xmpp/delimiter.tcl	Sat Jan 23 06:47:26 2010
@@ -36,7 +36,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -97,7 +97,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/disco.tcl	Sun Oct 18 04:39:10 2009
+++ /trunk/xmpp/disco.tcl	Sat Jan 23 06:47:26 2010
@@ -57,7 +57,7 @@
              default {
                  unset state
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -109,13 +109,13 @@
                      set cache 1
                  } elseif {![string is false -strict $val]} {
                      return -code error \
-                           -errorcode [::msgcat::mc "Illegal option \"%s\"  
value \"%s\",\
-                                                     boolean expected"  
$key $val]
+                           [::msgcat::mc "Illegal value \"%s\" for option\
+                                          \"%s\", boolean expected" $val  
$key]
                  }
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -257,13 +257,13 @@
                      set cache 1
                  } elseif {![string is false -strict $val]} {
                      return -code error \
-                           -errorcode [::msgcat::mc "Illegal option \"%s\"  
value \"%s\",\
-                                                     boolean expected"  
$key $val]
+                           [::msgcat::mc "Illegal value \"%s\" for option\
+                                          \"%s\", boolean expected" $val  
$key]
                  }
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -467,7 +467,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/metacontacts.tcl	Sun Feb 15 11:18:56 2009
+++ /trunk/xmpp/metacontacts.tcl	Sat Jan 23 06:47:26 2010
@@ -32,7 +32,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -118,7 +118,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/ping.tcl	Tue Aug 11 13:01:22 2009
+++ /trunk/xmpp/ping.tcl	Sat Jan 23 06:47:26 2010
@@ -51,7 +51,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -115,7 +115,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/privacy.tcl	Mon Jan 18 06:30:49 2010
+++ /trunk/xmpp/privacy.tcl	Sat Jan 23 06:47:26 2010
@@ -59,7 +59,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -189,7 +189,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -370,7 +370,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -512,7 +512,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -620,7 +620,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -718,7 +718,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/private.tcl	Wed Feb 11 09:23:11 2009
+++ /trunk/xmpp/private.tcl	Sat Jan 23 06:47:26 2010
@@ -30,7 +30,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -66,7 +66,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/register.tcl	Sat Jan 23 00:12:12 2010
+++ /trunk/xmpp/register.tcl	Sat Jan 23 06:47:26 2010
@@ -22,9 +22,9 @@
      array set labels [list username [::msgcat::mc "Username"] \
                             nick     [::msgcat::mc "Nickname"] \
                             password [::msgcat::mc "Password"] \
-                           name     [::msgcat::mc "Full Name"] \
-                           first    [::msgcat::mc "First Name"] \
-                           last     [::msgcat::mc "Last Name"] \
+                           name     [::msgcat::mc "Full name"] \
+                           first    [::msgcat::mc "First name"] \
+                           last     [::msgcat::mc "Last name"] \
                             email    [::msgcat::mc "E-mail"] \
                             address  [::msgcat::mc "Address"] \
                             city     [::msgcat::mc "City"] \
=======================================
--- /trunk/xmpp/roster.tcl	Mon Feb 23 06:48:06 2009
+++ /trunk/xmpp/roster.tcl	Sat Jan 23 06:47:26 2010
@@ -41,7 +41,7 @@
              default {
                  unset state
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -123,7 +123,7 @@
          }
          default {
              return -code error \
-                   -errorcode [::msgcat::mc "Illegal option \"%s\"" $key]
+                   [::msgcat::mc "Illegal option \"%s\"" $key]
          }
      }
  }
@@ -178,7 +178,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
@@ -211,7 +211,7 @@
              }
              default {
                  return -code error \
-                       -errorcode [::msgcat::mc "Illegal option \"%s\""  
$key]
+                       [::msgcat::mc "Illegal option \"%s\"" $key]
              }
          }
      }
=======================================
--- /trunk/xmpp/search.tcl	Sat Jan 23 00:12:12 2010
+++ /trunk/xmpp/search.tcl	Sat Jan 23 06:47:26 2010
@@ -20,8 +20,8 @@
      # Search fields (see XEP-0055)

      array set labels [list jid   [::msgcat::mc "Jabber ID"] \
-                           first [::msgcat::mc "First Name"] \
-                           last  [::msgcat::mc "Last Name"] \
+                           first [::msgcat::mc "First name"] \
+                           last  [::msgcat::mc "Last name"] \
                             nick  [::msgcat::mc "Nickname"] \
                             email [::msgcat::mc "E-mail"]]
  }
=======================================
--- /trunk/xmpp/starttls.tcl	Fri Jan  8 05:36:26 2010
+++ /trunk/xmpp/starttls.tcl	Sat Jan 23 06:47:26 2010
@@ -245,7 +245,7 @@
      if {!$starttlsFeature} {
          Finish $token error \
                 [::xmpp::stanzaerror::error modify not-acceptable -text \
-                     [::msgcat::mc "Server haven't provided STARTTLS  
feature"]]
+                     [::msgcat::mc "Server hasn't provided STARTTLS  
feature"]]
          return
      }

=======================================
--- /trunk/xmpp/xmpp.tcl	Tue Dec 29 12:10:12 2009
+++ /trunk/xmpp/xmpp.tcl	Sat Jan 23 06:47:26 2010
@@ -1846,8 +1846,7 @@
          }
          default {
              return -code error \
-                   -errorcode [::msgcat::mc "Usage: ::xmpp::Set xlib\
-                                             property ?value?"]
+                   [::msgcat::mc "Usage: ::xmpp::Set xlib  
property ?value?"]
          }
      }
  }


More information about the Tkabber-dev mailing list