From: Christian H. <ch...@us...> - 2003-11-18 23:28:44
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv3102 Modified Files: conversation.c gaimrc.c gtkprefs.c Log Message: This should update all the other prefs that needed updating for logging to be fully core/UI split. Index: conversation.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.c,v retrieving revision 1.571 retrieving revision 1.572 diff -u -d -p -r1.571 -r1.572 --- conversation.c 18 Nov 2003 23:24:04 -0000 1.571 +++ conversation.c 18 Nov 2003 23:28:40 -0000 1.572 @@ -819,7 +819,7 @@ gaim_conversation_new(GaimConversationTy 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 @@ gaim_conversation_new(GaimConversationTy 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); Index: gaimrc.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v retrieving revision 1.228 retrieving revision 1.229 diff -u -d -p -r1.228 -r1.229 --- gaimrc.c 18 Nov 2003 23:24:05 -0000 1.228 +++ gaimrc.c 18 Nov 2003 23:28:40 -0000 1.229 @@ -962,22 +962,10 @@ static void gaimrc_read_options(FILE *f) } 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 @@ static void gaimrc_read_options(FILE *f) 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); } } Index: gtkprefs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -p -r1.93 -r1.94 --- gtkprefs.c 18 Nov 2003 23:24:05 -0000 1.93 +++ gtkprefs.c 18 Nov 2003 23:28:40 -0000 1.94 @@ -1325,9 +1325,9 @@ GtkWidget *logging_page() { 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"), @@ -2731,16 +2731,6 @@ gaim_gtk_prefs_init(void) /* Idle */ 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"); |