Mercurial > pidgin
changeset 9753:60705fd4f411
[gaim-migrate @ 10620]
Move show_about to gtkdialogs.c and namespace it
Remove about.c
A few other minor touchups in gtkdialogs.c
Make serv_warn pass a gboolean instead of an int
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 15 Aug 2004 17:05:51 +0000 |
| parents | 8793c7127c80 |
| children | 4a8bf81b82ae |
| files | plugins/gaiminc.c src/Makefile.am src/Makefile.mingw src/about.c src/gtkblist.c src/gtkdialogs.c src/gtkdialogs.h src/protocols/oscar/oscar.c src/prpl.h src/server.c src/server.h |
| diffstat | 11 files changed, 293 insertions(+), 337 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/gaiminc.c Sun Aug 15 16:17:29 2004 +0000 +++ b/plugins/gaiminc.c Sun Aug 15 17:05:51 2004 +0000 @@ -5,7 +5,7 @@ #include "connection.h" #include "conversation.h" -/* include UI for show_about() */ +/* include UI for gaim_gtkdialogs_about() */ #include "gtkplugin.h" #include "gtkdialogs.h" @@ -15,7 +15,7 @@ echo_hi(GaimConnection *gc) { /* this doesn't do much, just lets you know who we are :) */ - show_about(NULL, NULL); + gaim_gtkdialogs_about(NULL, NULL); } static gboolean
--- a/src/Makefile.am Sun Aug 15 16:17:29 2004 +0000 +++ b/src/Makefile.am Sun Aug 15 17:05:51 2004 +0000 @@ -137,7 +137,6 @@ gaim_SOURCES = \ $(gaim_coresources) \ - about.c \ away.c \ dnd-hints.c \ gaim-disclosure.c \
--- a/src/Makefile.mingw Sun Aug 15 16:17:29 2004 +0000 +++ b/src/Makefile.mingw Sun Aug 15 17:05:51 2004 +0000 @@ -76,7 +76,7 @@ ## SOURCES, OBJECTS ## -DLL_C_SRC = about.c \ +DLL_C_SRC = \ account.c \ accountopt.c \ away.c \
--- a/src/about.c Sun Aug 15 16:17:29 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,253 +0,0 @@ -/* - * gaim - * - * Gaim is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include "internal.h" -#include "gtkinternal.h" - -#include "gtkdialogs.h" -#include "gtkimhtml.h" -#include "gtkutils.h" -#include "stock.h" - -/* XXX For WEBSITE */ -#include "gaim.h" - -static GtkWidget *about = NULL; - -static void destroy_about() -{ - if (about != NULL) - gtk_widget_destroy(about); - about = NULL; -} - -void show_about(GtkWidget *w, void *data) -{ - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *logo; - GtkWidget *label; - GtkWidget *sw; - GtkWidget *text; - GtkWidget *bbox; - GtkWidget *button; - GtkTextIter iter; - char *str, *labeltext; - - if (about != NULL) { - gtk_window_present(GTK_WINDOW(about)); - return; - } - - GAIM_DIALOG(about); - gtk_window_set_default_size(GTK_WINDOW(about), 450, -1); - gtk_window_set_title(GTK_WINDOW(about), _("About Gaim")); - gtk_window_set_role(GTK_WINDOW(about), "about"); - gtk_window_set_resizable(GTK_WINDOW(about), TRUE); - - hbox = gtk_hbox_new(FALSE, 12); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); - gtk_container_add(GTK_CONTAINER(about), hbox); - - vbox = gtk_vbox_new(FALSE, 12); - gtk_container_add(GTK_CONTAINER(hbox), vbox); - - logo = gtk_image_new_from_stock(GAIM_STOCK_LOGO, gtk_icon_size_from_name(GAIM_ICON_SIZE_LOGO)); - gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); - - labeltext = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"), VERSION); - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), labeltext); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - g_free(labeltext); - - sw = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN); - gtk_widget_set_size_request(sw, -1, 350); - gtk_box_pack_start(GTK_BOX(vbox), sw, FALSE, FALSE, 0); - - text = gtk_imhtml_new(NULL, NULL); - gtk_container_add(GTK_CONTAINER(sw), text); - gaim_setup_imhtml(text); - - gtk_imhtml_append_text(GTK_IMHTML(text), - _("Gaim is a modular messaging client capable of using " - "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, " - "Novell GroupWise, Napster, Zephyr, and Gadu-Gadu " - "all at once. It is written using " - "Gtk+ and is licensed under the GPL.<BR><BR>"), GTK_IMHTML_NO_SCROLL); - - gtk_imhtml_append_text(GTK_IMHTML(text), - "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\"" GAIM_WEBSITE "\">" - GAIM_WEBSITE "</A><BR><BR>", GTK_IMHTML_NO_SCROLL); - - gtk_imhtml_append_text(GTK_IMHTML(text), - _("<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net" - "<BR><BR>"), GTK_IMHTML_NO_SCROLL); - - /* Active Developers */ - str = g_strconcat( - "<FONT SIZE=\"4\">", _("Active Developers"), ":</FONT><BR>" - " Rob Flynn (", _("maintainer"), ") " - "<<A HREF=\"mailto:gaim@robflynn.com\">gaim@robflynn.com</A>><BR>" - " Sean Egan (", _("lead developer"), ") " - "<<A HREF=\"mailto:sean.egan@binghamton.edu\">" - "bj91704@binghamton.edu</A>><BR>" - " 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>" - " Ethan 'Paco-Paco' Blanton (", _("developer"), ")<br>" - " Tim 'marv' Ringenbach (", _("developer"), ")<br>" - " Luke 'LSchiere' Schierer (", _("support"), ")<BR>" - "<BR>", NULL); - gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); - g_free(str); - - /* Crazy Patch Writers */ - str = g_strconcat( - "<FONT SIZE=\"4\">", _("Crazy Patch Writers"), ":</FONT><BR>" - " Daniel 'datallah' Atallah<br>" - " Ka-Hing 'javabsp' Cheung<br>" - " Decklin Foster<BR>" - " Gary 'grim' Kramlich<br>" - " Robert 'Robot101' McQueen<BR>" - " Benjamin Miller<BR>" - " Etan 'deryni' Reisner<BR>" - " Kevin 'SimGuy' Stange<br>" - " Stu 'nosnilmot' Tomlinson<br>" - "<BR>", NULL); - gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); - g_free(str); - - /* Retired Developers */ - str = g_strconcat( - "<FONT SIZE=\"4\">", _("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"), ") " - "<<A HREF=\"mailto:markster@marko.net\">" - "markster@marko.net</A>><BR>" - " Syd Logan (", _("hacker and designated driver [lazy bum]"), - ")<BR>" - "<BR>", NULL); - gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); - g_free(str); - - /* Current Translators */ - str = g_strconcat( - "<FONT SIZE=\"4\">", _("Current Translators"), ":</FONT><BR>" - " <b>", _("Bulgarian"), " (bg)</b> - Alexander Shopov <<a href=\"mailto: al_shopov@users.sf.net\">al_shopov@users.sf.net</a>><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>", _("British English"), " (en_GB)</b> - Luke Ross <<a href=\"mailto: lukeross@sys3175.co.uk\">lukeross@sys3175.co.uk</a>><br>" - " <b>", _("Canadian English"), " (en_CA)</b> - Adam Weinberger <<a href=\"mailto: adamw@gnome.org\">adamw@gnome.org</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>", _("Finnish"), " (fi)</b> - Arto Alakulju <<a href=\"mailto: arto@alakulju.net\">arto@alakulju.net</a>><br>" - " <b>", _("French"), " (fr)</b> - Éric Boumaour <<a href=\"mailto: zongo_fr@users.sourceforge.net\">zongo_fr@users.sourceforge.net</a>><br>" - " <b>", _("Hebrew"), " (he)</b> - Pavel Bibergal <<a href=\"mailto:cyberkm203@hotmail.com\">cyberkm203@hotmail.com</a>><br>" - " <b>", _("Hindi"), " (hi)</b> - Ravishankar Shrivastava <<a href=\"mailto: raviratlami@yahoo.com\">raviratlami@yahoo.com</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>", _("Japanese"), " (ja)</b> - Takashi Aihana <<a href=\"mailto: aihana@gnome.gr.jp\">aihana@gnome.gr.jp</a>><br>" - " <b>", _("Lithuanian"), " (lt)</b> - Gediminas Čičinskas <<a href=\"mailto: gediminas@parok.lt\">gediminas@parok.lt</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>", _("Macedonian"), " (mk)</b> - Tomislav Markovski <<a href=\"mailto: herrera@users.sf.net\">herrera@users.sf.net</a>><br>" - " <b>", _("Norwegian"), " (no)</b> - Petter Johan Olsen <<a href=\"mailto:petter.olsen@cc.uit.no\">petter.olsen@cc.uit.no</a>><br>" - " <b>", _("Polish"), " (pl)</b> - Krzysztof Foltman <<a href=\"mailto:krzysztof@foltman.com\">krzysztof@foltman.com</a>>, Emil Nowak <<a href=\"mailto:emil5@go2.pl\">emil5@go2.pl</a>><br>" - " <b>", _("Portuguese"), " (pt)</b> - Duarte Henriques <<a href=\"mailto:duarte_henriques@myrealbox.com\">duarte_henriques@myrealbox.com</a>><br>" - " <b>", _("Portuguese-Brazil"), " (pt_BR)</b> - Maurício de Lemos Rodrigues Collares Neto <<a href=\"mailto: mauricioc@gmail.com\">mauricioc@gmail.com</a>><br>" - " <b>", _("Romanian"), " (ro)</b> - Mişu Moldovan <<a href=\"mailto: dumol@go.ro\">dumol@go.ro</a>><br>" - " <b>", _("Russian"), " (ru)</b> - Dmitry Beloglazov <<a href=\"mailto: dmaa@users.sf.net\">dmaa@users.sf.net</a>><br>" - " <b>", _("Serbian"), " (sr)</b> - Danilo Šegan <<a href=\"mailto: dsegan@gmx.net\">dsegan@gmx.net</a>>, Aleksandar Urosevic <<a href=\"mailto: urke@users.sourceforge.net\">urke@users.sourceforge.net</a>><br>" - " <b>", _("Slovenian"), " (sl)</b> - Matjaz Horvat <<a href=\"mailto: matjaz@owca.info\">matjaz@owca.info</a>><br>" - " <b>", _("Swedish"), " (sv)</b> - Tore Lundqvist <<a href=\"mailto: tlt@mima.x.se\">tlt@mima.x.se</a>><br>" - " <b>", _("Vietnamese"), " (vi)</b> - T.M.Thanh ", _("and the Gnome-Vi Team"), " <<a href=\"mailto: gnomevi-list@lists.sf.net\">gnomevi-list@lists.sf.net</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>>, 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, GTK_IMHTML_NO_SCROLL); - g_free(str); - - /* Past Translators */ - str = g_strconcat( - "<FONT SIZE=\"4\">", _("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>", _("Finnish"), " (fi)</b> - Tero Kuusela<br>" - " <b>", _("French"), " (fr)</b> - Sébastien François, Stéphane Pontier, Stéphane Wirtel, Loïc Jeannin<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>", _("Polish"), " (pl)</b> - Przemysław Sułek<br>" - " <b>", _("Russian"), " (ru)</b> - Sergey Volozhanin<br>" - " <b>", _("Russian"), "(ru)</b> - Alexandre Prokoudine<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, GTK_IMHTML_NO_SCROLL); - g_free(str); - - gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)), 0); - gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); - gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); - - /* Close Button */ - bbox = gtk_hbutton_box_new(); - gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - - button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - - g_signal_connect_swapped(G_OBJECT(button), "clicked", - G_CALLBACK(destroy_about), G_OBJECT(about)); - g_signal_connect(G_OBJECT(about), "destroy", - G_CALLBACK(destroy_about), G_OBJECT(about)); - - /* this makes the sizes not work? */ - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); - gtk_widget_grab_default(button); - - /* Let's give'em something to talk about -- woah woah woah */ - gtk_widget_show_all(about); - gtk_window_present(GTK_WINDOW(about)); -}
--- a/src/gtkblist.c Sun Aug 15 16:17:29 2004 +0000 +++ b/src/gtkblist.c Sun Aug 15 17:05:51 2004 +0000 @@ -2353,7 +2353,7 @@ { N_("/_Help"), NULL, NULL, 0, "<Branch>" }, { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, NULL }, - { N_("/Help/_About"), NULL, show_about, 0, "<StockItem>", GAIM_STOCK_ABOUT }, + { N_("/Help/_About"), NULL, gaim_gtkdialogs_about, 0, "<StockItem>", GAIM_STOCK_ABOUT }, }; /*********************************************************
--- a/src/gtkdialogs.c Sun Aug 15 16:17:29 2004 +0000 +++ b/src/gtkdialogs.c Sun Aug 15 17:05:51 2004 +0000 @@ -23,13 +23,10 @@ #include "debug.h" #include "notify.h" -#include "prefs.h" #include "prpl.h" #include "request.h" -#include "status.h" #include "util.h" -#include "away.h" #include "gtkdialogs.h" #include "gtkimhtml.h" #include "gtkimhtmltoolbar.h" @@ -37,10 +34,9 @@ #include "gtkutils.h" #include "stock.h" -/* XXX */ -#include "gaim.h" +static GList *dialogwindows = NULL; -static GList *dialogwindows = NULL; +static GtkWidget *about = NULL; struct warning { GtkWidget *window; @@ -49,33 +45,231 @@ GaimConnection *gc; }; -/*------------------------------------------------------------------------*/ -/* Destroys */ -/*------------------------------------------------------------------------*/ - -static void -destroy_dialog(GtkWidget *w, GtkWidget *w2) -{ - GtkWidget *dest; - - if (!GTK_IS_WIDGET(w2)) - dest = w; - else - dest = w2; - - dialogwindows = g_list_remove(dialogwindows, dest); - gtk_widget_destroy(dest); -} - void gaim_gtkdialogs_destroy_all() { - while (dialogwindows) - destroy_dialog(NULL, dialogwindows->data); + while (dialogwindows) { + gtk_widget_destroy(dialogwindows->data); + dialogwindows = g_list_remove(dialogwindows, dialogwindows->data); + } +} + +static void destroy_about() +{ + if (about != NULL) + gtk_widget_destroy(about); + about = NULL; +} + +void gaim_gtkdialogs_about(GtkWidget *w, void *data) +{ + GtkWidget *hbox; + GtkWidget *vbox; + GtkWidget *logo; + GtkWidget *label; + GtkWidget *sw; + GtkWidget *text; + GtkWidget *bbox; + GtkWidget *button; + GtkTextIter iter; + gchar *str, *labeltext; + + if (about != NULL) { + gtk_window_present(GTK_WINDOW(about)); + return; + } + + GAIM_DIALOG(about); + gtk_window_set_default_size(GTK_WINDOW(about), 450, -1); + gtk_window_set_title(GTK_WINDOW(about), _("About Gaim")); + gtk_window_set_role(GTK_WINDOW(about), "about"); + gtk_window_set_resizable(GTK_WINDOW(about), TRUE); + + hbox = gtk_hbox_new(FALSE, 12); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); + gtk_container_add(GTK_CONTAINER(about), hbox); + + vbox = gtk_vbox_new(FALSE, 12); + gtk_container_add(GTK_CONTAINER(hbox), vbox); + + logo = gtk_image_new_from_stock(GAIM_STOCK_LOGO, gtk_icon_size_from_name(GAIM_ICON_SIZE_LOGO)); + gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); + + labeltext = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"), VERSION); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), labeltext); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); + g_free(labeltext); + + sw = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN); + gtk_widget_set_size_request(sw, -1, 350); + gtk_box_pack_start(GTK_BOX(vbox), sw, FALSE, FALSE, 0); + + text = gtk_imhtml_new(NULL, NULL); + gtk_container_add(GTK_CONTAINER(sw), text); + gaim_setup_imhtml(text); + + gtk_imhtml_append_text(GTK_IMHTML(text), + _("Gaim is a modular messaging client capable of using " + "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, " + "Novell GroupWise, Napster, Zephyr, and Gadu-Gadu " + "all at once. It is written using " + "Gtk+ and is licensed under the GPL.<BR><BR>"), GTK_IMHTML_NO_SCROLL); + + gtk_imhtml_append_text(GTK_IMHTML(text), + "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\"" GAIM_WEBSITE "\">" + GAIM_WEBSITE "</A><BR><BR>", GTK_IMHTML_NO_SCROLL); + + gtk_imhtml_append_text(GTK_IMHTML(text), + _("<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net" + "<BR><BR>"), GTK_IMHTML_NO_SCROLL); + + /* Active Developers */ + str = g_strconcat( + "<FONT SIZE=\"4\">", _("Active Developers"), ":</FONT><BR>" + " Rob Flynn (", _("maintainer"), ") " + "<<A HREF=\"mailto:gaim@robflynn.com\">gaim@robflynn.com</A>><BR>" + " Sean Egan (", _("lead developer"), ") " + "<<A HREF=\"mailto:sean.egan@binghamton.edu\">" + "bj91704@binghamton.edu</A>><BR>" + " 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>" + " Ethan 'Paco-Paco' Blanton (", _("developer"), ")<br>" + " Tim 'marv' Ringenbach (", _("developer"), ")<br>" + " Luke 'LSchiere' Schierer (", _("support"), ")<BR>" + "<BR>", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); + g_free(str); - /* STATUS */ - if (awaymessage) - do_im_back(NULL, NULL); + /* Crazy Patch Writers */ + str = g_strconcat( + "<FONT SIZE=\"4\">", _("Crazy Patch Writers"), ":</FONT><BR>" + " Daniel 'datallah' Atallah<br>" + " Ka-Hing 'javabsp' Cheung<br>" + " Decklin Foster<BR>" + " Gary 'grim' Kramlich<br>" + " Robert 'Robot101' McQueen<BR>" + " Benjamin Miller<BR>" + " Etan 'deryni' Reisner<BR>" + " Kevin 'SimGuy' Stange<br>" + " Stu 'nosnilmot' Tomlinson<br>" + "<BR>", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); + g_free(str); + + /* Retired Developers */ + str = g_strconcat( + "<FONT SIZE=\"4\">", _("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"), ") " + "<<A HREF=\"mailto:markster@marko.net\">" + "markster@marko.net</A>><BR>" + " Syd Logan (", _("hacker and designated driver [lazy bum]"), + ")<BR>" + "<BR>", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); + g_free(str); + + /* Current Translators */ + str = g_strconcat( + "<FONT SIZE=\"4\">", _("Current Translators"), ":</FONT><BR>" + " <b>", _("Bulgarian"), " (bg)</b> - Alexander Shopov <<a href=\"mailto: al_shopov@users.sf.net\">al_shopov@users.sf.net</a>><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>", _("British English"), " (en_GB)</b> - Luke Ross <<a href=\"mailto: lukeross@sys3175.co.uk\">lukeross@sys3175.co.uk</a>><br>" + " <b>", _("Canadian English"), " (en_CA)</b> - Adam Weinberger <<a href=\"mailto: adamw@gnome.org\">adamw@gnome.org</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>", _("Finnish"), " (fi)</b> - Arto Alakulju <<a href=\"mailto: arto@alakulju.net\">arto@alakulju.net</a>><br>" + " <b>", _("French"), " (fr)</b> - Éric Boumaour <<a href=\"mailto: zongo_fr@users.sourceforge.net\">zongo_fr@users.sourceforge.net</a>><br>" + " <b>", _("Hebrew"), " (he)</b> - Pavel Bibergal <<a href=\"mailto:cyberkm203@hotmail.com\">cyberkm203@hotmail.com</a>><br>" + " <b>", _("Hindi"), " (hi)</b> - Ravishankar Shrivastava <<a href=\"mailto: raviratlami@yahoo.com\">raviratlami@yahoo.com</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>", _("Japanese"), " (ja)</b> - Takashi Aihana <<a href=\"mailto: aihana@gnome.gr.jp\">aihana@gnome.gr.jp</a>><br>" + " <b>", _("Lithuanian"), " (lt)</b> - Gediminas Čičinskas <<a href=\"mailto: gediminas@parok.lt\">gediminas@parok.lt</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>", _("Macedonian"), " (mk)</b> - Tomislav Markovski <<a href=\"mailto: herrera@users.sf.net\">herrera@users.sf.net</a>><br>" + " <b>", _("Norwegian"), " (no)</b> - Petter Johan Olsen <<a href=\"mailto:petter.olsen@cc.uit.no\">petter.olsen@cc.uit.no</a>><br>" + " <b>", _("Polish"), " (pl)</b> - Krzysztof Foltman <<a href=\"mailto:krzysztof@foltman.com\">krzysztof@foltman.com</a>>, Emil Nowak <<a href=\"mailto:emil5@go2.pl\">emil5@go2.pl</a>><br>" + " <b>", _("Portuguese"), " (pt)</b> - Duarte Henriques <<a href=\"mailto:duarte_henriques@myrealbox.com\">duarte_henriques@myrealbox.com</a>><br>" + " <b>", _("Portuguese-Brazil"), " (pt_BR)</b> - Maurício de Lemos Rodrigues Collares Neto <<a href=\"mailto: mauricioc@gmail.com\">mauricioc@gmail.com</a>><br>" + " <b>", _("Romanian"), " (ro)</b> - Mişu Moldovan <<a href=\"mailto: dumol@go.ro\">dumol@go.ro</a>><br>" + " <b>", _("Russian"), " (ru)</b> - Dmitry Beloglazov <<a href=\"mailto: dmaa@users.sf.net\">dmaa@users.sf.net</a>><br>" + " <b>", _("Serbian"), " (sr)</b> - Danilo Šegan <<a href=\"mailto: dsegan@gmx.net\">dsegan@gmx.net</a>>, Aleksandar Urosevic <<a href=\"mailto: urke@users.sourceforge.net\">urke@users.sourceforge.net</a>><br>" + " <b>", _("Slovenian"), " (sl)</b> - Matjaz Horvat <<a href=\"mailto: matjaz@owca.info\">matjaz@owca.info</a>><br>" + " <b>", _("Swedish"), " (sv)</b> - Tore Lundqvist <<a href=\"mailto: tlt@mima.x.se\">tlt@mima.x.se</a>><br>" + " <b>", _("Vietnamese"), " (vi)</b> - T.M.Thanh ", _("and the Gnome-Vi Team"), " <<a href=\"mailto: gnomevi-list@lists.sf.net\">gnomevi-list@lists.sf.net</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>>, 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, GTK_IMHTML_NO_SCROLL); + g_free(str); + + /* Past Translators */ + str = g_strconcat( + "<FONT SIZE=\"4\">", _("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>", _("Finnish"), " (fi)</b> - Tero Kuusela<br>" + " <b>", _("French"), " (fr)</b> - Sébastien François, Stéphane Pontier, Stéphane Wirtel, Loïc Jeannin<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>", _("Polish"), " (pl)</b> - Przemysław Sułek<br>" + " <b>", _("Russian"), " (ru)</b> - Sergey Volozhanin<br>" + " <b>", _("Russian"), "(ru)</b> - Alexandre Prokoudine<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, GTK_IMHTML_NO_SCROLL); + g_free(str); + + gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)), 0); + gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); + + /* Close Button */ + bbox = gtk_hbutton_box_new(); + gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); + gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); + + button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + + g_signal_connect_swapped(G_OBJECT(button), "clicked", + G_CALLBACK(destroy_about), G_OBJECT(about)); + g_signal_connect(G_OBJECT(about), "destroy", + G_CALLBACK(destroy_about), G_OBJECT(about)); + + /* this makes the sizes not work? */ + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_grab_default(button); + + /* Let's give'em something to talk about -- woah woah woah */ + gtk_widget_show_all(about); + gtk_window_present(GTK_WINDOW(about)); } static void @@ -132,6 +326,9 @@ GaimConvWindow *win; GaimGtkWindow *gtkwin; + g_return_if_fail(account != NULL); + g_return_if_fail(username != NULL); + conv = gaim_find_conversation_with_account(username, account); if (conv == NULL) @@ -321,30 +518,35 @@ gaim_gtkdialogs_warn_cb(GtkWidget *widget, gint resp, struct warning *w) { if (resp == GTK_RESPONSE_OK) - serv_warn(w->gc, w->who, (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))) ? 1 : 0); + serv_warn(w->gc, w->who, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))); - destroy_dialog(NULL, w->window); + dialogwindows = g_list_remove(dialogwindows, w->window); + gtk_widget_destroy(w->window); + g_free(w->who); g_free(w); } +/* + * XXX - Make this use the request API, if possible. + */ void gaim_gtkdialogs_warn(GaimConnection *gc, const char *who) { - char *labeltext; + gchar *labeltext; GtkWidget *hbox, *vbox; GtkWidget *label; - GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); - GaimConversation *c = gaim_find_conversation_with_account(who, gc->account); + GtkWidget *img; + struct warning *w; - struct warning *w = g_new0(struct warning, 1); + g_return_if_fail(gc != NULL); + g_return_if_fail(who != NULL); + + w = g_new0(struct warning, 1); w->who = g_strdup(who); w->gc = gc; - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); - - w->window = gtk_dialog_new_with_buttons(_("Warn User"), - GTK_WINDOW(GAIM_GTK_WINDOW(c->window)->window), 0, + w->window = gtk_dialog_new_with_buttons(_("Warn User"), NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GAIM_STOCK_WARN, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG(w->window), GTK_RESPONSE_OK); @@ -358,6 +560,9 @@ hbox = gtk_hbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), hbox); + + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); + gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); vbox = gtk_vbox_new(FALSE, 0); @@ -397,6 +602,8 @@ void gaim_gtkdialogs_alias_contact(GaimContact *contact) { + g_return_if_fail(contact != NULL); + gaim_request_input(NULL, _("Alias Contact"), NULL, _("Enter an alias for this contact."), contact->alias, FALSE, FALSE, NULL, @@ -412,14 +619,18 @@ } void -gaim_gtkdialogs_alias_buddy(GaimBuddy *b) +gaim_gtkdialogs_alias_buddy(GaimBuddy *buddy) { - char *secondary = g_strdup_printf(_("Enter an alias for %s."), b->name); + gchar *secondary; + + g_return_if_fail(buddy != NULL); + + secondary = g_strdup_printf(_("Enter an alias for %s."), buddy->name); gaim_request_input(NULL, _("Alias Buddy"), NULL, - secondary, b->alias, FALSE, FALSE, NULL, + secondary, buddy->alias, FALSE, FALSE, NULL, _("Alias"), G_CALLBACK(gaim_gtkdialogs_alias_buddy_cb), - _("Cancel"), NULL, b); + _("Cancel"), NULL, buddy); g_free(secondary); } @@ -433,6 +644,8 @@ void gaim_gtkdialogs_alias_chat(GaimChat *chat) { + g_return_if_fail(chat != NULL); + gaim_request_input(NULL, _("Alias Chat"), NULL, _("Enter an alias for this chat."), chat->alias, FALSE, FALSE, NULL, @@ -441,14 +654,11 @@ } static void -do_remove_contact(GaimContact *contact) +gaim_gtkdialogs_remove_contact_cb(GaimContact *contact) { GaimBlistNode *bnode, *cnode; GaimGroup *group; - if (!contact) - return; - cnode = (GaimBlistNode *)contact; group = (GaimGroup*)cnode->parent; for (bnode = cnode->child; bnode; bnode = bnode->next) { @@ -464,18 +674,18 @@ { GaimBuddy *buddy = gaim_contact_get_priority_buddy(contact); - if (!buddy) - return; + g_return_if_fail(contact != NULL); + g_return_if_fail(buddy != NULL); if (((GaimBlistNode*)contact)->child == (GaimBlistNode*)buddy && !((GaimBlistNode*)buddy)->next) { gaim_gtkdialogs_remove_buddy(buddy); } else { - char *text = g_strdup_printf(_("You are about to remove the contact containing %s and %d other buddies from your buddy list. Do you want to continue?"), + gchar *text = g_strdup_printf(_("You are about to remove the contact containing %s and %d other buddies from your buddy list. Do you want to continue?"), buddy->name, contact->totalsize - 1); gaim_request_action(NULL, NULL, _("Remove Contact"), text, -1, contact, 2, - _("Remove Contact"), G_CALLBACK(do_remove_contact), + _("Remove Contact"), G_CALLBACK(gaim_gtkdialogs_remove_contact_cb), _("Cancel"), NULL); g_free(text); @@ -483,7 +693,7 @@ } void -do_remove_group(GaimGroup *group) +gaim_gtkdialogs_remove_group_cb(GaimGroup *group) { GaimBlistNode *cnode, *bnode; @@ -527,33 +737,33 @@ void gaim_gtkdialogs_remove_group(GaimGroup *group) { - char *text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), - group->name); + gchar *text; + + g_return_if_fail(group != NULL); + + text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), + group->name); gaim_request_action(NULL, NULL, _("Remove Group"), text, -1, group, 2, - _("Remove Group"), G_CALLBACK(do_remove_group), + _("Remove Group"), G_CALLBACK(gaim_gtkdialogs_remove_group_cb), _("Cancel"), NULL); g_free(text); } static void -do_remove_buddy(GaimBuddy *buddy) +gaim_gtkdialogs_remove_buddy_cb(GaimBuddy *buddy) { GaimGroup *group; GaimConversation *conv; gchar *name; GaimAccount *account; - if (!buddy) - return; - group = gaim_find_buddys_group(buddy); name = g_strdup(buddy->name); /* b->name is a crasher after remove_buddy */ account = buddy->account; - gaim_debug(GAIM_DEBUG_INFO, "blist", - "Removing '%s' from buddy list.\n", buddy->name); + gaim_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name); /* XXX - Should remove from blist first... then call serv_remove_buddy()? */ serv_remove_buddy(buddy->account->gc, buddy, group); gaim_blist_remove_buddy(buddy); @@ -569,22 +779,22 @@ void gaim_gtkdialogs_remove_buddy(GaimBuddy *buddy) { - char *text; + gchar *text; - if (!buddy) - return; + g_return_if_fail(buddy != NULL); - text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), buddy->name); + text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), + buddy->name); gaim_request_action(NULL, NULL, _("Remove Buddy"), text, -1, buddy, 2, - _("Remove Buddy"), G_CALLBACK(do_remove_buddy), + _("Remove Buddy"), G_CALLBACK(gaim_gtkdialogs_remove_buddy_cb), _("Cancel"), NULL); g_free(text); } static void -do_remove_chat(GaimChat *chat) +gaim_gtkdialogs_remove_chat_cb(GaimChat *chat) { gaim_blist_remove_chat(chat); } @@ -592,11 +802,13 @@ void gaim_gtkdialogs_remove_chat(GaimChat *chat) { - char *name = gaim_chat_get_display_name(chat); - char *text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list. Do you want to continue?"), name); + gchar *name = gaim_chat_get_display_name(chat); + gchar *text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list. Do you want to continue?"), name); + + g_return_if_fail(chat != NULL); gaim_request_action(NULL, NULL, _("Remove Chat"), text, -1, chat, 2, - _("Remove Chat"), G_CALLBACK(do_remove_chat), + _("Remove Chat"), G_CALLBACK(gaim_gtkdialogs_remove_chat_cb), _("Cancel"), NULL); g_free(name);
--- a/src/gtkdialogs.h Sun Aug 15 16:17:29 2004 +0000 +++ b/src/gtkdialogs.h Sun Aug 15 17:05:51 2004 +0000 @@ -32,6 +32,7 @@ /* Functions in gtkdialogs.c (these should actually stay in this file) */ void gaim_gtkdialogs_destroy_all(); +void gaim_gtkdialogs_about(); void gaim_gtkdialogs_im(); void gaim_gtkdialogs_im_with_user(GaimAccount *, const char *); void gaim_gtkdialogs_info(); @@ -46,9 +47,6 @@ void gaim_gtkdialogs_remove_chat(GaimChat *); void gaim_gtkdialogs_remove_contact(GaimContact *); -/* Functions in about.c */ -extern void show_about(GtkWidget *, void *); - /* Everything after this should probably be moved elsewhere */ /**
--- a/src/protocols/oscar/oscar.c Sun Aug 15 16:17:29 2004 +0000 +++ b/src/protocols/oscar/oscar.c Sun Aug 15 17:05:51 2004 +0000 @@ -5535,9 +5535,9 @@ return; } -static void oscar_warn(GaimConnection *gc, const char *name, int anon) { +static void oscar_warn(GaimConnection *gc, const char *name, gboolean anonymous) { OscarData *od = (OscarData *)gc->proto_data; - aim_im_warn(od->sess, od->conn, name, anon ? AIM_WARN_ANON : 0); + aim_im_warn(od->sess, od->conn, name, anonymous ? AIM_WARN_ANON : 0); } static void oscar_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) {
--- a/src/prpl.h Sun Aug 15 16:17:29 2004 +0000 +++ b/src/prpl.h Sun Aug 15 17:05:51 2004 +0000 @@ -252,7 +252,7 @@ void (*rem_permit)(GaimConnection *, const char *name); void (*rem_deny)(GaimConnection *, const char *name); void (*set_permit_deny)(GaimConnection *); - void (*warn)(GaimConnection *, const char *who, int anonymous); + void (*warn)(GaimConnection *, const char *who, gboolean anonymous); void (*join_chat)(GaimConnection *, GHashTable *components); void (*reject_chat)(GaimConnection *, GHashTable *components); void (*chat_invite)(GaimConnection *, int id,
--- a/src/server.c Sun Aug 15 16:17:29 2004 +0000 +++ b/src/server.c Sun Aug 15 17:05:51 2004 +0000 @@ -670,7 +670,7 @@ prpl_info->set_idle(g, time); } -void serv_warn(GaimConnection *g, const char *name, int anon) +void serv_warn(GaimConnection *g, const char *name, gboolean anonymous) { GaimPluginProtocolInfo *prpl_info = NULL; @@ -678,7 +678,7 @@ prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl); if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->warn) - prpl_info->warn(g, name, anon); + prpl_info->warn(g, name, anonymous); } void serv_join_chat(GaimConnection *g, GHashTable *data)
--- a/src/server.h Sun Aug 15 16:17:29 2004 +0000 +++ b/src/server.h Sun Aug 15 17:05:51 2004 +0000 @@ -63,7 +63,7 @@ void serv_rem_permit(GaimConnection *, const char *); void serv_rem_deny(GaimConnection *, const char *); void serv_set_permit_deny(GaimConnection *); -void serv_warn(GaimConnection *, const char *, int); +void serv_warn(GaimConnection *, const char *, gboolean); void serv_set_dir(GaimConnection *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, int);