# HG changeset patch # User Mark Doliner # Date 1061866529 0 # Node ID f80e23e66de0a730cc704aa1f5cda44f79f8369f # Parent 889279abb909a04345b99886a0ed52c46bcc389b [gaim-migrate @ 7155] A patch from Bjoern Voigt that allows the languages in the about window to be i10ned. Bjoern, I was having some problems emailing you earlier. I just wanted to say that I've been rather busy and wasn't sure when I would be able to commit this. Thanks for the patch, it looks nice. I hand applied it because I'm a freak, and I think there may have been some other changes to that code since the patch was made. Anyhoo, you might just want to double check everything. Fixed some compile warnings: util.c: In function `_parse_font_tag': util.c:313: warning: suggest explicit braces to avoid ambiguous `else' util.c: In function `yahoo_html_to_codes': util.c:456: warning: unused variable `m' util.c:456: warning: unused variable `n' util.c:456: warning: unused variable `vstart' committer: Tailor Script diff -r 889279abb909 -r f80e23e66de0 src/about.c --- a/src/about.c Tue Aug 26 01:44:22 2003 +0000 +++ b/src/about.c Tue Aug 26 02:55:29 2003 +0000 @@ -48,6 +48,7 @@ GtkWidget *sw; GtkWidget *logo; char abouttitle[45]; + char *str; if (!about) { @@ -98,91 +99,102 @@ _("IRC: #gaim on irc.freenode.net" "

"), -1, GTK_IMHTML_NO_SCROLL); - gtk_imhtml_append_text(GTK_IMHTML(text), - _("Active Developers:
"), -1, GTK_IMHTML_NO_SCROLL); - gtk_imhtml_append_text(GTK_IMHTML(text), - _(" Rob Flynn (maintainer) " + /* Active Developers */ + str = g_strconcat( + "", _("Active Developers"), ":
" + " Rob Flynn (", _("maintainer"), ") " "<rob@marko.net>
" - " Sean Egan (lead developer) " + " Sean Egan (", _("lead developer"), ") " "<" "bj91704@binghamton.edu>
" - " Christian 'ChipX86' Hammond (developer & webmaster)
" - " Herman Bloggs (win32 port) " + " Christian 'ChipX86' Hammond (", _("developer & webmaster"), ")
" + " Herman Bloggs (", _("win32 port"), ") " "<" "hermanator12002@yahoo.com>
" - " Nathan 'faceprint' Walp (developer)
" - " Mark 'KingAnt' Doliner (developer)
" - " Luke 'LSchiere' Schierer (support)
" - "
"), -1, GTK_IMHTML_NO_SCROLL); + " Nathan 'faceprint' Walp (", _("developer"), ")
" + " Mark 'KingAnt' Doliner (", _("developer"), ")
" + " Luke 'LSchiere' Schierer (", _("support"), ")
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, -1, GTK_IMHTML_NO_SCROLL); + g_free(str); - gtk_imhtml_append_text(GTK_IMHTML(text), - _("Crazy Patch Writers:
"), -1, GTK_IMHTML_NO_SCROLL); - gtk_imhtml_append_text(GTK_IMHTML(text), + /* Crazy Patch Writers */ + str = g_strconcat( + "", _("Crazy Patch Writers"), ":
" " Benjamin Miller
" " Decklin Foster
" " Etan 'deryni' Reisner
" " Ethan 'Paco-Paco' Blanton
" " Robert 'Robot101' McQueen
" - "
", -1, GTK_IMHTML_NO_SCROLL); + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, -1, GTK_IMHTML_NO_SCROLL); + g_free(str); - gtk_imhtml_append_text(GTK_IMHTML(text), - _("Retired Developers:
"), -1, GTK_IMHTML_NO_SCROLL); - gtk_imhtml_append_text(GTK_IMHTML(text), - _(" Adam Fritzler (former libfaim maintainer)
" - " Eric Warmenhoven (former lead developer) " + /* Retired Developers */ + str = g_strconcat( + "", _("Retired Developers"), ":
" + " Adam Fritzler (", _("former libfaim maintainer"), ")
" + " Eric Warmenhoven (", _("former lead developer"), ") " "<" "warmenhoven@yahoo.com>
" - " Jim Duchek (former maintainer)
" - " Jim Seymour (former Jabber developer)
" - " Mark Spencer (original author) " + " Jim Duchek (", _("former maintainer"), ")
" + " Jim Seymour (", _("former Jabber developer"), ")
" + " Mark Spencer (", _("original author"), ") " "<" "markster@marko.net>
" - " Syd Logan (hacker and designated driver [lazy bum])
" - "
"), -1, GTK_IMHTML_NO_SCROLL); + " Syd Logan (", _("hacker and designated driver [lazy bum]"), + ")
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, -1, GTK_IMHTML_NO_SCROLL); + g_free(str); - gtk_imhtml_append_text(GTK_IMHTML(text), - _("Current Translators:
"), -1, GTK_IMHTML_NO_SCROLL); - gtk_imhtml_append_text(GTK_IMHTML(text), - " Catalan (ca) - Robert Millan <zeratul2@wanadoo.es>
" - " Czech (cs) - Miloslav Trmac <mitr@volny.cz>
" - " Danish (da) - Morten Brix Pedersen <morten@wtf.dk>
" - " German (de) - Björn Voigt <bjoern@cs.tu-berlin.de>
" - " Spanish (es) - Javier Fernández-Sanguino Peña <jfs@debian.org>
" - " French (fr) - Éric Boumaour <zongo_fr@users.sourceforge.net>
" - " Hindi (hi) - Guntupalli Karunakar <karunakar@freedomink.org>
" - " Hungarian (hu) - Zoltan Sutto <suttozoltan@chello.hu>
" - " Italian (it) - Claudio Satriano <satriano@na.infn.it>
" - " Korean (ko) - Kyung-uk Son <vvs740@chol.com>
" - " Dutch; Flemish (nl) - Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>
" - " Portuguese-Brazil (pt_BR) - Maurício de Lemos Rodrigues Collares Neto <mauricioc@myrealbox.com>
" - " Romanian (ro) - Mişu Moldovan <dumol@go.ro>
" - " Serbian (sr) - Danilo Šegan <dsegan@gmx.net>
" - " Swedish (sv) - Tore Lundqvist <tlt@mima.x.se>
" - " Simplified Chinese (zh_CN) - Funda Wang <fundawang@linux.net.cn>
" - " Traditional Chinese (zh_TW) - Ambrose C. Li <acli@ada.dhs.org> and Paladin R. Liu <paladin@ms1.hinet.net
" - "
", -1, GTK_IMHTML_NO_SCROLL); + /* Current Translators */ + str = g_strconcat( + "", _("Current Translators"), ":
" + " ", _("Catalan"), " (ca) - Robert Millan <zeratul2@wanadoo.es>
" + " ", _("Czech"), " (cs) - Miloslav Trmac <mitr@volny.cz>
" + " ", _("Danish"), " (da) - Morten Brix Pedersen <morten@wtf.dk>
" + " ", _("German"), " (de) - Björn Voigt <bjoern@cs.tu-berlin.de>
" + " ", _("Spanish"), " (es) - Javier Fernández-Sanguino Peña <jfs@debian.org>
" + " ", _("French"), " (fr) - Éric Boumaour <zongo_fr@users.sourceforge.net>
" + " ", _("Hindi"), " (hi) - Guntupalli Karunakar <karunakar@freedomink.org>
" + " ", _("Hungarian"), " (hu) - Zoltan Sutto <suttozoltan@chello.hu>
" + " ", _("Italian"), " (it) - Claudio Satriano <satriano@na.infn.it>
" + " ", _("Korean"), " (ko) - Kyung-uk Son <vvs740@chol.com>
" + " ", _("Dutch; Flemish"), " (nl) - Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>
" + " ", _("Portuguese-Brazil"), " (pt_BR) - Maurício de Lemos Rodrigues Collares Neto <mauricioc@myrealbox.com>
" + " ", _("Romanian"), " (ro) - Mişu Moldovan <dumol@go.ro>
" + " ", _("Serbian"), " (sr) - Danilo Šegan <dsegan@gmx.net>
" + " ", _("Swedish"), " (sv) - Tore Lundqvist <tlt@mima.x.se>
" + " ", _("Simplified Chinese"), " (zh_CN) - Funda Wang <fundawang@linux.net.cn>
" + " ", _("Traditional Chinese"), " (zh_TW) - Ambrose C. Li <acli@ada.dhs.org> and Paladin R. Liu <paladin@ms1.hinet.net
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, -1, GTK_IMHTML_NO_SCROLL); + g_free(str); - gtk_imhtml_append_text(GTK_IMHTML(text), - _("Past Translators:
"), -1, GTK_IMHTML_NO_SCROLL); - gtk_imhtml_append_text(GTK_IMHTML(text), - " Amharic (am) - Daniel Yacob
" - " Bulgarian (bg) - Hristo Todorov
" - " Catalan (ca) - JM Pérez Cáncer
" - " Czech (cs) - Honza Král
" - " German (de) - Daniel Seifert, Karsten Weiss
" - " Spanish (es) - Amaya Rodrigo, Alejandro G Villar, Nicolás Lichtmaier, JM Pérez Cáncer
" - " French (fr) - sebfrance, Stéphane Pontier, Stéphane Wirtel, Loïc Jeannin
" - " Hebrew (he) - Pavel Bibergal
" - " Italian (it) - Salvatore di Maggio
" - " Japanese (ja) - Ryosuke Kutsuna, Taku Yasui, Junichi Uekawa
" - " Korean (ko) - Sang-hyun S, A Ho-seok Lee
" - " Norwegian (no) - Petter Johan Olsen
" - " Polish (pl) - Przemysław Sułek
" - " Russian (ru) - Sergey Volozhanin
" - " Slovak (sk) - Daniel Režný
" - " Swedish (sv) - Christian Rose
" - " Chinese (zh_CN, zh_TW) - Hashao, Rocky S. Lee
" - "
", -1, GTK_IMHTML_NO_SCROLL); + /* Past Translators */ + str = g_strconcat( + "", _("Past Translators"), ":
" + " ", _("Amharic"), " (am) - Daniel Yacob
" + " ", _("Bulgarian"), " (bg) - Hristo Todorov
" + " ", _("Catalan"), " (ca) - JM Pérez Cáncer
" + " ", _("Czech"), " (cs) - Honza Král
" + " ", _("German"), " (de) - Daniel Seifert, Karsten Weiss
" + " ", _("Spanish"), " (es) - Amaya Rodrigo, Alejandro G Villar, Nicolás Lichtmaier, JM Pérez Cáncer
" + " ", _("French"), " (fr) - sebfrance, Stéphane Pontier, Stéphane Wirtel, Loïc Jeannin
" + " ", _("Hebrew"), " (he) - Pavel Bibergal
" + " ", _("Italian"), " (it) - Salvatore di Maggio
" + " ", _("Japanese"), " (ja) - Ryosuke Kutsuna, Taku Yasui, Junichi Uekawa
" + " ", _("Korean"), " (ko) - Sang-hyun S, A Ho-seok Lee
" + " ", _("Norwegian"), " (no) - Petter Johan Olsen
" + " ", _("Polish"), " (pl) - Przemysław Sułek
" + " ", _("Russian"), " (ru) - Sergey Volozhanin
" + " ", _("Slovak"), " (sk) - Daniel Režný
" + " ", _("Swedish"), " (sv) - Christian Rose
" + " ", _("Chinese"), " (zh_CN, zh_TW) - Hashao, Rocky S. Lee
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, -1, GTK_IMHTML_NO_SCROLL); + g_free(str); gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)), 0); diff -r 889279abb909 -r f80e23e66de0 src/protocols/yahoo/util.c --- a/src/protocols/yahoo/util.c Tue Aug 26 01:44:22 2003 +0000 +++ b/src/protocols/yahoo/util.c Tue Aug 26 02:55:29 2003 +0000 @@ -310,7 +310,7 @@ break; } - if (src[n] == '"') + if (src[n] == '"') { if (!quote) { quote = 1; vstart = n; @@ -318,6 +318,7 @@ } else { done = 1; } + } if (!quote && ((src[n] == ' ') || (src[n] == '>'))) done = 1; @@ -453,7 +454,7 @@ char *yahoo_html_to_codes(const char *src) { - int i, j, m, n, vstart, len; + int i, j, len; GString *dest; char *ret, *esc; GQueue *colors, *tags;