pidgin: 38d65534: Make sure our pref parents exist, or els...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 38d655341c8e806dad68bb4832cfced864f07fec
Parent:   e7d456f915d62b570b1d83c985a4da5b1e982054
Author:   qulogic at pidgin.im
Date:     09/23/11 13:50:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/38d655341c8e806dad68bb4832cfced864f07fec

Changelog: 

Make sure our pref parents exist, or else saved variants will
be forgotten when restarting or re-opening the Preferences.

Changes against parent e7d456f915d62b570b1d83c985a4da5b1e982054

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

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	1482d1f74f1547edf9c99252e5d4961d40b44ddd
+++ pidgin/gtkconv.c	11233511399abe78a00d39fbebc8306da4b91d28
@@ -8205,6 +8205,7 @@ pidgin_conversations_init(void)
 
 	/* Conversations */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/themes");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", TRUE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", TRUE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", FALSE);
============================================================
--- pidgin/gtkconv-theme-loader.c	0dd356171c2d717e50fc7f2fcb6061363b93d71a
+++ pidgin/gtkconv-theme-loader.c	5596b147a2d998907fcaae49bda45b02edcaee0c
@@ -190,6 +190,12 @@ pidgin_conv_loader_build(const gchar *di
 		const char *default_variant = NULL;
 		const char *file;
 
+		/* Make sure prefs exist */
+		prefname = g_strdup_printf(PIDGIN_PREFS_ROOT "/conversations/themes/%s",
+		                           CFBundleIdentifier);
+		purple_prefs_add_none(prefname);
+		g_free(prefname);
+
 		/* Try user-set variant */
 		prefname = g_strdup_printf(PIDGIN_PREFS_ROOT "/conversations/themes/%s/variant",
 		                           CFBundleIdentifier);