зеркало из https://github.com/mozilla/pjs.git
remove the MigrateNewsFilters() call. we don't have to migrate news filters.
(but they don't work yet, but that's another bug.) r=bienvenu
This commit is contained in:
Родитель
9f88f0ed6f
Коммит
bd2c270c73
|
@ -2190,10 +2190,6 @@ nsMessengerMigrator::MigrateNewsAccount(nsIMsgIdentity *identity, const char *ho
|
||||||
newsDir->CreateDir();
|
newsDir->CreateDir();
|
||||||
}
|
}
|
||||||
|
|
||||||
// migrate the filter files
|
|
||||||
rv = MigrateNewsFilters(server);
|
|
||||||
if (NS_FAILED(rv)) return rv;
|
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2230,14 +2226,6 @@ nsMessengerMigrator::MigrateOldNntpPrefs(nsIMsgIncomingServer *server, const cha
|
||||||
#define MIGRATE_FILTERS 1
|
#define MIGRATE_FILTERS 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
nsresult nsMessengerMigrator::MigrateNewsFilters(nsIMsgIncomingServer *aServer)
|
|
||||||
{
|
|
||||||
#ifdef DEBUG
|
|
||||||
printf("news filter files aren't migrated, because we don't support hostinfo.dat files yet. I'm working on it.\n");
|
|
||||||
#endif
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsresult nsMessengerMigrator::MigrateFilters(nsIMsgIncomingServer *aServer)
|
nsresult nsMessengerMigrator::MigrateFilters(nsIMsgIncomingServer *aServer)
|
||||||
{
|
{
|
||||||
#ifdef MIGRATE_FILTERS
|
#ifdef MIGRATE_FILTERS
|
||||||
|
|
|
@ -121,7 +121,6 @@ private:
|
||||||
|
|
||||||
nsresult SetSendLaterUriPref(nsIMsgIncomingServer *server);
|
nsresult SetSendLaterUriPref(nsIMsgIncomingServer *server);
|
||||||
nsresult MigrateFilters(nsIMsgIncomingServer *server);
|
nsresult MigrateFilters(nsIMsgIncomingServer *server);
|
||||||
nsresult MigrateNewsFilters(nsIMsgIncomingServer *server);
|
|
||||||
|
|
||||||
nsresult getPrefService();
|
nsresult getPrefService();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче