pidgin: fd0a394b: Fix theme variant pref names.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: fd0a394b4cb3ea30a43cc1b9375fc70246e68318
Parent:   0ac3f7db6142394794c5b5d27d6ba81a5aebbc6b
Author:   qulogic at pidgin.im
Date:     09/18/11 23:10:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fd0a394b4cb3ea30a43cc1b9375fc70246e68318

Changelog: 

Fix theme variant pref names.

Changes against parent 0ac3f7db6142394794c5b5d27d6ba81a5aebbc6b

  patched  pidgin/gtkconv-theme.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv-theme.c	172c0b6fdbbb62eb1645b44040cb85026977ce2d
+++ pidgin/gtkconv-theme.c	f07ca7d174d9a4707f109a0def07c6d811a8b758
@@ -562,7 +562,7 @@ pidgin_conversation_theme_save_state(con
 	priv = PIDGIN_CONV_THEME_GET_PRIVATE(theme);
 
 	val = get_key(priv, "CFBundleIdentifier", FALSE);
-	prefname = g_strdup_printf("/plugins/gtk/adiumthemes/%s", g_value_get_string(val));
+	prefname = g_strdup_printf(PIDGIN_PREFS_ROOT "/conversation/themes/%s", g_value_get_string(val));
 	variant = g_strdup_printf("%s/variant", prefname);
 
 	purple_debug_info("webkit", "saving state with variant %s\n", priv->variant);
@@ -580,24 +580,21 @@ pidgin_conversation_theme_load_state(Pid
 	PidginConvThemePrivate *priv;
 	const GValue *val;
 	char *prefname;
-	char *variant;
 	const char* value;
 	gboolean changed;
 
 	priv = PIDGIN_CONV_THEME_GET_PRIVATE(theme);
 
 	val = get_key(priv, "CFBundleIdentifier", FALSE);
-	prefname = g_strdup_printf("/plugins/gtk/adiumthemes/%s", g_value_get_string(val));
-	variant = g_strdup_printf("%s/variant", prefname);
+	prefname = g_strdup_printf(PIDGIN_PREFS_ROOT "/conversation/themes/%s/variant", g_value_get_string(val));
 
-	value = purple_prefs_get_string(variant);
+	value = purple_prefs_get_string(prefname);
 	changed = !priv->variant || !g_str_equal(priv->variant, value);
 
 	g_free(priv->variant);
 	priv->variant = g_strdup(value);
 
 	g_free(prefname);
-	g_free(variant);
 }
 
 PidginConvTheme *