diff -r 3302a1d08cda -r d88ae5b94191 libpurple/prefs.c --- a/libpurple/prefs.c Mon Jan 20 23:44:09 2014 +0530 +++ b/libpurple/prefs.c Tue Jan 21 01:28:36 2014 +0530 @@ -39,8 +39,6 @@ #include "win32dep.h" #endif -#define PREFS_XML_VERSION "1.1" - struct pref_cb { PurplePrefCallback func; gpointer data; @@ -186,7 +184,7 @@ /* Create the root preference node */ node = purple_xmlnode_new("pref"); - purple_xmlnode_set_attrib(node, "version", PREFS_XML_VERSION); + purple_xmlnode_set_attrib(node, "version", "1"); purple_xmlnode_set_attrib(node, "name", "/"); /* All My Children */ @@ -241,7 +239,6 @@ *********************************************************************/ static GList *prefs_stack = NULL; -static gchar *xml_version = NULL; static void prefs_start_element_handler (GMarkupParseContext *context, @@ -281,12 +278,6 @@ return; } else if(purple_strequal(attribute_names[i], "value")) { pref_value = attribute_values[i]; - } else if(purple_strequal(attribute_names[i], "version")) { - g_free(xml_version); - xml_version = g_strdup(attribute_values[i]); - if (purple_version_strcmp(xml_version, PREFS_XML_VERSION) > 0) - purple_debug_warning("prefs", "prefs.xml on disk is for a " - "newer version of libpurple"); } } @@ -1336,8 +1327,8 @@ return list; } -static void -update_old_prefs(void) +void +purple_prefs_update_old() { purple_prefs_rename("/core", "/purple"); @@ -1442,15 +1433,7 @@ purple_prefs_remove("/purple/contact/idle_score"); purple_prefs_load(); - - if (purple_version_strcmp(xml_version, "1.1") < 0) { - purple_debug_info("prefs", "Migrating prefs.xml from version %s to 1.1\n", - xml_version); - update_old_prefs(); - } - - g_free(xml_version); - xml_version = NULL; + purple_prefs_update_old(); } void