Mercurial > pidgin.yaz

comparison src/gaimrc.c @ 8998:3738d1eac0ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9773] " This patch completes the removal of the Show joins/leaves in chats preferences It also (temporarily?) brings back the UI for the IM/Chat buttons preferences by changing #if 0 to #if 1 so they're still easy to identify to revist later on. The "Individual log file for each buddy's signons" pref became obsolete a while ago and was incorrectly #if'd out with a prefslash04 label. This patch completes it's death. With this patch applied the only prefslash thing that should block release is the custom font/color/size/etc stuff, I think we need to work out what to do there. There's a bit of whitespace cleanup too." --Stu Tomlinson committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 21 May 2004 14:26:31 +0000
parents 175cbf710a47
children b24967757d46
comparison
equal deleted inserted replaced
8997:8bf2c6122bf1 8998:3738d1eac0ad
913 ((display_options & OPT_DISP_SHOW_BUTTON_XPM) 913 ((display_options & OPT_DISP_SHOW_BUTTON_XPM)
914 ? ((display_options & OPT_DISP_NO_BUTTONS) 914 ? ((display_options & OPT_DISP_NO_BUTTONS)
915 ? GAIM_BUTTON_IMAGE : GAIM_BUTTON_TEXT_IMAGE) 915 ? GAIM_BUTTON_IMAGE : GAIM_BUTTON_TEXT_IMAGE)
916 : ((display_options & OPT_DISP_NO_BUTTONS) 916 : ((display_options & OPT_DISP_NO_BUTTONS)
917 ? GAIM_BUTTON_NONE : GAIM_BUTTON_TEXT))); 917 ? GAIM_BUTTON_NONE : GAIM_BUTTON_TEXT)));
918 gaim_prefs_set_bool("/core/conversations/chat/show_join",
919 display_options & OPT_DISP_CHAT_LOGON);
920 gaim_prefs_set_int("/gaim/gtk/conversations/im/button_type", 918 gaim_prefs_set_int("/gaim/gtk/conversations/im/button_type",
921 ((display_options & OPT_DISP_CONV_BUTTON_XPM) 919 ((display_options & OPT_DISP_CONV_BUTTON_XPM)
922 ? ((display_options & OPT_DISP_CONV_BUTTON_TEXT) 920 ? ((display_options & OPT_DISP_CONV_BUTTON_TEXT)
923 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) 921 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE)
924 : ((display_options & OPT_DISP_CONV_BUTTON_TEXT) 922 : ((display_options & OPT_DISP_CONV_BUTTON_TEXT)
1047 ((chat_options & OPT_CHAT_BUTTON_XPM) 1045 ((chat_options & OPT_CHAT_BUTTON_XPM)
1048 ? ((chat_options & OPT_CHAT_BUTTON_TEXT) 1046 ? ((chat_options & OPT_CHAT_BUTTON_TEXT)
1049 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE) 1047 ? GAIM_BUTTON_TEXT_IMAGE : GAIM_BUTTON_IMAGE)
1050 : ((chat_options & OPT_CHAT_BUTTON_TEXT) 1048 : ((chat_options & OPT_CHAT_BUTTON_TEXT)
1051 ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE))); 1049 ? GAIM_BUTTON_TEXT : GAIM_BUTTON_NONE)));
1052 gaim_prefs_set_bool("/core/conversations/chat/show_join",
1053 chat_options & OPT_CHAT_LOGON);
1054 gaim_prefs_set_bool("/gaim/gtk/conversations/chat/raise_on_events", 1050 gaim_prefs_set_bool("/gaim/gtk/conversations/chat/raise_on_events",
1055 chat_options & OPT_CHAT_POPUP); 1051 chat_options & OPT_CHAT_POPUP);
1056 gaim_prefs_set_bool("/gaim/gtk/conversations/chat/color_nicks", 1052 gaim_prefs_set_bool("/gaim/gtk/conversations/chat/color_nicks",
1057 chat_options & OPT_CHAT_COLORIZE); 1053 chat_options & OPT_CHAT_COLORIZE);
1058 1054