Mercurial > pidgin
changeset 7678:cf6a7939af78
[gaim-migrate @ 8322]
Kevin "Sim" Guy made Alert Dialog titles consistant, and sensible on Windows.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 01 Dec 2003 02:36:51 +0000 |
| parents | 1f035c12f6f5 |
| children | 1363f91da9cc |
| files | src/dialogs.c src/gtkconn.c src/gtkconv.c src/gtkinternal.h src/gtknotify.c src/gtkrequest.c |
| diffstat | 6 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dialogs.c Mon Dec 01 02:19:27 2003 +0000 +++ b/src/dialogs.c Mon Dec 01 02:36:51 2003 +0000 @@ -601,7 +601,7 @@ gtk_label_set_markup(GTK_LABEL(label), "<span weight=\"bold\" size=\"large\" foreground=\"gray\">I'm not anything.</span>"); - window = gtk_dialog_new_with_buttons("", GTK_WINDOW(gtkblist->window), 0, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + window = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, GTK_WINDOW(gtkblist->window), 0, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL);
--- a/src/gtkconn.c Mon Dec 01 02:19:27 2003 +0000 +++ b/src/gtkconn.c Mon Dec 01 02:36:51 2003 +0000 @@ -416,7 +416,7 @@ GtkCellRenderer *rend, *rend2; disconnect_window = g_new0(struct disconnect_window, 1); - disconnect_window->window = gtk_dialog_new_with_buttons("", NULL, GTK_DIALOG_NO_SEPARATOR, + disconnect_window->window = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, NULL, GTK_DIALOG_NO_SEPARATOR, _("Reconnect"), GTK_RESPONSE_ACCEPT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); g_signal_connect(G_OBJECT(disconnect_window->window), "response", G_CALLBACK(disconnect_response_cb), disconnect_window);
--- a/src/gtkconv.c Mon Dec 01 02:19:27 2003 +0000 +++ b/src/gtkconv.c Mon Dec 01 02:36:51 2003 +0000 @@ -758,7 +758,7 @@ if (gtkconv->dialogs.search) return; - gtkconv->dialogs.search = gtk_dialog_new_with_buttons("", GTK_WINDOW(gtkwin->window), + gtkconv->dialogs.search = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, GTK_WINDOW(gtkwin->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_FIND, GTK_RESPONSE_OK, NULL);
--- a/src/gtkinternal.h Mon Dec 01 02:19:27 2003 +0000 +++ b/src/gtkinternal.h Mon Dec 01 02:36:51 2003 +0000 @@ -31,4 +31,10 @@ #include <gtk/gtk.h> +#ifndef _WIN32 +# define GAIM_ALERT_TITLE "" +#else +# define GAIM_ALERT_TITLE "Gaim" +#endif + #endif /* _GAIM_GTK_INTERNAL_H_ */
--- a/src/gtknotify.c Mon Dec 01 02:19:27 2003 +0000 +++ b/src/gtknotify.c Mon Dec 01 02:36:51 2003 +0000 @@ -107,9 +107,9 @@ gtk_misc_set_alignment(GTK_MISC(img), 0, 0); } - dialog = gtk_dialog_new_with_buttons(title ? title : "", NULL, 0, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL); + dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE, + NULL, 0, GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, NULL); g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(message_response_cb), dialog);
--- a/src/gtkrequest.c Mon Dec 01 02:19:27 2003 +0000 +++ b/src/gtkrequest.c Mon Dec 01 02:36:51 2003 +0000 @@ -232,7 +232,8 @@ data->cbs[1] = cancel_cb; /* Create the dialog. */ - dialog = gtk_dialog_new_with_buttons(title, NULL, 0, + dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE, + NULL, 0, text_to_stock(cancel_text), 1, text_to_stock(ok_text), 0, NULL);