Bug 763493 Bookmarks Manager has lost its icons r=IanN a=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Tue, 03 Jul 2012 13:50:03 +0100
changeset 11328 754df5de175bd522fec1dfdfebe00272e24ecdb4
parent 11327 360ce05a5a3f5f6387aeb03ff9c6918e124c1f3e
child 11329 76a2040df66d514455d7cfa2d5c096e9f24772b1
push id615
push userneil@parkwaycc.co.uk
push dateTue, 03 Jul 2012 12:50:11 +0000
treeherdercomm-aurora@754df5de175b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs763493
Bug 763493 Bookmarks Manager has lost its icons r=IanN a=IanN
suite/branding/nightly/Makefile.in
suite/branding/nightly/icons/gtk/bmPropsWindow.png
suite/branding/nightly/icons/gtk/bmPropsWindow16.png
suite/branding/nightly/icons/gtk/bmPropsWindow48.png
suite/branding/nightly/icons/gtk/bookmark-window.png
suite/branding/nightly/icons/gtk/bookmark-window16.png
suite/branding/nightly/icons/gtk/bookmark-window48.png
suite/branding/nightly/icons/gtk/bookmarkproperties.png
suite/branding/nightly/icons/gtk/bookmarkproperties16.png
suite/branding/nightly/icons/gtk/bookmarkproperties48.png
suite/branding/nightly/icons/gtk/places.png
suite/branding/nightly/icons/gtk/places16.png
suite/branding/nightly/icons/gtk/places48.png
suite/branding/nightly/icons/os2/bmPropsWindow.ico
suite/branding/nightly/icons/os2/bookmark-window.ico
suite/branding/nightly/icons/os2/bookmarkproperties.ico
suite/branding/nightly/icons/os2/places.ico
suite/branding/nightly/icons/svg/bmPropsWindow.svg
suite/branding/nightly/icons/svg/bookmark-window.svg
suite/branding/nightly/icons/svg/bookmarkproperties.svg
suite/branding/nightly/icons/svg/places.svg
suite/branding/nightly/icons/windows/bmPropsWindow.ico
suite/branding/nightly/icons/windows/bookmark-window.ico
suite/branding/nightly/icons/windows/bookmarkproperties.ico
suite/branding/nightly/icons/windows/places.ico
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/suite/branding/nightly/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -24,27 +24,27 @@ ICON_DIR=gtk
 else
 ICON_DIR=$(MOZ_WIDGET_TOOLKIT)
 endif
 
 DESKTOP_ICONS = \
 	abcardWindow \
 	ablistWindow \
 	addressbookWindow \
-	bmPropsWindow \
-	bookmark-window \
+	bookmarkproperties \
 	downloadManager \
 	editorWindow \
 	findBookmarkWindow \
 	findHistoryWindow \
 	history-window \
 	JSConsoleWindow \
 	main-window \
 	messengerWindow \
 	msgcomposeWindow \
+	places \
 	venkman-window \
 	$(NULL) 
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 # Windows icons
 DESKTOP_ICONS += \
 	gif-file \
 	html-file \
rename from suite/branding/nightly/icons/gtk/bmPropsWindow.png
rename to suite/branding/nightly/icons/gtk/bookmarkproperties.png
rename from suite/branding/nightly/icons/gtk/bmPropsWindow16.png
rename to suite/branding/nightly/icons/gtk/bookmarkproperties16.png
rename from suite/branding/nightly/icons/gtk/bmPropsWindow48.png
rename to suite/branding/nightly/icons/gtk/bookmarkproperties48.png
rename from suite/branding/nightly/icons/gtk/bookmark-window.png
rename to suite/branding/nightly/icons/gtk/places.png
rename from suite/branding/nightly/icons/gtk/bookmark-window16.png
rename to suite/branding/nightly/icons/gtk/places16.png
rename from suite/branding/nightly/icons/gtk/bookmark-window48.png
rename to suite/branding/nightly/icons/gtk/places48.png
rename from suite/branding/nightly/icons/os2/bmPropsWindow.ico
rename to suite/branding/nightly/icons/os2/bookmarkproperties.ico
rename from suite/branding/nightly/icons/os2/bookmark-window.ico
rename to suite/branding/nightly/icons/os2/places.ico
rename from suite/branding/nightly/icons/svg/bmPropsWindow.svg
rename to suite/branding/nightly/icons/svg/bookmarkproperties.svg
rename from suite/branding/nightly/icons/svg/bookmark-window.svg
rename to suite/branding/nightly/icons/svg/places.svg
rename from suite/branding/nightly/icons/windows/bmPropsWindow.ico
rename to suite/branding/nightly/icons/windows/bookmarkproperties.ico
rename from suite/branding/nightly/icons/windows/bookmark-window.ico
rename to suite/branding/nightly/icons/windows/places.ico
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -473,22 +473,19 @@
 @BINPATH@/extensions/modern@themes.mozilla.org/chrome.manifest
 @BINPATH@/extensions/modern@themes.mozilla.org/icon.png
 @BINPATH@/extensions/modern@themes.mozilla.org/install.rdf
 @BINPATH@/extensions/modern@themes.mozilla.org/preview.png
 #endif
 
 ; shell icons
 #ifdef MOZ_GTK2
-@BINPATH@/chrome/icons/default/bmPropsWindow.png
-@BINPATH@/chrome/icons/default/bmPropsWindow16.png
-@BINPATH@/chrome/icons/default/bmPropsWindow48.png
-@BINPATH@/chrome/icons/default/bookmark-window.png
-@BINPATH@/chrome/icons/default/bookmark-window16.png
-@BINPATH@/chrome/icons/default/bookmark-window48.png
+@BINPATH@/chrome/icons/default/bookmarkproperties.png
+@BINPATH@/chrome/icons/default/bookmarkproperties16.png
+@BINPATH@/chrome/icons/default/bookmarkproperties48.png
 @BINPATH@/chrome/icons/default/default.png
 @BINPATH@/chrome/icons/default/default16.png
 @BINPATH@/chrome/icons/default/default48.png
 @BINPATH@/chrome/icons/default/downloadManager.png
 @BINPATH@/chrome/icons/default/downloadManager16.png
 @BINPATH@/chrome/icons/default/downloadManager48.png
 @BINPATH@/chrome/icons/default/editorWindow.png
 @BINPATH@/chrome/icons/default/editorWindow16.png
@@ -503,30 +500,33 @@
 @BINPATH@/chrome/icons/default/history-window16.png
 @BINPATH@/chrome/icons/default/history-window48.png
 @BINPATH@/chrome/icons/default/JSConsoleWindow.png
 @BINPATH@/chrome/icons/default/JSConsoleWindow16.png
 @BINPATH@/chrome/icons/default/JSConsoleWindow48.png
 @BINPATH@/chrome/icons/default/main-window.png
 @BINPATH@/chrome/icons/default/main-window16.png
 @BINPATH@/chrome/icons/default/main-window48.png
+@BINPATH@/chrome/icons/default/places.png
+@BINPATH@/chrome/icons/default/places16.png
+@BINPATH@/chrome/icons/default/places48.png
 @BINPATH@/chrome/icons/default/seamonkey.png
 #ifdef MOZ_UPDATER
 @BINPATH@/icons/updater.png
 #endif
 #elifdef WIN_OR_OS2
-@BINPATH@/chrome/icons/default/bmPropsWindow.ico
-@BINPATH@/chrome/icons/default/bookmark-window.ico
+@BINPATH@/chrome/icons/default/bookmarkproperties.ico
 @BINPATH@/chrome/icons/default/downloadManager.ico
 @BINPATH@/chrome/icons/default/editorWindow.ico
 @BINPATH@/chrome/icons/default/findBookmarkWindow.ico
 @BINPATH@/chrome/icons/default/findHistoryWindow.ico
 @BINPATH@/chrome/icons/default/history-window.ico
 @BINPATH@/chrome/icons/default/JSConsoleWindow.ico
 @BINPATH@/chrome/icons/default/main-window.ico
+@BINPATH@/chrome/icons/default/places.ico
 #ifdef XP_WIN32
 @BINPATH@/chrome/icons/default/gif-file.ico
 @BINPATH@/chrome/icons/default/html-file.ico
 @BINPATH@/chrome/icons/default/misc-file.ico
 @BINPATH@/chrome/icons/default/image-file.ico
 @BINPATH@/chrome/icons/default/jpeg-file.ico
 @BINPATH@/chrome/icons/default/script-file.ico
 @BINPATH@/chrome/icons/default/xml-file.ico
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -44,18 +44,26 @@ chrome/messenger.manifest
 chrome/newsblog.manifest
 chrome/pippki.manifest
 chrome/toolkit.manifest
 chrome/icons/default/abcardWindow.xpm
 chrome/icons/default/abcardWindow16.xpm
 chrome/icons/default/ablistWindow.xpm
 chrome/icons/default/addressbookWindow.xpm
 chrome/icons/default/addressbookWindow16.xpm
+chrome/icons/default/bmPropsWindow.ico
+chrome/icons/default/bmPropsWindow.png
+chrome/icons/default/bmPropsWindow16.png
+chrome/icons/default/bmPropsWindow48.png
 chrome/icons/default/bmPropsWindow.xpm
 chrome/icons/default/bmPropsWindow16.xpm
+chrome/icons/default/bookmark-window.ico
+chrome/icons/default/bookmark-window.png
+chrome/icons/default/bookmark-window16.png
+chrome/icons/default/bookmark-window48.png
 chrome/icons/default/bookmark-window.xpm
 chrome/icons/default/bookmark-window16.xpm
 chrome/icons/default/calendar-window.xpm
 chrome/icons/default/calendar-window16.xpm
 chrome/icons/default/chatzilla-window.ico
 chrome/icons/default/chatzilla-window.xpm
 chrome/icons/default/chatzilla-window16.xpm
 chrome/icons/default/default.xpm