Mercurial > pidgin.yaz
changeset 30382:fb2bf8986524
merge of 'bd7b70e38030da580a7bc922236ec504ecb8853b'
and 'c1573675765ce94fa58152c4fc2af225ff621d47'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 17 May 2010 08:04:50 +0000 |
| parents | c4a79df72560 (diff) 23dbe381eb7a (current diff) |
| children | 2a19f7385ba5 9de98679c02b |
| files | |
| diffstat | 9 files changed, 30 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/funniest_home_convos.txt Mon May 17 02:09:35 2010 +0000 +++ b/doc/funniest_home_convos.txt Mon May 17 08:04:50 2010 +0000 @@ -530,6 +530,17 @@ -- +(14:30:09) linux_user: i have a ? +(14:31:03) linux_user: when i install this on wine and run it it come up as + boxes on the screen +(14:31:26) nosnilmot: why on earth would you install Pidgin under wine? +(14:31:41) Err: heh +(14:31:48) Err: I think my brain just segfaulted on that +(14:31:58) linux_user: well i am on linux +(14:32:10) linux_user: linux mint and thay is the only way i can run it + +-- + 14:39 <rrobbertt> Does anyone know a way to get text to speech with pidgin? 14:41 <elb> do you want to be rooted sooner, or later? 14:42 <seanegan> good question"; rm -rf ~
--- a/libpurple/protocols/bonjour/jabber.c Mon May 17 02:09:35 2010 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Mon May 17 08:04:50 2010 +0000 @@ -386,7 +386,7 @@ BonjourBuddy *bb = NULL; const gchar *name = bconv->pb ? purple_buddy_get_name(bconv->pb) : "(unknown)"; - purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name); + purple_debug_info("bonjour", "Received conversation close notification from %s.\n", name); if(bconv->pb != NULL) bb = purple_buddy_get_protocol_data(bconv->pb); @@ -582,7 +582,7 @@ } /* This gets called when we've successfully sent our <stream:stream /> - * AND when we've recieved a <stream:stream /> */ + * AND when we've received a <stream:stream /> */ void bonjour_jabber_stream_started(BonjourJabberConversation *bconv) { if (bconv->sent_stream_start == NOT_SENT && !bonjour_jabber_send_stream_init(bconv, bconv->socket)) {
--- a/libpurple/protocols/irc/msgs.c Mon May 17 02:09:35 2010 +0000 +++ b/libpurple/protocols/irc/msgs.c Mon May 17 08:04:50 2010 +0000 @@ -851,7 +851,7 @@ } if (!convo) { - purple_debug(PURPLE_DEBUG_ERROR, "irc", "Recieved a KICK for unknown channel %s\n", args[0]); + purple_debug(PURPLE_DEBUG_ERROR, "irc", "Received a KICK for unknown channel %s\n", args[0]); g_free(nick); return; }
--- a/libpurple/protocols/mxit/chunk.h Mon May 17 02:09:35 2010 +0000 +++ b/libpurple/protocols/mxit/chunk.h Mon May 17 08:04:50 2010 +0000 @@ -42,7 +42,7 @@ #define CP_CHUNK_OFFER 0x06 /* (6) offer file */ #define CP_CHUNK_REJECT 0x07 /* (7) reject file */ #define CP_CHUNK_GET 0x08 /* (8) get file */ -#define CP_CHUNK_RECIEVED 0x09 /* (9) received file */ +#define CP_CHUNK_RECEIVED 0x09 /* (9) received file */ #define CP_CHUNK_DIRECT_SND 0x0A /* (10) send file direct */ #define CP_CHUNK_DIRECT_FWD 0x0B /* (11) forward file direct */ #define CP_CHUNK_SKIN 0x0C /* (12) MXit client skin */
--- a/libpurple/protocols/mxit/protocol.c Mon May 17 02:09:35 2010 +0000 +++ b/libpurple/protocols/mxit/protocol.c Mon May 17 08:04:50 2010 +0000 @@ -1183,7 +1183,7 @@ return; } - set_chunk_type( chunk, CP_CHUNK_RECIEVED ); + set_chunk_type( chunk, CP_CHUNK_RECEIVED ); set_chunk_length( chunk, size ); datalen += MXIT_CHUNK_HEADER_SIZE + size; @@ -1783,7 +1783,7 @@ /* this is a ack for a file send. no action is required */ break; - case CP_CHUNK_RECIEVED : + case CP_CHUNK_RECEIVED : /* this is a ack for a file received. no action is required */ break;
--- a/libpurple/protocols/oscar/family_icbm.c Mon May 17 02:09:35 2010 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Mon May 17 08:04:50 2010 +0000 @@ -1317,7 +1317,7 @@ channel = byte_stream_get16(bs); if (channel != 0x01) { - purple_debug_misc("oscar", "icbm: ICBM recieved on unsupported channel. Ignoring. (chan = %04x)\n", channel); + purple_debug_misc("oscar", "icbm: ICBM received on unsupported channel. Ignoring. (chan = %04x)\n", channel); return 0; }
--- a/libpurple/util.c Mon May 17 02:09:35 2010 +0000 +++ b/libpurple/util.c Mon May 17 08:04:50 2010 +0000 @@ -1308,12 +1308,17 @@ #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \ const char *o = c + strlen("<" x); \ const char *p = NULL, *q = NULL, *r = NULL; \ + /* o = iterating over full tag \ + * p = > (end of tag) \ + * q = start of quoted bit \ + * r = < inside tag \ + */ \ GString *innards = g_string_new(""); \ while(o && *o) { \ if(!q && (*o == '\"' || *o == '\'') ) { \ q = o; \ } else if(q) { \ - if(*o == *q) { \ + if(*o == *q) { /* end of quoted bit */ \ char *unescaped = g_strndup(q+1, o-q-1); \ char *escaped = g_markup_escape_text(unescaped, -1); \ g_string_append_printf(innards, "%c%s%c", *q, escaped, *q); \ @@ -1333,7 +1338,7 @@ } \ o++; \ } \ - if(p && !r) { \ + if(p && !r) { /* got an end of tag and no other < earlier */\ if(*(p-1) != '/') { \ struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); \ pt->src_tag = x; \ @@ -1346,7 +1351,7 @@ xhtml = g_string_append_c(xhtml, '>'); \ } \ c = p + 1; \ - } else { \ + } else { /* got end of tag with earlier < *or* didn't get anything */ \ if(xhtml) \ xhtml = g_string_append(xhtml, "<"); \ if(plain) \
--- a/pidgin/gtkblist.c Mon May 17 02:09:35 2010 +0000 +++ b/pidgin/gtkblist.c Mon May 17 08:04:50 2010 +0000 @@ -942,6 +942,9 @@ PurpleConnection *gc = purple_account_get_connection(account); PurplePluginProtocolInfo *prpl_info = NULL; + if (gc == NULL) + return FALSE; + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); return (prpl_info->chat_info != NULL);
--- a/pidgin/gtksession.c Mon May 17 02:09:35 2010 +0000 +++ b/pidgin/gtksession.c Mon May 17 08:04:50 2010 +0000 @@ -346,7 +346,7 @@ purple_debug(PURPLE_DEBUG_INFO, "Session Management", "Connected to manager (%s) with client ID %s\n", tmp, client_id); - g_free(tmp); + free(tmp); session_managed = TRUE; gdk_set_sm_client_id(client_id);