Mercurial > pidgin
comparison src/gaimrc.c @ 5889:466e0103ff8b
[gaim-migrate @ 6321]
Fixed incorrect preference types on import.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Sun, 15 Jun 2003 08:33:25 +0000 |
parents | 448f2f4ca3ec |
children | a4f2aba0848d |
comparison
equal
deleted
inserted
replaced
5888:5051dcbaf6d4 | 5889:466e0103ff8b |
---|---|
827 display_options & OPT_DISP_SHOW_LOGON); | 827 display_options & OPT_DISP_SHOW_LOGON); |
828 gaim_prefs_set_bool("/gaim/gtk/conversations/show_smileys", | 828 gaim_prefs_set_bool("/gaim/gtk/conversations/show_smileys", |
829 display_options & OPT_DISP_SHOW_SMILEY); | 829 display_options & OPT_DISP_SHOW_SMILEY); |
830 gaim_prefs_set_bool("/core/conversations/chat/show_join", | 830 gaim_prefs_set_bool("/core/conversations/chat/show_join", |
831 display_options & OPT_DISP_CHAT_LOGON); | 831 display_options & OPT_DISP_CHAT_LOGON); |
832 gaim_prefs_set_bool("/gaim/gtk/conversations/im/button_type", | 832 gaim_prefs_set_int("/gaim/gtk/conversations/im/button_type", |
833 ((display_options & OPT_DISP_CONV_BUTTON_XPM) | 833 ((display_options & OPT_DISP_CONV_BUTTON_XPM) |
834 ? ((display_options & OPT_DISP_CONV_BUTTON_TEXT) | 834 ? ((display_options & OPT_DISP_CONV_BUTTON_TEXT) |
835 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) | 835 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) |
836 : ((display_options & OPT_DISP_CONV_BUTTON_TEXT) | 836 : ((display_options & OPT_DISP_CONV_BUTTON_TEXT) |
837 ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); | 837 ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); |
838 gaim_prefs_set_bool("/gaim/gtk/conversations/chat/button_type", | 838 gaim_prefs_set_int("/gaim/gtk/conversations/chat/button_type", |
839 ((display_options & OPT_DISP_CHAT_BUTTON_XPM) | 839 ((display_options & OPT_DISP_CHAT_BUTTON_XPM) |
840 ? ((display_options & OPT_DISP_CHAT_BUTTON_TEXT) | 840 ? ((display_options & OPT_DISP_CHAT_BUTTON_TEXT) |
841 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) | 841 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) |
842 : ((display_options & OPT_DISP_CHAT_BUTTON_TEXT) | 842 : ((display_options & OPT_DISP_CHAT_BUTTON_TEXT) |
843 ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); | 843 ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); |