Mercurial > pidgin.yaz
changeset 7562:b859cfb5f31a
[gaim-migrate @ 8176]
This should update all the other prefs that needed updating for logging to
be fully core/UI split.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 18 Nov 2003 23:28:40 +0000 |
| parents | cdfdbabd3266 |
| children | cb9c3b6d6de9 |
| files | src/conversation.c src/gaimrc.c src/gtkprefs.c |
| diffstat | 3 files changed, 8 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Tue Nov 18 23:24:05 2003 +0000 +++ b/src/conversation.c Tue Nov 18 23:28:40 2003 +0000 @@ -819,7 +819,7 @@ ims = g_list_append(ims, conv); gaim_conversation_set_logging(conv, - gaim_prefs_get_bool("/gaim/gtk/logging/log_ims")); + gaim_prefs_get_bool("/core/logging/log_ims")); } else if (type == GAIM_CONV_CHAT) { @@ -829,7 +829,7 @@ chats = g_list_append(chats, conv); gaim_conversation_set_logging(conv, - gaim_prefs_get_bool("/gaim/gtk/logging/log_chats")); + gaim_prefs_get_bool("/core/logging/log_chats")); } conversations = g_list_append(conversations, conv);
--- a/src/gaimrc.c Tue Nov 18 23:24:05 2003 +0000 +++ b/src/gaimrc.c Tue Nov 18 23:28:40 2003 +0000 @@ -962,22 +962,10 @@ } else if (!strcmp(p->option, "logging_options")) { logging_options = atoi(p->value[0]); read_logging = TRUE; - gaim_prefs_set_bool("/gaim/gtk/logging/log_ims", + gaim_prefs_set_bool("/core/logging/log_ims", logging_options & OPT_LOG_CONVOS); - gaim_prefs_set_bool("/gaim/gtk/logging/strip_html", - logging_options & OPT_LOG_STRIP_HTML); - gaim_prefs_set_bool("/gaim/gtk/logging/individual_logs", - logging_options & OPT_LOG_INDIVIDUAL); - gaim_prefs_set_bool("/gaim/gtk/logging/log_chats", + gaim_prefs_set_bool("/core/logging/log_chats", logging_options & OPT_LOG_CHATS); - gaim_prefs_set_bool("/gaim/gtk/logging/log_signon_signoff", - logging_options & OPT_LOG_BUDDY_SIGNON); - gaim_prefs_set_bool("/gaim/gtk/logging/log_idle_state", - logging_options & OPT_LOG_BUDDY_IDLE); - gaim_prefs_set_bool("/gaim/gtk/logging/log_away_state", - logging_options & OPT_LOG_BUDDY_AWAY); - gaim_prefs_set_bool("/gaim/gtk/logging/log_own_states", - logging_options & OPT_LOG_MY_SIGNON); } else if (!strcmp(p->option, "blist_options")) { blist_options = atoi(p->value[0]); gaim_prefs_set_bool("/gaim/gtk/blist/show_group_count", @@ -1283,12 +1271,10 @@ if (read_general) { if (!read_logging) { logging_options = 0; - gaim_prefs_set_bool("/gaim/gtk/logging/log_ims", + gaim_prefs_set_bool("/core/logging/log_ims", general_options & OPT_GEN_LOG_ALL); - gaim_prefs_set_bool("/gaim/gtk/logging/log_chats", + gaim_prefs_set_bool("/core/logging/log_chats", general_options & OPT_GEN_LOG_ALL); - gaim_prefs_set_bool("/gaim/gtk/logging/strip_html", - general_options & OPT_GEN_STRIP_HTML); } }
--- a/src/gtkprefs.c Tue Nov 18 23:24:05 2003 +0000 +++ b/src/gtkprefs.c Tue Nov 18 23:28:40 2003 +0000 @@ -1325,9 +1325,9 @@ names); prefs_checkbox(_("_Log all instant messages"), - "/gaim/gtk/logging/log_ims", vbox); + "/core/logging/log_ims", vbox); prefs_checkbox(_("Log all c_hats"), - "/gaim/gtk/logging/log_chats", vbox); + "/core/logging/log_chats", vbox); /* vbox = gaim_gtk_make_frame (ret, _("System Logs")); prefs_checkbox(_("Log when buddies _sign on/sign off"), @@ -2732,16 +2732,6 @@ gaim_prefs_add_none("/gaim/gtk/idle"); gaim_prefs_add_string("/gaim/gtk/idle/reporting_method", "system"); - /* Logging */ - gaim_prefs_add_none("/gaim/gtk/logging"); - gaim_prefs_add_bool("/gaim/gtk/logging/log_ims", TRUE); - gaim_prefs_add_bool("/gaim/gtk/logging/log_chats", TRUE); - gaim_prefs_add_bool("/gaim/gtk/logging/log_signon_signoff", TRUE); - gaim_prefs_add_bool("/gaim/gtk/logging/log_idle_state", TRUE); - gaim_prefs_add_bool("/gaim/gtk/logging/log_away_state", TRUE); - gaim_prefs_add_bool("/gaim/gtk/logging/log_own_states", TRUE); - gaim_prefs_add_bool("/gaim/gtk/logging/individual_logs", FALSE); - /* Plugins */ gaim_prefs_add_none("/gaim/gtk/plugins"); gaim_prefs_add_string_list("/gaim/gtk/plugins/loaded", NULL);