changeset 32116:994e8d214754

merge of '1fce34e57b019434e9750dcf603d304c3e20959d' and '5cdf9355ba7a6f7004193cbe87f5944ebb768dd8'
author Paul Aurich <paul@darkrain42.org>
date Sun, 08 Nov 2009 01:12:44 +0000
parents 7c346c5a05d4 (current diff) dcbdee6148e4 (diff)
children 585d6f844f79
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/adiumthemes/webkit.c	Wed Oct 14 02:41:11 2009 +0000
+++ b/pidgin/plugins/adiumthemes/webkit.c	Sun Nov 08 01:12:44 2009 +0000
@@ -658,6 +658,7 @@
 	g_free (name);
 	g_free (cur_style_dir);
 	cur_style_dir = g_strdup (iter->data);;
+	purple_prefs_set_string ("/plugins/gtk/adiumthemes/stylepath", cur_style_dir);
 
 	/* inform the user that existing conversations haven't changed */
 	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "The style for existing conversations have not been changed. Please close and re-open the conversation for the changes to take effect.");
@@ -846,7 +847,7 @@
 	purple_prefs_add_none ("/plugins");
 	purple_prefs_add_none ("/plugins/gtk");
 	purple_prefs_add_none ("/plugins/gtk/adiumthemes");
-	purple_prefs_add_string ("/plugins/gtk/adiumthemes/csspath", "");
+	purple_prefs_add_string ("/plugins/gtk/adiumthemes/stylepath", "");
 }
 
 PURPLE_INIT_PLUGIN(webkit, init_plugin, info)