Mercurial > pidgin.yaz
diff libpurple/protocols/toc/toc.c @ 25440:5725b3190905
Fix compile errors from the merge. Untested protocols: msnp9, sametime,
silc, silc10, zephyr. Also, toc doesn't work either, but I don't know how
to fix it.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 02 Mar 2009 06:17:44 +0000 |
| parents | e0bcb8cfda74 |
| children |
line wrap: on
line diff
--- a/libpurple/protocols/toc/toc.c Mon Mar 02 04:38:05 2009 +0000 +++ b/libpurple/protocols/toc/toc.c Mon Mar 02 06:17:44 2009 +0000 @@ -119,7 +119,7 @@ #define TOC_CONNECT_STEPS 3 -static void toc_login_callback(gpointer, gint, PurpleInputCondition); +static void toc_login_callback(gpointer, gint, const gchar *); static void toc_callback(gpointer, gint, PurpleInputCondition); /* ok. this function used to take username/password, and return 0 on success. @@ -152,7 +152,7 @@ } } -static void toc_login_callback(gpointer data, gint source, PurpleInputCondition cond) +static void toc_login_callback(gpointer data, gint source, const gchar *error_message) { PurpleConnection *gc = data; struct toc_data *tdt; @@ -260,7 +260,8 @@ } } -char *escape_message(const char *msg) +static char * +escape_message(const char *msg) { char *ret; int i, j; @@ -305,7 +306,8 @@ * Duplicates the input string, replacing each \n with a <BR>, and * escaping a few other characters. */ -char *escape_text(const char *msg) +static char * +escape_text(const char *msg) { char *ret; int i, j; @@ -435,7 +437,7 @@ if (buflen < ntohs(hdr->len)) { /* fake like there's a read error */ purple_debug(PURPLE_DEBUG_ERROR, "toc", - "buffer too small (have %d, need %d)\n", + "buffer too small (have %" G_GSIZE_FORMAT ", need %d)\n", buflen, ntohs(hdr->len)); return -1; }