Mercurial > pidgin.yaz
comparison pidgin/gtkimhtml.c @ 26569:bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 8b60514f2b44295e87ee3587669aec5059556149)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 05 Apr 2009 21:13:10 +0000 |
| parents | 8e594c4cdae4 |
| children | 1a94a964bddf |
comparison
equal
deleted
inserted
replaced
| 26545:b01e8e76c59d | 26569:bc7fac8e2f79 |
|---|---|
| 3318 } | 3318 } |
| 3319 c++; | 3319 c++; |
| 3320 pos++; | 3320 pos++; |
| 3321 } else if ((pos == 0 || wpos == 0 || isspace(*(c - 1))) && | 3321 } else if ((pos == 0 || wpos == 0 || isspace(*(c - 1))) && |
| 3322 (len_protocol = gtk_imhtml_is_protocol(c)) > 0 && | 3322 (len_protocol = gtk_imhtml_is_protocol(c)) > 0 && |
| 3323 c[len_protocol] && !isspace(c[len_protocol])) { | 3323 c[len_protocol] && !isspace(c[len_protocol]) && |
| 3324 (c[len_protocol] != '<' || !gtk_imhtml_is_tag(c + 1, NULL, NULL, NULL))) { | |
| 3324 br = FALSE; | 3325 br = FALSE; |
| 3325 if (wpos > 0) { | 3326 if (wpos > 0) { |
| 3326 gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos); | 3327 gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos); |
| 3327 ws[0] = '\0'; wpos = 0; | 3328 ws[0] = '\0'; wpos = 0; |
| 3328 } | 3329 } |