diff pidgin-twitter.h @ 98:e460e1978ca3

- fixed a bug introduced in r97. - trimmed unnecessary debug messages.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 10 Jul 2008 20:26:22 +0900
parents 24ad534e438e
children f207cc8da6cd
line wrap: on
line diff
--- a/pidgin-twitter.h	Thu Jul 10 19:41:26 2008 +0900
+++ b/pidgin-twitter.h	Thu Jul 10 20:26:22 2008 +0900
@@ -56,10 +56,10 @@
 #define SENDER_FORMAT_WASSR     "%s<a href='http://wassr.jp/user/%s'>%s</a>: "
 #define RECIPIENT_FORMAT_IDENTICA "@<a href='http://identi.ca/%s'>%s</a>"
 #define SENDER_FORMAT_IDENTICA  "%s<a href='http://identi.ca/%s'>%s</a>: "
+#define CHANNEL_FORMAT_WASSR    "%s<a href='http://wassr.jp/channel/%s'>%s</a> "
 #define DEFAULT_LIST            "(list of users: separated with ' ,:;')"
 #define OOPS_MESSAGE            "<body>Oops! Your update was over 140 characters. We sent the short version to your friends (they can view the entire update on the web).<BR></body>"
 #define EMPTY                   ""
-#define CHANNEL_FORMAT_WASSR    "#<a href='http://wassr.jp/channel/%s'>%s</a> "
 
 /* patterns */
 #define P_RECIPIENT        "@([A-Za-z0-9_]+)"
@@ -69,7 +69,7 @@
 #define P_USER             "^\\(.+?\\)\\s*([A-Za-z0-9_]+):"
 #define P_USER_FIRST_LINE  "^\\(.+?\\)\\s*.+:\\s*([A-Za-z0-9_]+):"
 #define P_USER_FORMATTED   "^.*?<a .+?>([A-Za-z0-9_]+)</a>:"
-#define P_CHANNEL          "^.*?<a .+?>(?:[A-Za-z0-9_]+)</a>: #([A-Za-z0-9_]+) "
+#define P_CHANNEL          "^(.*?<a .+?>[A-Za-z0-9_]+</a>: #)([A-Za-z0-9_]+) "
 
 /* debug macros */
 #define twitter_debug(fmt, ...)	purple_debug(PURPLE_DEBUG_INFO, PLUGIN_NAME, "%s():%4d:  " fmt, __FUNCTION__, (int)__LINE__, ## __VA_ARGS__);