# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1211025912 -32400
# Node ID 31374ae054b0eb315243ecd302aa3723d637cab9
# Parent  8e1c8afac4dd15f6aec8393ddbf0f250432afd5a# Parent  34a9fb4b470188f6a395336c9c2d354009786543
branch merge

diff -r 8e1c8afac4dd -r 31374ae054b0 .hgtags
--- a/.hgtags	Sat May 17 21:03:17 2008 +0900
+++ b/.hgtags	Sat May 17 21:05:12 2008 +0900
@@ -1,3 +1,4 @@
 21f27858e155a47da0610e59d2bf9d24c6994c93 0.4.0
 3c45a1bc40a5fe5d0bb5abb79fcc05bed858789b 0.5.0
 73e817be32673bec2a7eca6a17f65035b25affe8 0.5.1
+872f418ba45d1b93358a65894262c7ccb65eac8c 0.6.0
diff -r 8e1c8afac4dd -r 31374ae054b0 README
--- a/README	Sat May 17 21:03:17 2008 +0900
+++ b/README	Sat May 17 21:05:12 2008 +0900
@@ -101,13 +101,15 @@
 Fixed a crash bug that each unload and reload pidgin-twitter cycle
 resulted in crash.
 
-0.6.0 (In near future in 2008)
-- Added letter counter.
-- Suppress "False positive oops message" when sending message which
-exceeds 140 bytes but actual length is within 140 characters.
-- pidgin-twitter now strips all markup elements on sending a
-message. This feature prevents this plugin from posting unexpected
-excessively markuped message.
+0.6.0 (May 16 2008)
+- Letter counter has been added.
+- Suppress "false positive oops message" when sending message which
+  exceeds 140 bytes but within 140 characters.
+- Pidgin-twitter now strips all markup elements from sending message.
+  This feature prevents this plugin from posting unexpected
+  excessively marked up message.
+- Since pidgin-twitter no longer sends any marked up message, all
+  markup widgets in conversation window has been disabled.
 
 
 6. Acknowledgments
@@ -119,8 +121,8 @@
 convcharcount plugin.
 
 In development for 0.6.0, mikanbako (@mikanbako) joined our team and
-contributed numerous efforts. The original strip markup feature has
-been developed by him.
+contributed numerous efforts. The original strip markup feature and
+the disable markup widgets feature has been developed by him.
 
 
 Yoshiki Yazawa (@yazuuchi) and the pidgin-twitter team
diff -r 8e1c8afac4dd -r 31374ae054b0 pidgin-twitter.c
--- a/pidgin-twitter.c	Sat May 17 21:03:17 2008 +0900
+++ b/pidgin-twitter.c	Sat May 17 21:05:12 2008 +0900
@@ -67,7 +67,7 @@
 
 /* debug macros */
 #define twitter_debug(fmt, ...)	purple_debug(PURPLE_DEBUG_INFO, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__);
-#define twitter_error(fmt, ...)	purple_debug(PURPLE_DEBUG_ERROR, PLUGIN_NAME, "%s():%4d:  " fmt, __FUCTION__, (int)__LINE__, ## __VA_ARGS__);
+#define twitter_error(fmt, ...)	purple_debug(PURPLE_DEBUG_ERROR, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__);
 
 
 /* globals */
@@ -591,7 +591,7 @@
     box = gtkconv->toolbar;
 
     /* Disable widgets that decorate or add link to composing text
-     * because Twitter can't receive markuped strings. For lean-view
+     * because Twitter cannot receive marked up string. For lean-view
      * and wide-view, see pidgin/gtkimhtmltoolbar.c.
      */
     menus = g_object_get_data(G_OBJECT(box), "lean-view");
@@ -900,9 +900,9 @@
     PLUGIN_ID,                  /**< id		*/
     "Pidgin-Twitter",           /**< name	*/
     "0.6.0",                    /**< version	*/
-    "replaces usernames with links and play sounds", /**  summary	*/
-    "replaces usernames with links and play sounds", /**  desc	*/
-    "Yoshiki Yazawa (yaz@honeyplanet.jp)",     /**< author	*/
+    "replaces usernames with links and plays sounds", /**  summary	*/
+    "replaces usernames with links and plays sounds", /**  desc	*/
+    "Yoshiki Yazawa and the pidging-twitter team",     /**< author	*/
     "http://www.honeyplanet.jp/",   /**< homepage	*/
     load_plugin,                /**< load	*/
     unload_plugin,              /**< unload	*/