Bug 363043: Unfork Sb's customizeToolbar, r=jminta

This commit is contained in:
philringnalda%gmail.com 2006-12-20 06:45:09 +00:00
parent 96fe665a0f
commit 19db5c8e74
3 changed files with 11 additions and 2 deletions

View File

@ -471,9 +471,14 @@ function CalendarCustomizeToolbar()
var cmd = document.getElementById("cmd_CustomizeToolbars");
cmd.setAttribute("disabled", "true");
#ifdef MOZILLA_1_8_BRANCH
window.openDialog("chrome://calendar/content/customizeToolbar.xul", "CustomizeToolbar",
"chrome,all,dependent", document.getElementById("calendar-toolbox"));
#else
window.openDialog("chrome://global/content/customizeToolbar.xul", "CustomizeToolbar",
"chrome,all,dependent", document.getElementById("calendar-toolbox"));
#endif
}
function CalendarToolboxCustomizeDone(aToolboxChanged)

View File

@ -4,7 +4,7 @@ calendar.jar:
% content calendar %content/calendar/
* content/calendar/applicationUtil.js (content/applicationUtil.js)
content/calendar/attachFile.js (content/attachFile.js)
content/calendar/calendar.js (content/calendar.js)
* content/calendar/calendar.js (content/calendar.js)
content/calendar/calendarUtils.js (content/calendarUtils.js)
content/calendar/calendarMail.js (content/calendarMail.js)
content/calendar/calendarManagement.js (content/calendarManagement.js)

View File

@ -5,7 +5,11 @@ calendar.jar:
* content/calendar/aboutDialog.xul (content/aboutDialog.xul)
* content/calendar/calendar.xul (content/calendar.xul)
* content/calendar/credits.xhtml (content/credits.xhtml)
#ifdef MOZILLA_1_8_BRANCH
* content/calendar/customizeToolbar.xul (content/customizeToolbar.xul)
#else
% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar.css
#endif
* content/calendar/hiddenWindow.xul (content/hiddenWindow.xul)
* content/calendar/hiddenWindow.js (content/hiddenWindow.js)
#ifdef MOZ_USE_GENERIC_BRANDING