# HG changeset patch # User Richard Laager # Date 1177431601 0 # Node ID 6c97924af83b9e03f21702cb145e67d3b54e847b # Parent 30f2fdcea12ca1cc4d87d427d8e823c42b3d8b7a Call the migrate code from Finch. diff -r 30f2fdcea12c -r 6c97924af83b finch/finch.c --- a/finch/finch.c Tue Apr 24 13:28:42 2007 +0000 +++ b/finch/finch.c Tue Apr 24 16:20:01 2007 +0000 @@ -272,9 +272,32 @@ * Fire up this baby. */ - /* Because we don't want debug-messages to show up and corrup the display */ + /* We don't want debug-messages to show up and corrupt the display */ purple_debug_set_enabled(debug_enabled); + /* If we're using a custom configuration directory, we + * do NOT want to migrate, or weird things will happen. */ + if (opt_config_dir_arg == NULL) + { + if (!purple_core_migrate()) + { + char *old = g_strconcat(purple_home_dir(), + G_DIR_SEPARATOR_S ".gaim", NULL); + char *text = g_strdup_printf(_( + "%s encountered errors migrating your settings " + "from %s to %s. Please investigate and complete the " + "migration by hand."), _("Finch"), + old, purple_user_dir()); + + g_free(old); + + purple_print_utf8_to_console(stderr, text); + g_free(text); + + return 0; + } + } + purple_core_set_ui_ops(gnt_core_get_ui_ops()); purple_eventloop_set_ui_ops(gnt_eventloop_get_ui_ops()); purple_idle_set_ui_ops(finch_idle_get_ui_ops());