# HG changeset patch # User Christian Hammond # Date 1055666005 0 # Node ID 466e0103ff8b9ce29e21e34063265bcd406b2998 # Parent 5051dcbaf6d40cecf1387feea18bb6d41234dd03 [gaim-migrate @ 6321] Fixed incorrect preference types on import. committer: Tailor Script diff -r 5051dcbaf6d4 -r 466e0103ff8b src/gaimrc.c --- a/src/gaimrc.c Sun Jun 15 08:28:07 2003 +0000 +++ b/src/gaimrc.c Sun Jun 15 08:33:25 2003 +0000 @@ -829,13 +829,13 @@ display_options & OPT_DISP_SHOW_SMILEY); gaim_prefs_set_bool("/core/conversations/chat/show_join", display_options & OPT_DISP_CHAT_LOGON); - gaim_prefs_set_bool("/gaim/gtk/conversations/im/button_type", + gaim_prefs_set_int("/gaim/gtk/conversations/im/button_type", ((display_options & OPT_DISP_CONV_BUTTON_XPM) ? ((display_options & OPT_DISP_CONV_BUTTON_TEXT) ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) : ((display_options & OPT_DISP_CONV_BUTTON_TEXT) ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); - gaim_prefs_set_bool("/gaim/gtk/conversations/chat/button_type", + gaim_prefs_set_int("/gaim/gtk/conversations/chat/button_type", ((display_options & OPT_DISP_CHAT_BUTTON_XPM) ? ((display_options & OPT_DISP_CHAT_BUTTON_TEXT) ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE)