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