# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1054237819 0
# Node ID 80e4ba770f970377a137b084036b300480a37a75
# Parent  90a67ea697f78329640be3cfe7831d8d2fd591ff
[gaim-migrate @ 5949]
incremental progress

committer: Tailor Script <tailor@pidgin.im>

diff -r 90a67ea697f7 -r 80e4ba770f97 src/gtkutils.c
--- a/src/gtkutils.c	Thu May 29 19:48:13 2003 +0000
+++ b/src/gtkutils.c	Thu May 29 19:50:19 2003 +0000
@@ -44,6 +44,7 @@
 #endif
 #include "gtkimhtml.h"
 #include <gdk/gdkkeysyms.h>
+#include "prefs.h"
 #include "prpl.h"
 #include "ui.h"
 #include "notify.h"
@@ -58,7 +59,7 @@
 	g_return_if_fail(imhtml != NULL);
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
 
-	if (!(convo_options & OPT_CONVO_SHOW_SMILEY))
+	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/show_smileys"))
 		gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE);
 
 	g_signal_connect(G_OBJECT(imhtml), "url_clicked",
diff -r 90a67ea697f7 -r 80e4ba770f97 src/idle.c
--- a/src/idle.c	Thu May 29 19:48:13 2003 +0000
+++ b/src/idle.c	Thu May 29 19:50:19 2003 +0000
@@ -40,6 +40,7 @@
 #include "gaim.h"
 #include "multi.h"
 #include "prpl.h"
+#include "prefs.h"
 
 #define IDLEMARK 600   	/* 10 minutes! */
 
@@ -78,7 +79,7 @@
 #endif /* USE_SCREENSAVER */
 		idle_time = t - gc->lastsent;
 
-	if ((away_options & OPT_AWAY_AUTO) && (idle_time > (60 * auto_away)) && (!gc->is_auto_away)) {
+	if (gaim_prefs_get_bool("/core/away/away_when_idle") && (idle_time > (60 * auto_away)) && (!gc->is_auto_away)) {
 		if (!gc->away) {
 			gaim_debug(GAIM_DEBUG_INFO, "idle",
 					   "Making %s away automatically\n", gc->username);
diff -r 90a67ea697f7 -r 80e4ba770f97 src/log.c
--- a/src/log.c	Thu May 29 19:48:13 2003 +0000
+++ b/src/log.c	Thu May 29 19:50:19 2003 +0000
@@ -14,6 +14,7 @@
 #include "gaim.h"
 #include "core.h"
 #include "multi.h"
+#include "prefs.h"
 #include "prpl.h"
 #include "notify.h"
 #include <string.h>
@@ -44,9 +45,6 @@
 	log_conversations = g_list_remove(log_conversations, a);
 
 	save_prefs();
-
-	if (cnv && !(im_options & OPT_IM_ONE_WINDOW))
-		gaim_conversation_autoset_title(cnv);
 }
 
 struct log_conversation *find_log_info(const char *name)
@@ -88,10 +86,10 @@
 		if (gtkconv->toolbar.log) {
 			if (gaim_conversation_get_type(c) == GAIM_CONV_CHAT)
 				gtk_widget_set_sensitive(GTK_WIDGET(gtkconv->toolbar.log),
-						   ((logging_options & OPT_LOG_CHATS)) ? FALSE : TRUE);
+						!gaim_prefs_get_bool("/gaim/gtk/logging/log_chats"));
 			else
 				gtk_widget_set_sensitive(GTK_WIDGET(gtkconv->toolbar.log),
-							 ((logging_options & OPT_LOG_CONVOS)) ? FALSE : TRUE);
+						!gaim_prefs_get_bool("/gaim/gtk/logging/log_ims"));
 		}
 	}
 }
@@ -244,8 +242,8 @@
 	int flag = 0;
 
 	if (((is_chat == 2) && !(logging_options & OPT_LOG_INDIVIDUAL))
-		|| ((is_chat == 1) && !(logging_options & OPT_LOG_CHATS))
-		|| ((is_chat == 0) && !(logging_options & OPT_LOG_CONVOS))) {
+		|| ((is_chat == 1) && !gaim_prefs_get_bool("/gaim/gtk/logging/log_chats"))
+		|| ((is_chat == 0) && !gaim_prefs_get_bool("/gaim/gtk/logging/log_ims"))) {
 
 		l = find_log_info(name);
 		if (!l)
@@ -420,7 +418,7 @@
 		}
 	}
 
-	if (logging_options & OPT_LOG_STRIP_HTML) {
+	if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) {
 		fprintf(fd, "---- %s ----\n", text);
 	} else {
 		if (logging_options & OPT_LOG_INDIVIDUAL)