--- a/pidgin/gtkmain.c Wed Aug 24 15:05:10 2011 +0000
+++ b/pidgin/gtkmain.c Wed Aug 24 15:06:36 2011 +0000
@@ -498,7 +498,6 @@
int opt;
gboolean gui_check;
gboolean debug_enabled;
- gboolean migration_failed = FALSE;
GList *active_accounts;
struct stat st;
@@ -730,16 +729,6 @@
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())
- {
- migration_failed = TRUE;
- }
- }
-
search_path = g_build_filename(purple_user_dir(), "gtkrc-2.0", NULL);
gtk_rc_add_default_file(search_path);
g_free(search_path);
@@ -765,37 +754,6 @@
winpidgin_init(hint);
#endif
- if (migration_failed)
- {
- char *old = g_strconcat(purple_home_dir(),
- G_DIR_SEPARATOR_S ".gaim", NULL);
- const char *text = _(
- "%s encountered errors migrating your settings "
- "from %s to %s. Please investigate and complete the "
- "migration by hand. Please report this error at http://developer.pidgin.im");
- GtkWidget *dialog;
-
- dialog = gtk_message_dialog_new(NULL,
- 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- text, PIDGIN_NAME,
- old, purple_user_dir());
- g_free(old);
-
- g_signal_connect_swapped(dialog, "response",
- G_CALLBACK(gtk_main_quit), NULL);
-
- gtk_widget_show_all(dialog);
-
- gtk_main();
-
-#ifdef HAVE_SIGNAL_H
- g_free(segfault_message);
-#endif
- return 0;
- }
-
purple_core_set_ui_ops(pidgin_core_get_ui_ops());
purple_eventloop_set_ui_ops(pidgin_eventloop_get_ui_ops());
