# HG changeset patch # User Elliott Sales de Andrade # Date 1316401841 0 # Node ID 504a62af2dd06d63a2a8ce7f2ab2832a532f144d # Parent 4bb82049b075f954ae37278075f11d7bff5957b0 Fix theme variant pref names. diff -r 4bb82049b075 -r 504a62af2dd0 pidgin/gtkconv-theme.c --- a/pidgin/gtkconv-theme.c Mon Sep 19 02:56:08 2011 +0000 +++ b/pidgin/gtkconv-theme.c Mon Sep 19 03:10:41 2011 +0000 @@ -562,7 +562,7 @@ 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 @@ 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 *