Mercurial > pidgin.yaz
changeset 15436:9c0cf4db1f4d
Dialog icon changes
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 27 Jan 2007 11:11:26 +0000 |
| parents | 29e443e0613f |
| children | 42961709cb30 |
| files | pidgin/gaimstock.c pidgin/gaimstock.h pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtklog.c pidgin/gtknotify.c pidgin/gtkrequest.c pidgin/gtkstatusbox.c pidgin/gtkutils.c pidgin/pixmaps/Makefile.am pidgin/pixmaps/gaim_auth.png pidgin/pixmaps/gaim_cool.png pidgin/pixmaps/gaim_error.png pidgin/pixmaps/gaim_info.png pidgin/pixmaps/gaim_question.png pidgin/pixmaps/gaim_warning.png |
| diffstat | 18 files changed, 135 insertions(+), 144 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gaimstock.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gaimstock.c Sat Jan 27 11:11:26 2007 +0000 @@ -56,12 +56,6 @@ #endif { GAIM_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { GAIM_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, - { GAIM_STOCK_DIALOG_AUTH, "dialogs", "gaim_auth.png" }, - { GAIM_STOCK_DIALOG_COOL, "dialogs", "gaim_cool.png" }, - { GAIM_STOCK_DIALOG_ERROR, "dialogs", "gaim_error.png" }, - { GAIM_STOCK_DIALOG_INFO, "dialogs", "gaim_info.png" }, - { GAIM_STOCK_DIALOG_QUESTION, "dialogs", "gaim_question.png" }, - { GAIM_STOCK_DIALOG_WARNING, "dialogs", "gaim_warning.png" }, #if GTK_CHECK_VERSION(2,6,0) { GAIM_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, #else @@ -151,17 +145,25 @@ gboolean medium; gboolean huge; } const sized_stock_icons [] = { - { GAIM_STOCK_STATUS_AVAILABLE, "status", "available.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_AWAY, "status", "away.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_BUSY, "status", "busy.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, FALSE }, - { GAIM_STOCK_STATUS_OPERATOR, "status", "operator.png", TRUE, FALSE, FALSE, FALSE }, - { GAIM_STOCK_STATUS_HALFOP, "status", "half-operator.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_STATUS_AVAILABLE,"status", "available.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_AWAY, "status", "away.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_BUSY, "status", "busy.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_OPERATOR, "status", "operator.png", TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_STATUS_HALFOP, "status", "half-operator.png", TRUE, FALSE, FALSE, FALSE }, + + { PIDGIN_STOCK_DIALOG_AUTH, "dialogs", "auth.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_COOL, "dialogs", "cool.png", FALSE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_ERROR, "dialogs", "error.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_INFO, "dialogs", "info.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_MAIL, "dialogs", "mail.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_QUESTION, "dialogs", "question.png", TRUE, FALSE, FALSE, TRUE }, + { PIDGIN_STOCK_DIALOG_WARNING, "dialogs", "warning.png", FALSE, FALSE, FALSE, TRUE }, }; static gchar * @@ -264,11 +266,10 @@ } /* register custom icon sizes */ - gtk_icon_size_register(GAIM_ICON_SIZE_DIALOG_COOL, 40, 60); - extra_small = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16); - small = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_SMALL, 22, 22); - medium = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_MEDIUM, 32, 32); - huge = gtk_icon_size_register(GAIM_ICON_SIZE_TANGO_HUGE, 64, 64); + extra_small = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16); + small = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22); + medium = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32); + huge = gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_HUGE, 64, 64); for (i = 0; i < G_N_ELEMENTS(sized_stock_icons); i++) {
--- a/pidgin/gaimstock.h Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gaimstock.h Sat Jan 27 11:11:26 2007 +0000 @@ -43,12 +43,6 @@ #define GAIM_STOCK_CLOSE_TABS "gaim-close-tab" #define GAIM_STOCK_CONNECT "gaim-connect" #define GAIM_STOCK_DEBUG "gaim-debug" -#define GAIM_STOCK_DIALOG_AUTH "gaim-dialog-auth" -#define GAIM_STOCK_DIALOG_COOL "gaim-dialog-cool" -#define GAIM_STOCK_DIALOG_ERROR "gaim-dialog-error" -#define GAIM_STOCK_DIALOG_INFO "gaim-dialog-info" -#define GAIM_STOCK_DIALOG_QUESTION "gaim-dialog-question" -#define GAIM_STOCK_DIALOG_WARNING "gaim-dialog-warning" #define GAIM_STOCK_DISCONNECT "gaim-disconnect" #define GAIM_STOCK_DOWNLOAD "gaim-download" #define GAIM_STOCK_EDIT "gaim-edit" @@ -99,29 +93,37 @@ #define GAIM_STOCK_UPLOAD "gaim-upload" #define GAIM_STOCK_VOICE_CHAT "gaim-voice-chat" -#define GAIM_STOCK_STATUS_AVAILABLE "gaim-status-available" -#define GAIM_STOCK_STATUS_AWAY "gaim-status-away" -#define GAIM_STOCK_STATUS_BUSY "gaim-status-busy" -#define GAIM_STOCK_STATUS_CHAT "gaim-status-chat" -#define GAIM_STOCK_STATUS_XA "gaim-status-xa" -#define GAIM_STOCK_STATUS_LOGIN "gaim-status-login" -#define GAIM_STOCK_STATUS_LOGOUT "gaim-status-logout" -#define GAIM_STOCK_STATUS_OFFLINE "gaim-status-offline" -#define GAIM_STOCK_STATUS_PERSON "gaim-status-person" -#define GAIM_STOCK_STATUS_OPERATOR "gaim-status-operator" -#define GAIM_STOCK_STATUS_HALFOP "gaim-status-halfop" +/* Status icons */ +#define PIDGIN_STOCK_STATUS_AVAILABLE "pidgin-status-available" +#define PIDGIN_STOCK_STATUS_AWAY "pidgin-status-away" +#define PIDGIN_STOCK_STATUS_BUSY "pidgin-status-busy" +#define PIDGIN_STOCK_STATUS_CHAT "pidgin-status-chat" +#define PIDGIN_STOCK_STATUS_XA "pidgin-status-xa" +#define PIDGIN_STOCK_STATUS_LOGIN "pidgin-status-login" +#define PIDGIN_STOCK_STATUS_LOGOUT "pidgin-status-logout" +#define PIDGIN_STOCK_STATUS_OFFLINE "pidgin-status-offline" +#define PIDGIN_STOCK_STATUS_PERSON "pidgin-status-person" +#define PIDGIN_STOCK_STATUS_OPERATOR "pidgin-status-operator" +#define PIDGIN_STOCK_STATUS_HALFOP "pidgin-status-halfop" + +/* Dialog icons */ +#define PIDGIN_STOCK_DIALOG_AUTH "pidgin-dialog-auth" +#define PIDGIN_STOCK_DIALOG_ERROR "pidgin-dialog-error" +#define PIDGIN_STOCK_DIALOG_INFO "pidgin-dialog-info" +#define PIDGIN_STOCK_DIALOG_MAIL "pidgin-dialog-mail" +#define PIDGIN_STOCK_DIALOG_QUESTION "pidgin-dialog-question" +#define PIDGIN_STOCK_DIALOG_COOL "pidgin-dialog-cool" +#define PIDGIN_STOCK_DIALOG_WARNING "pidgin-dialog-warning" /*@}*/ /** * For using icons that aren't one of the default GTK_ICON_SIZEs */ -#define GAIM_ICON_SIZE_DIALOG_COOL "gaim-icon-size-dialog-cool" -#define GAIM_ICON_SIZE_TANGO_EXTRA_SMALL "gaim-icon-size-tango-extra-small" -#define GAIM_ICON_SIZE_TANGO_SMALL "gaim-icon-size-tango-small" -#define GAIM_ICON_SIZE_TANGO_MEDIUM "gaim-icon-size-tango-medium" -#define GAIM_ICON_SIZE_TANGO_HUGE "gaim-icon-size-tango-huge" -#define GAIM_ICON_SIZE_TANGO +#define PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL "pidgin-icon-size-tango-extra-small" +#define PIDGIN_ICON_SIZE_TANGO_SMALL "pidgin-icon-size-tango-small" +#define PIDGIN_ICON_SIZE_TANGO_MEDIUM "pidgin-icon-size-tango-medium" +#define PIDGIN_ICON_SIZE_TANGO_HUGE "pidgin-icon-size-tango-huge" /** * Sets up the gaim stock repository. */
--- a/pidgin/gtkaccount.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Jan 27 11:11:26 2007 +0000 @@ -2402,7 +2402,7 @@ gc = gaim_account_get_connection(account); buffer = make_info(account, gc, remote_user, id, alias, msg); - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_INFO, buffer, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_INFO, buffer, NULL, NULL, _("Close"), NULL, NULL); gaim_gtk_blist_add_alert(alert); @@ -2427,7 +2427,7 @@ data->alias = g_strdup(alias); buffer = make_info(account, gc, remote_user, id, alias, msg); - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Add buddy to your list?"), buffer, data, _("Add"), G_CALLBACK(add_user_cb), _("Cancel"), G_CALLBACK(free_add_user_data), NULL); @@ -2502,13 +2502,13 @@ aa->username = g_strdup(remote_user); aa->alias = g_strdup(alias); aa->account = account; - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Authorize buddy?"), buffer, aa, _("Authorize"), authorize_and_add_cb, _("Deny"), deny_no_add_cb, NULL); } else { - alert = gaim_gtk_make_mini_dialog(gc, GAIM_STOCK_DIALOG_QUESTION, + alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION, _("Authorize buddy?"), buffer, user_data, _("Authorize"), auth_cb, _("Deny"), deny_cb,
--- a/pidgin/gtkblist.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkblist.c Sat Jan 27 11:11:26 2007 +0000 @@ -696,8 +696,8 @@ GaimGtkJoinChatData *data = NULL; gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); data = g_new0(GaimGtkJoinChatData, 1); data->window = gtk_dialog_new_with_buttons(_("Join a Chat"), @@ -2646,7 +2646,7 @@ { N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, "<StockItem>", GAIM_STOCK_POUNCE }, { N_("/Tools/Plu_gins"), "<CTL>U", gaim_gtk_plugin_dialog_show, 0, "<StockItem>", GAIM_STOCK_PLUGIN }, { N_("/Tools/Pr_eferences"), "<CTL>P", gaim_gtk_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES }, - { N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "<StockItem>", GTK_STOCK_DIALOG_ERROR }, + { N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_DIALOG_ERROR }, { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/_File Transfers"), "<CTL>T", gaim_gtkxfer_dialog_show, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER }, { N_("/Tools/R_oom List"), NULL, gaim_gtk_roomlist_dialog_show, 0, "<StockItem>", GTK_STOCK_INDEX }, @@ -2897,8 +2897,8 @@ {NULL, 0, 0}, {NULL, 15, 0}}; GaimBuddy *buddy = NULL; GaimChat *chat = NULL; - GtkIconSize icon_size = gtk_icon_size_from_name((size == GAIM_STATUS_ICON_LARGE) ? GAIM_ICON_SIZE_TANGO_MEDIUM : - GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name((size == GAIM_STATUS_ICON_LARGE) ? PIDGIN_ICON_SIZE_TANGO_MEDIUM : + PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if(GAIM_BLIST_NODE_IS_CONTACT(node)) { if(!gtknode->contact_expanded) { @@ -2944,31 +2944,31 @@ if(buddy) { GaimPresence *p = gaim_buddy_get_presence(buddy); if (GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_LOGIN, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGIN, icon_size, "GtkTreeView"); else if (gtkbuddynode && gtkbuddynode->recent_signonoff) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_LOGOUT, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGOUT, icon_size, "GtkTreeView"); else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_UNAVAILABLE)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_BUSY, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY, icon_size, "GtkTreeView"); else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_AWAY)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_AWAY, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY, icon_size, "GtkTreeView"); else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_EXTENDED_AWAY)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_XA, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA, icon_size, "GtkTreeView"); else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_OFFLINE)) - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_OFFLINE, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE, icon_size, "GtkTreeView"); else - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_AVAILABLE, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE, icon_size, "GtkTreeView"); } else if (chat) { - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_CHAT, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_CHAT, icon_size, "GtkTreeView"); } else { - ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), GAIM_STOCK_STATUS_PERSON, + ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_PERSON, icon_size, "GtkTreeView"); } @@ -5112,8 +5112,8 @@ ? account : gaim_connection_get_account(gaim_connections_get_all()->data)); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); @@ -5486,8 +5486,8 @@ data->account = account; data->default_chat_name = g_strdup(name); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
--- a/pidgin/gtkconv.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkconv.c Sat Jan 27 11:11:26 2007 +0000 @@ -825,8 +825,8 @@ GtkWidget *table; GtkWidget *img; - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); info = g_new0(InviteBuddyInfo, 1); info->conv = conv; @@ -1128,8 +1128,8 @@ { GaimGtkWindow *gtkwin = data; GtkWidget *hbox; - GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + GtkWidget *img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); GtkWidget *label; struct _search *s; @@ -7014,8 +7014,8 @@ gtk_box_set_spacing(GTK_BOX(vbox), 12); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_WARNING, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); /* Setup the inner hbox and put the dialog's icon in it. */ hbox = gtk_hbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(vbox), hbox);
--- a/pidgin/gtkdialogs.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Jan 27 11:11:26 2007 +0000 @@ -781,7 +781,7 @@ hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL)); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
--- a/pidgin/gtklog.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtklog.c Sat Jan 27 11:11:26 2007 +0000 @@ -365,18 +365,15 @@ /* Icon *************/ if (pixbuf != NULL) { - GdkPixbuf *scale; GtkWidget *icon; title_box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_set_border_width(GTK_CONTAINER(title_box), GAIM_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); - scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR); - icon = gtk_image_new_from_pixbuf(scale); + icon = gtk_image_new_from_pixbuf(pixbuf); gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); g_object_unref(G_OBJECT(pixbuf)); - g_object_unref(G_OBJECT(scale)); } else title_box = GTK_DIALOG(lv->window)->vbox;
--- a/pidgin/gtknotify.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtknotify.c Sat Jan 27 11:11:26 2007 +0000 @@ -213,15 +213,15 @@ switch (type) { case GAIM_NOTIFY_MSG_ERROR: - icon_name = GAIM_STOCK_DIALOG_ERROR; + icon_name = PIDGIN_STOCK_DIALOG_ERROR; break; case GAIM_NOTIFY_MSG_WARNING: - icon_name = GAIM_STOCK_DIALOG_WARNING; + icon_name = PIDGIN_STOCK_DIALOG_WARNING; break; case GAIM_NOTIFY_MSG_INFO: - icon_name = GAIM_STOCK_DIALOG_INFO; + icon_name = PIDGIN_STOCK_DIALOG_INFO; break; default: @@ -231,7 +231,7 @@ if (icon_name != NULL) { - img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); } @@ -506,8 +506,8 @@ } if (!GTK_WIDGET_VISIBLE(dialog)) { - GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, GAIM_STOCK_ICON_ONLINE_MSG, - GTK_ICON_SIZE_BUTTON, NULL); + GdkPixbuf *pixbuf = gtk_widget_render_icon(dialog, PIDGIN_STOCK_DIALOG_MAIL, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL), NULL); char *label_text = g_strdup_printf(ngettext("<b>You have %d new e-mail.</b>", "<b>You have %d new e-mails.</b>", mail_dialog->total_count), mail_dialog->total_count);
--- a/pidgin/gtkrequest.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkrequest.c Sat Jan 27 11:11:26 2007 +0000 @@ -332,8 +332,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -493,8 +493,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -602,8 +602,8 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -1077,8 +1077,8 @@ gtk_widget_show(hbox); /* Dialog icon. */ - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); + img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, + gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_widget_show(img);
--- a/pidgin/gtkstatusbox.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sat Jan 27 11:11:26 2007 +0000 @@ -518,7 +518,7 @@ gboolean account_status = FALSE; GaimAccount *acct = (status_box->token_status_account) ? status_box->token_status_account : status_box->account; - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); style = gtk_widget_get_style(GTK_WIDGET(status_box)); snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x", @@ -596,7 +596,7 @@ { GaimStatusType *status_type; GaimStatusPrimitive prim; - GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (account_status) { status_type = gaim_status_get_type(gaim_account_get_active_status(acct)); prim = gaim_status_type_get_primitive(status_type); @@ -605,20 +605,20 @@ } if (prim == GAIM_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); #if 0 if (account_status) pixbuf = gaim_gtk_create_prpl_icon_with_status(acct, @@ -846,7 +846,7 @@ /* Odd... oh well, nothing we can do about it. */ return; - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); gtk_gaim_status_box_add_separator(statusbox); @@ -861,20 +861,20 @@ prim = gaim_savedstatus_get_type(saved); if (prim == GAIM_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); if (gaim_savedstatus_is_transient(saved)) { @@ -980,7 +980,7 @@ { GaimStatusType *status_type = (GaimStatusType *)l->data; GaimStatusPrimitive prim; - GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (!gaim_status_type_is_user_settable(status_type)) continue; @@ -988,20 +988,20 @@ prim = gaim_status_type_get_primitive(status_type); if (prim == GAIM_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_BUSY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_XA, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); else if (prim == GAIM_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AVAILABLE, - icon_size, "GtkTreeView"); + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, @@ -1019,7 +1019,7 @@ GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4; GtkIconSize icon_size; - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); /* Unset the model while clearing it */ gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), NULL); @@ -1031,7 +1031,7 @@ if (status_box->account == NULL) { - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_AVAILABLE, + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AVAILABLE, icon_size, "GtkGaimStatusBox"); /* Do all the currently enabled accounts have the same statuses? * If so, display them instead of our global list. @@ -1040,12 +1040,12 @@ add_account_statuses(status_box, status_box->token_status_account); } else { /* Global */ - pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_AWAY, - icon_size, "GtkGaimStatusBox"); - pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_OFFLINE, - icon_size, "GtkGaimStatusBox"); + pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); + pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_INVISIBLE, - icon_size, "GtkGaimStatusBox"); + icon_size, "PidginStatusBox"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE)); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf2, _("Away"), NULL, GINT_TO_POINTER(GAIM_STATUS_AWAY)); @@ -1149,7 +1149,7 @@ GtkIconSize icon_size; g_object_set(G_OBJECT(status_box->icon_rend), "xpad", 3, NULL); - icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_TANGO_EXTRA_SMALL); + icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (status_box->connecting_pixbufs[0] != NULL) gdk_pixbuf_unref(status_box->connecting_pixbufs[0]);
--- a/pidgin/gtkutils.c Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/gtkutils.c Sat Jan 27 11:11:26 2007 +0000 @@ -2937,7 +2937,7 @@ va_list args; static gboolean first_call = TRUE; - img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_BUTTON); + img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); vbox = gtk_vbox_new(FALSE,0);
--- a/pidgin/pixmaps/Makefile.am Sat Jan 27 10:15:07 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Sat Jan 27 11:11:26 2007 +0000 @@ -10,12 +10,6 @@ edit.png \ gaim.png \ gaim.svg \ - gaim_auth.png \ - gaim_cool.png \ - gaim_error.png \ - gaim_info.png \ - gaim_question.png \ - gaim_warning.png \ info.png \ insert-image.png \ insert-image-small.png \ @@ -76,9 +70,6 @@ gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png -gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs -gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png gaim_cool.png gaim_auth.png - gaimiconpixdir = $(datadir)/pixmaps/gaim/icons gaimiconpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png stock_connect_16.png stock_disconnect_16.png