pidgin: 28344d83: Use a consistent prefs name. It should b...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 28344d83587ee1f03891921f68f93c0163d25cff
Parent:   275f30ebdaaf463eb11a67f1d276f181e5834c22
Author:   qulogic at pidgin.im
Date:     09/19/11 14:51:53
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/28344d83587ee1f03891921f68f93c0163d25cff

Changelog: 

Use a consistent prefs name. It should be conversation*s* to
match rest of the gtkconv code.

Changes against parent 275f30ebdaaf463eb11a67f1d276f181e5834c22

  patched  pidgin/gtkconv-theme.c
  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	894c545dfc5f16a4219a22ffd53e5e10637f28d7
+++ pidgin/gtkprefs.c	2ba95ea22f14852da8a4eb4718c53d0c62d6dcf5
@@ -594,7 +594,7 @@ prefs_themes_refresh(void)
 	/* 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 @@ theme_page(void)
 	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 @@ pidgin_prefs_init(void)
 	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");
============================================================
--- pidgin/gtkconv-theme.c	a718d1194ca8c0cbad1295c94bc825d97b6aaae0
+++ pidgin/gtkconv-theme.c	8c4a327bfcf9273067a286557250d276d39919ce
@@ -582,7 +582,7 @@ pidgin_conversation_theme_set_variant(Pi
 	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);