changeset 88:090e28908f09

apply strip_markup() to wassr too.
author Yoshiki Yazawa <yaz@honeyplnaet.jp>
date Sun, 06 Jul 2008 16:22:05 +0900
parents 76e5611910c5
children 0fb9c9d152ef
files pidgin-twitter.c
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin-twitter.c	Sun Jul 06 15:57:34 2008 +0900
+++ b/pidgin-twitter.c	Sun Jul 06 16:22:05 2008 +0900
@@ -462,24 +462,28 @@
               void *data)
 {
     int utflen, bytes;
-
+    gboolean twitter_ac = FALSE, wassr_ac = FALSE;
     twitter_debug("called\n");
 
-    if(is_wassr_account(account, recipient)) {
+    twitter_ac = is_twitter_account(account, recipient);
+    wassr_ac   = is_wassr_account(account, recipient);
+
+    if(wassr_ac) {
         /* store sending message to address parrot problem */
         g_strlcpy(wassr_post, *buffer, WASSR_POST_LEN);
         twitter_debug("parrot pushed:%s\n", *buffer);
     }
 
-    /* check if the message is from twitter */
-    if(!is_twitter_account(account, recipient))
+    /* strip all markups */
+    if(twitter_ac || wassr_ac)
+        strip_markup(buffer);
+
+    /* return here if the message is not to twitter */
+    if(!twitter_ac)
         return FALSE;
 
-    /* strip all markups */
-    strip_markup(buffer);
-
     /* escape pseudo command */
-    if(is_twitter_account(account, recipient) &&
+    if(twitter_ac &&
        purple_prefs_get_bool(OPT_ESCAPE_PSEUDO)) {
         escape(buffer);
     }