Mercurial > pidgin
changeset 855:82673bb41e2f
[gaim-migrate @ 865]
hehehe
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 07 Sep 2000 17:53:35 +0000 |
| parents | 9e2dcad06d3c |
| children | b389c4221c89 |
| files | src/aim.c src/prefs.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aim.c Thu Sep 07 17:26:09 2000 +0000 +++ b/src/aim.c Thu Sep 07 17:53:35 2000 +0000 @@ -596,7 +596,6 @@ show_login(); - new_conversation("Roo"); gtk_main(); #endif /* USE_APPLET */
--- a/src/prefs.c Thu Sep 07 17:26:09 2000 +0000 +++ b/src/prefs.c Thu Sep 07 17:53:35 2000 +0000 @@ -41,7 +41,8 @@ #include "pixmaps/gnome_add.xpm" #include "pixmaps/gnome_remove.xpm" #include "pixmaps/gnome_preferences.xpm" -#include "pixmaps/palette.xpm" +#include "pixmaps/bgcolor.xpm" +#include "pixmaps/fgcolor.xpm" #include "pixmaps/save.xpm" struct debug_window *dw = NULL; @@ -1012,7 +1013,7 @@ button = gaim_button(_("Text Color"), &font_options, OPT_FONT_FGCOL, hbox); - select = picture_button(prefs, _("Select"), palette_xpm); + select = picture_button(prefs, _("Select"), fgcolor_xpm); gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 5); if (!(font_options & OPT_FONT_FGCOL)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); @@ -1027,7 +1028,7 @@ button = gaim_button(_("Background Color"), &font_options, OPT_FONT_BGCOL, hbox); - select = picture_button(prefs, _("Select"), palette_xpm); + select = picture_button(prefs, _("Select"), bgcolor_xpm); gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 5); if (!(font_options & OPT_FONT_BGCOL)) gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);