зеркало из https://github.com/mozilla/pjs.git
Adding default localstore.rdf for new/mig. profiles. bug 44669. r=sspitzer
This commit is contained in:
Родитель
6303228f09
Коммит
c02aff3231
|
@ -902,6 +902,7 @@ sub MakeResourceAliases()
|
|||
|
||||
_copy(":mozilla:profile:defaults:bookmarks.html","$default_profile_dir"."bookmarks.html");
|
||||
_copy(":mozilla:profile:defaults:panels.rdf","$default_profile_dir"."panels.rdf");
|
||||
_copy(":mozilla:profile:defaults:localstore.rdf","$default_profile_dir"."localstore.rdf");
|
||||
_copy(":mozilla:profile:defaults:search.rdf","$default_profile_dir"."search.rdf");
|
||||
_copy(":mozilla:profile:defaults:mimeTypes.rdf","$default_profile_dir"."mimeTypes.rdf");
|
||||
|
||||
|
@ -911,6 +912,7 @@ sub MakeResourceAliases()
|
|||
|
||||
_copy(":mozilla:profile:defaults:bookmarks.html","$default_profile_dir_en_US"."bookmarks.html");
|
||||
_copy(":mozilla:profile:defaults:panels.rdf","$default_profile_dir_en_US"."panels.rdf");
|
||||
_copy(":mozilla:profile:defaults:localstore.rdf","$default_profile_dir_en_US"."localstore.rdf");
|
||||
_copy(":mozilla:profile:defaults:search.rdf","$default_profile_dir_en_US"."search.rdf");
|
||||
_copy(":mozilla:profile:defaults:mimeTypes.rdf","$default_profile_dir_en_US"."mimeTypes.rdf");
|
||||
}
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
#!dest profile
|
||||
bookmarks.html
|
||||
mimeTypes.rdf
|
||||
panels.rdf
|
||||
search.rdf
|
|
@ -32,6 +32,7 @@ EXPORT_RESOURCE = \
|
|||
$(srcdir)/bookmarks.html \
|
||||
$(srcdir)/mimeTypes.rdf \
|
||||
$(srcdir)/panels.rdf \
|
||||
$(srcdir)/localstore.rdf \
|
||||
$(srcdir)/search.rdf \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0"?>
|
||||
<RDF:RDF
|
||||
xmlns:NC="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#FlaggedButtonColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#UnreadColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#TotalColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#OrderReceivedColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#StatusColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#SizeColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul">
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#StatusColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#SizeColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#UnreadColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#TotalColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#OrderReceivedColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#FlaggedButtonColumn"/>
|
||||
</RDF:Description>
|
||||
</RDF:RDF>
|
|
@ -32,4 +32,5 @@ install::
|
|||
$(MAKE_INSTALL) bookmarks.html $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) mimeTypes.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) panels.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) localstore.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) search.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
|
|
|
@ -31,6 +31,7 @@ include $(THEME_ROOT_DEPTH)/theme.mk
|
|||
EXPORT_RESOURCE = \
|
||||
$(srcdir)/bookmarks.html \
|
||||
$(srcdir)/panels.rdf \
|
||||
$(srcdir)/localstore.rdf \
|
||||
$(srcdir)/search.rdf \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0"?>
|
||||
<RDF:RDF
|
||||
xmlns:NC="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#FlaggedButtonColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#UnreadColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#TotalColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#OrderReceivedColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#StatusColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#SizeColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul">
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#StatusColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#SizeColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#UnreadColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#TotalColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#OrderReceivedColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#FlaggedButtonColumn"/>
|
||||
</RDF:Description>
|
||||
</RDF:RDF>
|
|
@ -31,4 +31,5 @@ clobber::
|
|||
install::
|
||||
$(MAKE_INSTALL) bookmarks.html $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) panels.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) localstore.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
$(MAKE_INSTALL) search.rdf $(DIST)\bin\defaults\profile\$(THEME)
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
bookmarks.html
|
||||
panels.rdf
|
||||
search.rdf
|
||||
mimeTypes.rdf
|
|
@ -30,6 +30,7 @@ include $(topsrcdir)/config/rules.mk
|
|||
FILES := \
|
||||
bookmarks.html \
|
||||
panels.rdf \
|
||||
localstore.rdf \
|
||||
search.rdf \
|
||||
mimeTypes.rdf \
|
||||
$(NULL)
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0"?>
|
||||
<RDF:RDF
|
||||
xmlns:NC="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#FlaggedButtonColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#UnreadColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#TotalColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#OrderReceivedColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#StatusColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul#SizeColumn">
|
||||
<hidden>true</hidden>
|
||||
</RDF:Description>
|
||||
<RDF:Description about="chrome://messenger/content/messenger.xul">
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#StatusColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#SizeColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#UnreadColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#TotalColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#OrderReceivedColumn"/>
|
||||
<NC:persist resource="chrome://messenger/content/messenger.xul#FlaggedButtonColumn"/>
|
||||
</RDF:Description>
|
||||
</RDF:RDF>
|
|
@ -27,6 +27,7 @@ include <$(DEPTH)\config\rules.mak>
|
|||
FILES=\
|
||||
bookmarks.html \
|
||||
panels.rdf \
|
||||
localstore.rdf \
|
||||
search.rdf \
|
||||
mimeTypes.rdf \
|
||||
$(NULL)
|
||||
|
|
|
@ -84,8 +84,9 @@
|
|||
#define OLD_REGISTRY_FILE_NAME "nsreg.dat"
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
// hack for copying panels.rdf into migrated profile dir
|
||||
// hack for copying panels.rdf and localstore.rdf into migrated profile dir
|
||||
#define PANELS_RDF_FILE "panels.rdf"
|
||||
#define LOCALSTORE_RDF_FILE "localstore.rdf"
|
||||
|
||||
// A default profile name, in case automigration 4x profile fails
|
||||
#define DEFAULT_PROFILE_NAME "default"
|
||||
|
@ -1587,9 +1588,11 @@ nsProfile::MigrateProfile(const PRUnichar* profileName, PRBool showProgressAsMod
|
|||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// Copy panels.rdf file
|
||||
// Copy panels.rdf & localstore.rdf files
|
||||
// This is a hack. Once the localFileSpec implementation
|
||||
// is complete, this will be removed.
|
||||
rv = CopyDefaultFile(profDefaultsDir, newProfDir, LOCALSTORE_RDF_FILE);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
rv = CopyDefaultFile(profDefaultsDir, newProfDir, PANELS_RDF_FILE);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
// hack finish.
|
||||
|
|
|
@ -20,6 +20,7 @@ viewer:Search Plugins:*
|
|||
; default files for en-US
|
||||
viewer:defaults:profile:bookmarks.html
|
||||
viewer:defaults:profile:panels.rdf
|
||||
viewer:defaults:profile:localstore.rdf
|
||||
viewer:defaults:profile:search.rdf
|
||||
|
||||
[xpcom]
|
||||
|
|
|
@ -20,6 +20,7 @@ bin/searchplugins/*
|
|||
; default files for en-US
|
||||
bin/defaults/profile/bookmarks.html
|
||||
bin/defaults/profile/panels.rdf
|
||||
bin/defaults/profile/localstore.rdf
|
||||
bin/defaults/profile/search.rdf
|
||||
|
||||
[xpcom]
|
||||
|
|
|
@ -20,6 +20,7 @@ bin\searchplugins\*
|
|||
; default files for en-US
|
||||
bin\defaults\profile\bookmarks.html
|
||||
bin\defaults\profile\panels.rdf
|
||||
bin\defaults\profile\localstore.rdf
|
||||
bin\defaults\profile\search.rdf
|
||||
|
||||
[xpcom]
|
||||
|
|
Загрузка…
Ссылка в новой задаче