diff main.c @ 340:2b79bad516e6

- removed the evil hack - twitter no longer requires preceding white space on a hash tag

--- a/main.c	Sun Oct 18 13:30:48 2009 +0900
+++ b/main.c	Sun Oct 18 16:55:57 2009 +0900
@@ -228,7 +228,6 @@
     else if(which == SENDER_FFEED) {
         gchar *match1 = g_match_info_fetch(match_info, 1); /* preceding CR|LF */
         gchar *match2 = g_match_info_fetch(match_info, 2); /* sender */
-
         g_snprintf(sub, SUBST_BUF_SIZE, SENDER_FORMAT_FFEED, match1 ? match1: "", match2, match2);
 
         g_free(match1);
@@ -237,25 +236,15 @@
     else if(which == CHANNEL_WASSR && service == wassr_service) {
         gchar *match1 = g_match_info_fetch(match_info, 1); /* before channel */
         gchar *match2 = g_match_info_fetch(match_info, 2); /* channel */
-
         g_snprintf(sub, SUBST_BUF_SIZE, CHANNEL_FORMAT_WASSR, match1 ? match1: "", match2, match2);
 
         g_free(match1);
         g_free(match2);
     }
     else if(which == TAG_TWITTER && service == twitter_service) {
-        gchar *match1 = g_match_info_fetch(match_info, 1); /* white space */
-        gchar *match2 = g_match_info_fetch(match_info, 2); /* search tag */
-
-        /* search tag ambiguity hack */
-        gchar *last;
-        last = match2 + strlen(match2) - 1;
-        if(g_ascii_ispunct(*last))
-            *last = '\0';
-
-        g_snprintf(sub, SUBST_BUF_SIZE, TAG_FORMAT_TWITTER, match1 ? match1: "", match2, match2);
-        g_free(match1);
-        g_free(match2);
+        gchar *match = g_match_info_fetch(match_info, 1); /* search tag */
+        g_snprintf(sub, SUBST_BUF_SIZE, TAG_FORMAT_TWITTER, match, match);
+        g_free(match);
     }
     else if(which == TAG_IDENTICA && service == identica_service) {
         gchar *match = g_match_info_fetch(match_info, 1);