Created
October 11, 2013 06:02
-
-
Save aniline/6930208 to your computer and use it in GitHub Desktop.
Patch to rvp.c from http://www.waider.ie/hacks/workshop/c/rvp/librvp-0.9.7.tar.gz for use at work.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/rvp.c b/rvp.c | |
index 5d7cddc..caf4ba9 100644 | |
--- a/rvp.c | |
+++ b/rvp.c | |
@@ -4684,9 +4684,20 @@ static rvp_st_ret rvp_send_typing( GaimConnection *gc, const char *who, | |
/* | |
* send an instant message | |
*/ | |
-static int rvp_send_im( GaimConnection *gc, const char *who, | |
- const char *message, GaimMessageFlags flags ) { | |
- return rvp_send_notify( gc, who, RVP_MSG_IM, (gchar *)message, &flags ); | |
+static int rvp_send_im(GaimConnection *gc, const char *who, | |
+ const char *message, GaimMessageFlags flags ) | |
+{ | |
+ int rc; | |
+ char *text = purple_unescape_html(message); | |
+#define BAD_TRAILER " \t \t\t\t\t \t \t \t \t \t \t \t\t \t " | |
+ char *bad_trailer = strstr(text, BAD_TRAILER); | |
+/* printf("Orig = \"%s\"\n", text); */ | |
+ if (bad_trailer) | |
+ *bad_trailer = '\0'; | |
+/* printf("Mod = \"%s\"\n", text); */ | |
+ rc = rvp_send_notify( gc, who, RVP_MSG_IM, (gchar *)text, &flags ); | |
+ g_free(text); | |
+ return rc; | |
} | |
/* | |
@@ -5380,12 +5391,13 @@ static void url_fetched_cb_cond( gpointer url_data, gint sock, | |
return; | |
} | |
- if ( read( sock, &data, 1 ) > 0 || errno == EWOULDBLOCK ) { | |
- if ( errno == EWOULDBLOCK ) { | |
+ rc = read( sock, &data, 1 ); | |
+ if ((rc == -1) && (errno == EWOULDBLOCK)) | |
+ { | |
errno = 0; | |
return; | |
- } | |
- | |
+ } | |
+ else if (rc > 0) { | |
gfud->len++; | |
if (gfud->len == gfud->data_len + 1) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment