diff -r 965487d1e818 -r 5951fd24250e src/gtkdialogs.c --- 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(_("Gaim v%s"), 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.

"), GTK_IMHTML_NO_SCROLL); + + gtk_imhtml_append_text(GTK_IMHTML(text), + "URL: " + GAIM_WEBSITE "

", GTK_IMHTML_NO_SCROLL); + + gtk_imhtml_append_text(GTK_IMHTML(text), + _("IRC: #gaim on irc.freenode.net" + "

"), GTK_IMHTML_NO_SCROLL); + + /* Active Developers */ + str = g_strconcat( + "", _("Active Developers"), ":
" + " Rob Flynn (", _("maintainer"), ") " + "<gaim@robflynn.com>
" + " Sean Egan (", _("lead developer"), ") " + "<" + "bj91704@binghamton.edu>
" + " Christian 'ChipX86' Hammond (", _("developer & webmaster"), ")
" + " Herman Bloggs (", _("win32 port"), ") " + "<" + "hermanator12002@yahoo.com>
" + " Nathan 'faceprint' Walp (", _("developer"), ")
" + " Mark 'KingAnt' Doliner (", _("developer"), ")
" + " Ethan 'Paco-Paco' Blanton (", _("developer"), ")
" + " Tim 'marv' Ringenbach (", _("developer"), ")
" + " Luke 'LSchiere' Schierer (", _("support"), ")
" + "
", 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( + "", _("Crazy Patch Writers"), ":
" + " Daniel 'datallah' Atallah
" + " Ka-Hing 'javabsp' Cheung
" + " Decklin Foster
" + " Gary 'grim' Kramlich
" + " Robert 'Robot101' McQueen
" + " Benjamin Miller
" + " Etan 'deryni' Reisner
" + " Kevin 'SimGuy' Stange
" + " Stu 'nosnilmot' Tomlinson
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); + g_free(str); + + /* 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"), ") " + "<" + "markster@marko.net>
" + " Syd Logan (", _("hacker and designated driver [lazy bum]"), + ")
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); + g_free(str); + + /* Current Translators */ + str = g_strconcat( + "", _("Current Translators"), ":
" + " ", _("Bulgarian"), " (bg) - Alexander Shopov <al_shopov@users.sf.net>
" + " ", _("Catalan"), " (ca) - Robert Millan <zeratul2@wanadoo.es>
" + " ", _("Czech"), " (cs) - Miloslav Trmac <mitr@volny.cz>
" + " ", _("Danish"), " (da) - Morten Brix Pedersen <morten@wtf.dk>
" + " ", _("British English"), " (en_GB) - Luke Ross <lukeross@sys3175.co.uk>
" + " ", _("Canadian English"), " (en_CA) - Adam Weinberger <adamw@gnome.org>
" + " ", _("German"), " (de) - Björn Voigt <bjoern@cs.tu-berlin.de>
" + " ", _("Spanish"), " (es) - Javier Fernández-Sanguino Peña <jfs@debian.org>
" + " ", _("Finnish"), " (fi) - Arto Alakulju <arto@alakulju.net>
" + " ", _("French"), " (fr) - Éric Boumaour <zongo_fr@users.sourceforge.net>
" + " ", _("Hebrew"), " (he) - Pavel Bibergal <cyberkm203@hotmail.com>
" + " ", _("Hindi"), " (hi) - Ravishankar Shrivastava <raviratlami@yahoo.com>
" + " ", _("Hungarian"), " (hu) - Zoltan Sutto <suttozoltan@chello.hu>
" + " ", _("Italian"), " (it) - Claudio Satriano <satriano@na.infn.it>
" + " ", _("Japanese"), " (ja) - Takashi Aihana <aihana@gnome.gr.jp>
" + " ", _("Lithuanian"), " (lt) - Gediminas Čičinskas <gediminas@parok.lt>
" + " ", _("Korean"), " (ko) - Kyung-uk Son <vvs740@chol.com>
" + " ", _("Dutch; Flemish"), " (nl) - Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>
" + " ", _("Macedonian"), " (mk) - Tomislav Markovski <herrera@users.sf.net>
" + " ", _("Norwegian"), " (no) - Petter Johan Olsen <petter.olsen@cc.uit.no>
" + " ", _("Polish"), " (pl) - Krzysztof Foltman <krzysztof@foltman.com>, Emil Nowak <emil5@go2.pl>
" + " ", _("Portuguese"), " (pt) - Duarte Henriques <duarte_henriques@myrealbox.com>
" + " ", _("Portuguese-Brazil"), " (pt_BR) - Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail.com>
" + " ", _("Romanian"), " (ro) - Mişu Moldovan <dumol@go.ro>
" + " ", _("Russian"), " (ru) - Dmitry Beloglazov <dmaa@users.sf.net>
" + " ", _("Serbian"), " (sr) - Danilo Šegan <dsegan@gmx.net>, Aleksandar Urosevic <urke@users.sourceforge.net>
" + " ", _("Slovenian"), " (sl) - Matjaz Horvat <matjaz@owca.info>
" + " ", _("Swedish"), " (sv) - Tore Lundqvist <tlt@mima.x.se>
" + " ", _("Vietnamese"), " (vi) - T.M.Thanh ", _("and the Gnome-Vi Team"), " <gnomevi-list@lists.sf.net>
" + " ", _("Simplified Chinese"), " (zh_CN) - Funda Wang <fundawang@linux.net.cn>
" + " ", _("Traditional Chinese"), " (zh_TW) - Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu <paladin@ms1.hinet.net>
" + "
", NULL); + gtk_imhtml_append_text(GTK_IMHTML(text), str, GTK_IMHTML_NO_SCROLL); + g_free(str); + + /* 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
" + " ", _("Finnish"), " (fi) - Tero Kuusela
" + " ", _("French"), " (fr) - Sébastien François, Stéphane Pontier, Stéphane Wirtel, Loïc Jeannin
" + " ", _("Italian"), " (it) - Salvatore di Maggio
" + " ", _("Japanese"), " (ja) - Ryosuke Kutsuna, Taku Yasui, Junichi Uekawa
" + " ", _("Korean"), " (ko) - Sang-hyun S, A Ho-seok Lee
" + " ", _("Polish"), " (pl) - Przemysław Sułek
" + " ", _("Russian"), " (ru) - Sergey Volozhanin
" + " ", _("Russian"), "(ru) - Alexandre Prokoudine
" + " ", _("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, 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);