Fixing bug #13518

profile/resources/pm.js

@@ -14,54 +14,11 @@ function CreateProfile()
 	this.location.href = "resource:/res/profile/pm.xul";
 }
 
-function MigrateProfile(override)
-{
-	// Hack to avoid writing two copies of this
-	if (override) 
-		selected = override;
-
-	if (!selected)
-	{
-		dump("Select a profile to migrate.\n");
-		return;
-	}
-
-	var name = selected.getAttribute("rowName");
-	var migrate = selected.getAttribute("rowMigrate");
-
-	if (migrate != "true")
-	{
-		dump("This profile doesn't need migration.\n");
-		return;
-	}
-
-	profileCore.MigrateProfile(name);
-	//this.location.replace(this.location);
-	//this.location.href = this.location;
-	this.location.href = "resource:/res/profile/pm.xul";
-}
-
-function MigrateAllProfiles()
-{
-	var body = document.getElementById("theTreeBody");
-
-	var child = body.firstChild;
-
-	while (child)
-	{
-		if (child.getAttribute("rowMigrate") == "true")
-		{
-			MigrateProfile(child);
-		}
-		child = child.nextSibling;
-	}
-}
-
 function RenameProfile(w)
 {
 	if (!selected)
 	{
-		dump("Select a profile to migrate.\n");
+		dump("Select a profile to rename.\n");
 		return;
 	}
 

profile/resources/pm.xul

@@ -31,8 +31,6 @@
 <!ENTITY migration.label "Migration">
 <!ENTITY user.label "User Name">
 <!ENTITY newCmd.label "New...">
-<!ENTITY migrateCmd.label "Migrate">
-<!ENTITY migrateAllCmd.label "Migrate All">
 <!ENTITY renameCmd.label "Rename...">
 <!ENTITY deleteCmd.label "Delete">
 <!ENTITY startCmd.label "Start">
@@ -73,9 +71,7 @@ xmlns:html="http://www.w3.org/TR/REC-html40"
 		
 	<box align="horizontal">	
 		<box align="vertical">	
-			<titledbutton value="&newCmd.label;"  onclick="openCreateProfile();" style="margin-bottom: 1em;"/>
-			<titledbutton value="&migrateCmd.label;"  onclick="MigrateProfile();"/>
-			<titledbutton value="&migrateAllCmd.label;"  onclick="ConfirmMigrateAll();"  style="margin-bottom: 1em;"/>
+			<titledbutton value="&newCmd.label;"  onclick="openCreateProfile();" />
 			<titledbutton value="&renameCmd.label;"  onclick="openRename();" />
 			<titledbutton value="&deleteCmd.label;"  onclick="ConfirmDelete();" />
 		</box>