# HG changeset patch # User Mark Doliner # Date 1057898320 0 # Node ID 6e24de5efdb2855b0c6ff3d56de3795c2126fc82 # Parent 8aad1be2e4d47a3d6e5a8c6a1cf5bc5e537e2248 [gaim-migrate @ 6546] "Man I'd like to violate her ANSI C" This should fix some odd tobase64edness. Thanks to Paco-Paco for telling us how to fix it 7 times. committer: Tailor Script diff -r 8aad1be2e4d4 -r 6e24de5efdb2 doc/gaims_funniest_home_convos.txt --- a/doc/gaims_funniest_home_convos.txt Fri Jul 11 02:33:58 2003 +0000 +++ b/doc/gaims_funniest_home_convos.txt Fri Jul 11 04:38:40 2003 +0000 @@ -237,3 +237,13 @@ (02:08:12) gobblegobble: whats a chicken head (02:08:24) RobFlynn: your mom + +--- + + I dislike the random capitalization utilized by fortunes + those aren't fortunes + those are yows + I don't know why lunix fortune gives back yows + Paco-Paco: I understand everything you just said + does it scare you? + Paco-Paco: You have no idea diff -r 8aad1be2e4d4 -r 6e24de5efdb2 src/protocols/trepia/trepia.c --- a/src/protocols/trepia/trepia.c Fri Jul 11 02:33:58 2003 +0000 +++ b/src/protocols/trepia/trepia.c Fri Jul 11 04:38:40 2003 +0000 @@ -690,7 +690,7 @@ } static gboolean -__parse_data(TrepiaSession *session, char *buf) +_parse_data(TrepiaSession *session, char *buf) { GHashTable *info; GaimAccount *account; @@ -991,7 +991,7 @@ } static void -__data_cb(gpointer data, gint source, GaimInputCondition cond) +_data_cb(gpointer data, gint source, GaimInputCondition cond) { TrepiaSession *session = data; int i = 0; @@ -1038,7 +1038,7 @@ gaim_debug(GAIM_DEBUG_MISC, "trepia", "S: %s\n", buffer); - ret = __parse_data(session, buffer); + ret = _parse_data(session, buffer); g_free(buffer); } @@ -1113,7 +1113,7 @@ g_free(buffer); session->gc->inpa = gaim_input_add(session->fd, GAIM_INPUT_READ, - __data_cb, session); + _data_cb, session); } static void diff -r 8aad1be2e4d4 -r 6e24de5efdb2 src/util.c --- a/src/util.c Fri Jul 11 02:33:58 2003 +0000 +++ b/src/util.c Fri Jul 11 04:38:40 2003 +0000 @@ -323,7 +323,7 @@ char *tobase64(const unsigned char *buf, size_t len) { char *s = NULL, *rv = NULL; - unsigned char tmp; + unsigned long tmp; s = g_malloc((4 * (len + 1)) / 3 + 1);