# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1316458313 0
# Node ID f857a6db3bd9ce6eec556b8553c9ebf9a8294888
# Parent  a7a6770f26e23d95ddd632200bdbca5d45ac4979
Use a consistent prefs name. It should be conversation*s* to
match rest of the gtkconv code.

diff -r a7a6770f26e2 -r f857a6db3bd9 pidgin/gtkconv-theme.c
--- a/pidgin/gtkconv-theme.c	Mon Sep 19 18:48:00 2011 +0000
+++ b/pidgin/gtkconv-theme.c	Mon Sep 19 18:51:53 2011 +0000
@@ -582,7 +582,7 @@
 	priv->variant = g_strdup(variant);
 
 	val = get_key(priv, "CFBundleIdentifier", FALSE);
-	prefname = g_strdup_printf(PIDGIN_PREFS_ROOT "/conversation/themes/%s/variant",
+	prefname = g_strdup_printf(PIDGIN_PREFS_ROOT "/conversations/themes/%s/variant",
 	                           g_value_get_string(val));
 	purple_prefs_set_string(prefname, variant);
 	g_free(prefname);
diff -r a7a6770f26e2 -r f857a6db3bd9 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Sep 19 18:48:00 2011 +0000
+++ b/pidgin/gtkprefs.c	Mon Sep 19 18:51:53 2011 +0000
@@ -594,7 +594,7 @@
 	/* set active */
 	prefs_set_active_theme_combo(prefs_sound_themes_combo_box, prefs_sound_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"));
 	prefs_set_active_theme_combo(prefs_blist_themes_combo_box, prefs_blist_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"));
-	prefs_set_active_theme_combo(prefs_conv_themes_combo_box, prefs_conv_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversation/theme"));
+	prefs_set_active_theme_combo(prefs_conv_themes_combo_box, prefs_conv_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/theme"));
 	prefs_set_active_theme_combo(prefs_status_themes_combo_box, prefs_status_icon_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"));
 	prefs_set_active_theme_combo(prefs_smiley_themes_combo_box, prefs_smiley_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme"));
 	prefs_sound_themes_loading = FALSE;
@@ -1158,7 +1158,7 @@
 	prefs_conv_themes_combo_box = add_theme_prefs_combo(
 		vbox, combo_sg, label_sg, prefs_conv_themes,
 		(GCallback)prefs_set_conv_theme_cb, NULL,
-		_("Conversation Theme:"), PIDGIN_PREFS_ROOT "/conversation/theme", "conversation");
+		_("Conversation Theme:"), PIDGIN_PREFS_ROOT "/conversations/theme", "conversation");
 
 	/* Status Icon Themes */
 	prefs_status_themes_combo_box = add_theme_prefs_combo(
@@ -2926,8 +2926,8 @@
 	prefs_themes_init();
 
 	/* Conversation Themes */
-	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversation");
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversation/theme", "Default");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/theme", "Default");
 
 	/* Smiley Themes */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/smileys");