Bug 431013: FTP view is not using new folder icons on XP and Vista (also changes default ftp:/file: listing favicon), icons by Alex Faaborg and the Iconfactory, r=dao, sr=jst, a=damon

netwerk/streamconv/converters/nsIndexedToHTML.cpp

@@ -474,37 +474,45 @@ nsIndexedToHTML::OnStartRequest(nsIRequest* request, nsISupports *aContext) {
     if (fileURL) {
         //buffer.AppendLiteral("chrome://global/skin/dirListing/local.png");
         buffer.AppendLiteral("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB"
-                             "AAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZS"
-                             "BJbWFnZVJlYWR5ccllPAAAAWhJREFUeNrEk71KA0EQx/97uR"
-                             "A4CCIkNmIEO2NnYaOInc/gC1hHfAhLU0ewEi1S2YiFnRZWNh"
-                             "JTaFLEkySHgbtLvFzua929j1wC5hRSODDMMLPz29lhllBKMY"
-                             "8ImFPEl6vCKbOlGfly8aB1lEioXa7QWRLmkKQih1Cv8iM8t7"
-                             "EL1iFN6swHwPWYugDhU0kFR5ifL+746gsNYtypV0/4kycAmg"
-                             "YqEKjtNzhW/9fB5da3Id/vU12uVwKAKMIaqOgrClb3zmZXkv"
-                             "zYVZtV6PLxYQDwPAw1BVI2C9o7ny6KJkCmw3rzhpt3cRzotr"
-                             "CQKwC2Ex+O3j05xjBnah1ubgOAYcAxDaTTmWCYfDujQkJCG9"
-                             "KYcR0Trj3ilXc+YPDZZgEbmcUtICXF1/uQ8EoOCDsxlGcQIQ"
-                             "3qjh59wEfjCctrmxh2HuKCBIDarbHdsS+Y+8UB5V7jtcT0z/"
-                             "ufXZLYugjXgkgs8u+/8VuAAQBqe8GpcIXMpgAAAABJRU5Erk"
-                             "Jggg==");
+                             "AAAAAQCAYAAAAf8%2F9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i"
+                             "ZSBJbWFnZVJlYWR5ccllPAAAAjFJREFUeNqsU8uOElEQPffR"
+                             "3XQ3ONASdBJCSBxHos5%2B3Bg3rvkCv8PElS78gPkO%2FATj"
+                             "QoUdO2ftrJiRh6aneTb9sOpC4weMN6lcuFV16pxDIfI8x12O"
+                             "YIDhcPiu2Wx%2B%2FHF5CW1Z6Jyegt%2FTNEWSJIjjGFEUIQ"
+                             "xDrFYrWFSzXC4%2FdLvd95pRKpXKy%2BpRFZ7nwaWo1%2BsG"
+                             "nQG2260BKJfLKJVKGI1GEEJw7ateryd0v993W63WEwjgxfn5"
+                             "obGYzgCbzcaEbdsIggDj8Riu6z6iUk9SYZMSx8W0LMsM%2FS"
+                             "KK75xnJlIq80anQXdbEp0OhcPJ0eiaJnGRMEyyPDsAKKUM9c"
+                             "lkYoDo3SZJzzSdp0VSKYmfV1co%2Bz580kw5KDIM8RbRfEnU"
+                             "f1HzxtQyMAGcaGruTKczMzEIaqhKifV6jd%2BzGQQB5llunF"
+                             "%2FM52BizC2K5sYPYvZcu653tjOM9O93wnYc08gmkgg4VAxi"
+                             "xfqFUJT36AYBZGd6PJkFCZnnlBxMp38gqIgLpZB0y4Nph18l"
+                             "yWh5FFbrOSxbl3V4G%2BVB7T4ajYYxTyuLtO%2BCvWGgJE1M"
+                             "c7JNsJEhvgw%2FQV4fo%2F24nbEsX2u1d5sVyn8sJO0ZAQiI"
+                             "YnFh%2BxrfLz%2Fj29cBS%2FO14zg3i8XigW3ZkErDtmKoeM"
+                             "%2BAJGRMnXeEPGKf0nCD1ydvkDzU9Jbc6OpR7WIw6L8lQ%2B"
+                             "4pQ1%2FlPF0RGM9Ns91Wmptk0GfB4EJkt77vXYj%2F8m%2B8"
+                             "y%2FkrwABHbz2H9V68DQAAAABJRU5ErkJggg%3D%3D");
     } else {
         //buffer.AppendLiteral("chrome://global/skin/dirListing/remote.png");
         buffer.AppendLiteral("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB"
-                             "AAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZS"
-                             "BJbWFnZVJlYWR5ccllPAAAAdBJREFUeNqcUz1LA0EQfXsXDz"
-                             "8jKAERsQiYQuwEsbfwq7AWe/0FamVl6S84W7GxESvTi/4EGz"
-                             "VW2ojxI8ll9y6368yuCSYRURdmd9/uzJs3e3PCGIP9/TODf4"
-                             "y9vTWRaYL19dlvnYxxEycyENB8oIGjk5K9twT1dNiC09PLX2"
-                             "VeXJxr7VsK0lTjxctCrCwj1w+MsPUB2QAYIIsS4E0BV+E5Yp"
-                             "V2E8SJtqsmhSmr1EwK8HGNghPaUw6UKYmMG90ESazt5QA5Kr"
-                             "qvkwUUyE+Q8YGGdipsMpkiqnQQKGK9zUygQE41CujxPp2J0P"
-                             "dcdiZlH6ne2hUwm5KurmpMh5/BLD8iMs9zpTVLl7JBKjoUSO"
-                             "XqqiiHWTJzBkwgHEH8haBdQdUdrs4MkWeZtMLZN2OCfOT9A3"
-                             "2JTgVEMBbdwVAqbbStmfcOwzZQEyvCnv+FIFYCxfPoj40s3G"
-                             "yM+w3C8MJmqrwHmwyvr2Wb+/R0Ly9bQlQPSSB2dhc6GomeuC"
-                             "77bHA+H8D3a04+dYKhx8vnsyiV4tCYQSTJ62FXI0n3xOHS0r"
-                             "jF8/OTGB3tt/vn5wjlcoRCASgWH8OkYVoErRJ4bG8fm6enmx"
-                             "8rz+WmcHCwIZr4Q4ABAI8O/FsARX5sAAAAAElFTkSuQmCC");
+                             "AAAAAQCAYAAAAf8%2F9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i"
+                             "ZSBJbWFnZVJlYWR5ccllPAAAAeBJREFUeNqcU81O20AQ%2Ft"
+                             "Z2AgQSYQRqL1UPVG2hAUQkxLEStz4DrXpLpD5Drz31Cajax%"
+                             "2Bghhx6qHIJURBTxIwQRwopCBbZjHMcOTrzermPipsSt1Iw0"
+                             "3p3ZmW%2B%2B2R0TxhgOD34wjCHZlQ0iDYz9yvEfhxMTCYhE"
+                             "QDIZhkxKd2sqzX2TOD2vBQCQhpPefng1ZP2dVPlLLdpL8SEM"
+                             "cxng%2Fbs0RIHhtgs4twxOh%2BHjZxvzDx%2F3GQQiDFISiR"
+                             "BLFMPKTRMollzcWECrDVhtxtdRVsL9youPxGj%2FbdfFlUZh"
+                             "tDyYbYqWRUdai1oQRZ5oHeHl2gNM%2B01Uqio8RlH%2Bnsaz"
+                             "JzNwXcq1B%2BiXPHprlEEymeBfXs1w8XxxihfyuXqoHqpoGj"
+                             "ZM04bddgG%2F9%2B8WGj87qDdsrK9m%2BoA%2BpbhQTDh2l1"
+                             "%2Bi2weNbSHMZyjvNXmVbqh9Fj5Oz27uEoP%2BSTxANruJs9"
+                             "L%2FT6P0ewqPx5nmiAG5f6AoCtN1PbJzuRyJAyDBzzSQYvEr"
+                             "f06yYxhGXlEa8H2KVGoasjwLx3Ewk858opQWXm%2B%2Fib9E"
+                             "QrBzclLLLy89xYvlpchvtixcX6uo1y%2FzsiwHrkIsgKbp%2"
+                             "BYWFOWicuqppoNTnStHzPFCPQhBEBOyGAX4JMADFetubi4BS"
+                             "YAAAAABJRU5ErkJggg%3D%3D");
     }
     buffer.AppendLiteral("\">\n<title>");
 

toolkit/themes/winstripe/global/dirListing/dirListing.css

@@ -122,11 +122,16 @@ td:not(:first-child) {
   vertical-align: middle;
 %ifdef MOZ_WIDGET_GTK2
   content: url(moz-icon://stock/gtk-go-up?size=menu);
-}
-.dir::before {
-  content: url(moz-icon://stock/gtk-directory?size=menu);
 %else
   content: url(chrome://global/skin/dirListing/up.png);
 %endif
 }
 
+.dir::before {
+%ifdef MOZ_WIDGET_GTK2
+  content: url(moz-icon://stock/gtk-directory?size=menu);
+%else
+  content: url(chrome://global/skin/dirListing/folder.png);
+%endif
+}
+

toolkit/themes/winstripe/global/jar.mn

@@ -78,6 +78,7 @@ classic.jar:
         skin/classic/global/console/console-error-caret.gif      (console/console-error-caret.gif)
         skin/classic/global/console/console-error-dash.gif       (console/console-error-dash.gif)
 *       skin/classic/global/dirListing/dirListing.css            (dirListing/dirListing.css)
+        skin/classic/global/dirListing/folder.png                (dirListing/folder.png)
         skin/classic/global/dirListing/local.png                 (dirListing/local.png)
         skin/classic/global/dirListing/remote.png                (dirListing/remote.png)
         skin/classic/global/dirListing/up.png                    (dirListing/up.png)
@@ -236,7 +237,8 @@ classic.jar:
         skin/classic/aero/global/console/console-error-caret.gif         (console/console-error-caret.gif)
         skin/classic/aero/global/console/console-error-dash.gif          (console/console-error-dash.gif)
 *       skin/classic/aero/global/dirListing/dirListing.css               (dirListing/dirListing.css)
-        skin/classic/aero/global/dirListing/local.png                    (dirListing/local-aero.png)
+        skin/classic/aero/global/dirListing/folder.png                   (dirListing/folder-aero.png)
+        skin/classic/aero/global/dirListing/local.png                    (dirListing/local.png)
         skin/classic/aero/global/dirListing/remote.png                   (dirListing/remote-aero.png)
         skin/classic/aero/global/dirListing/up.png                       (dirListing/up-aero.png)
         skin/classic/aero/global/Filepicker.png                          (filepicker/Filepicker.png)