[Pkg-mozext-commits] [firetray] 63/84: Reshape icon directories, and fix Makefile.
David Prévot
taffit at moszumanska.debian.org
Sun Jul 20 01:42:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firetray.
commit 9afa777c656daf9f042df6977c038f4e632b3e48
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Sun May 25 21:11:07 2014 +0200
Reshape icon directories, and fix Makefile.
---
src/Makefile | 15 +++++++--------
src/chrome/content/options.xul | 8 ++++----
src/chrome/skin/{ => icons}/blank-icon.png | Bin
src/chrome/skin/{ => icons}/cbox-check.gif | Bin
src/chrome/skin/{ => icons}/cbox-disabled.gif | Bin
src/chrome/skin/{ => icons}/firetray128.svg | 0
src/chrome/skin/{ => icons}/firetray48.png | Bin
src/chrome/skin/{ => icons}/firetray64.png | Bin
src/chrome/skin/{ => icons}/img/chatzilla22.png | Bin
src/chrome/skin/{ => icons}/img/firefox22.png | Bin
.../skin/{ => icons}/img/internet-group-chat.svg | 0
src/chrome/skin/{ => icons}/img/internet-mail.svg | 0
src/chrome/skin/{ => icons}/img/mail-unread.png | Bin
.../skin/{ => icons}/img/pidgin-tray-available.png | Bin
.../skin/{ => icons}/img/pidgin-tray-away.png | Bin
.../skin/{ => icons}/img/pidgin-tray-busy.png | Bin
.../skin/{ => icons}/img/pidgin-tray-offline.png | Bin
.../{ => icons}/img/preferences-system-windows.svg | 0
.../skin/{ => icons}/img/preferences-system.svg | 0
src/chrome/skin/{ => icons}/img/seamonkey22.png | Bin
src/chrome/skin/{ => icons}/img/thunderbird22.png | Bin
src/chrome/skin/{ => icons}/img/zotero22.png | Bin
.../icons/linux/hicolor/22x22/apps/chatzilla.png | 1 +
.../icons/linux/hicolor/22x22/apps/firefox.png | 1 +
.../icons/linux/hicolor/22x22/apps/seamonkey.png | 1 +
.../icons/linux/hicolor/22x22/apps/thunderbird.png | 1 +
.../skin/icons/linux/hicolor/22x22/apps/zotero.png | 1 +
.../linux/hicolor/22x22/status/mail-unread.png | 1 +
.../linux/hicolor/22x22/status/user-available.png | 1 +
.../icons/linux/hicolor/22x22/status/user-away.png | 1 +
.../icons/linux/hicolor/22x22/status/user-busy.png | 1 +
.../linux/hicolor/22x22/status/user-offline.png | 1 +
src/chrome/skin/{ => icons}/pref-chat.svg | 0
src/chrome/skin/{ => icons}/pref-icon.svg | 0
src/chrome/skin/{ => icons}/pref-mail.svg | 0
src/chrome/skin/{ => icons}/pref-windows.svg | 0
.../skin/{ => icons}/winnt/application-exit.bmp | Bin
src/chrome/skin/{ => icons}/winnt/blank-icon.bmp | Bin
src/chrome/skin/{ => icons}/winnt/document-new.bmp | Bin
src/chrome/skin/{ => icons}/winnt/gtk-apply.bmp | Bin
src/chrome/skin/{ => icons}/winnt/gtk-edit.bmp | Bin
.../skin/{ => icons}/winnt/gtk-preferences.bmp | Bin
src/chrome/skin/{ => icons}/winnt/mail-unread.ico | Bin
.../linux/icons/hicolor/22x22/apps/chatzilla.png | 1 -
.../linux/icons/hicolor/22x22/apps/firefox.png | 1 -
.../linux/icons/hicolor/22x22/apps/seamonkey.png | 1 -
.../linux/icons/hicolor/22x22/apps/thunderbird.png | 1 -
.../skin/linux/icons/hicolor/22x22/apps/zotero.png | 1 -
.../icons/hicolor/22x22/status/mail-unread.png | 1 -
.../icons/hicolor/22x22/status/user-available.png | 1 -
.../linux/icons/hicolor/22x22/status/user-away.png | 1 -
.../linux/icons/hicolor/22x22/status/user-busy.png | 1 -
.../icons/hicolor/22x22/status/user-offline.png | 1 -
src/chrome/skin/overlay.css | 4 ++--
src/install.rdf | 4 ++--
src/modules/linux/FiretrayGtkIcons.jsm | 2 +-
src/modules/linux/FiretrayStatusIcon.jsm | 2 +-
src/modules/winnt/FiretrayStatusIcon.jsm | 21 +++++++++++----------
58 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index cd1025a..bdd7e4e 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -92,14 +92,13 @@ chrome_sources := $(chrome_sources_js) \
$(wildcard $(chrome_source_root)/content/*.xul) \
$(wildcard $(chrome_source_root)/content/*.xml) \
$(wildcard $(chrome_source_root)/content/*.css) \
- $(wildcard $(chrome_source_root)/skin/*.css) \
- $(wildcard $(chrome_source_root)/skin/*.gif) \
- $(wildcard $(chrome_source_root)/skin/*.png) \
- $(wildcard $(chrome_source_root)/skin/*.svg) \
- $(wildcard $(chrome_source_root)/skin/linux/icons/hicolor/22x22/apps/*.png) \
- $(wildcard $(chrome_source_root)/skin/linux/icons/gnome/22x22/status/*.png) \
- $(wildcard $(chrome_source_root)/skin/winnt/*.bmp) \
- $(wildcard $(chrome_source_root)/skin/winnt/*.ico) \
+ $(wildcard $(chrome_source_root)/skin/icons/*.css) \
+ $(wildcard $(chrome_source_root)/skin/icons/*.gif) \
+ $(wildcard $(chrome_source_root)/skin/icons/*.png) \
+ $(wildcard $(chrome_source_root)/skin/icons/*.svg) \
+ $(wildcard $(chrome_source_root)/skin/icons/linux/hicolor/22x22/*/*.png) \
+ $(wildcard $(chrome_source_root)/skin/icons/winnt/*.bmp) \
+ $(wildcard $(chrome_source_root)/skin/icons/winnt/*.ico) \
$(wildcard $(chrome_source_root)/locale/*/*.dtd) \
$(wildcard $(chrome_source_root)/locale/*/*.properties)
diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 9497e76..fb2c868 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -18,7 +18,7 @@
</broadcasterset>
<prefpane id="pref-pane-windows" label="&windows_options;"
- image="chrome://firetray/skin/pref-windows.svg">
+ image="chrome://firetray/skin/icons/pref-windows.svg">
<preferences>
<preference id="pref_hides_on_close" name="extensions.firetray.hides_on_close" type="bool"/>
@@ -63,7 +63,7 @@
</prefpane>
<prefpane id="pref-pane-icon" label="&icon_options;"
- image="chrome://firetray/skin/pref-icon.svg">
+ image="chrome://firetray/skin/icons/pref-icon.svg">
<preferences>
<preference id="pref_app_icon_type" name="extensions.firetray.app_icon_type" type="int"/>
@@ -125,7 +125,7 @@
</prefpane>
<prefpane id="pref-pane-mail" label="&mail_options;"
- image="chrome://firetray/skin/pref-mail.svg">
+ image="chrome://firetray/skin/icons/pref-mail.svg">
<preferences>
<preference id="pref_mail_notification_enabled" name="extensions.firetray.mail_notification_enabled" type="bool" />
@@ -315,7 +315,7 @@
</prefpane>
<prefpane id="pref-pane-chat" label="&chat_options;"
- image="chrome://firetray/skin/pref-chat.svg">
+ image="chrome://firetray/skin/icons/pref-chat.svg">
<preferences>
<preference id="pref_chat_icon_enable" name="extensions.firetray.chat_icon_enable" type="bool" />
diff --git a/src/chrome/skin/blank-icon.png b/src/chrome/skin/icons/blank-icon.png
similarity index 100%
rename from src/chrome/skin/blank-icon.png
rename to src/chrome/skin/icons/blank-icon.png
diff --git a/src/chrome/skin/cbox-check.gif b/src/chrome/skin/icons/cbox-check.gif
similarity index 100%
rename from src/chrome/skin/cbox-check.gif
rename to src/chrome/skin/icons/cbox-check.gif
diff --git a/src/chrome/skin/cbox-disabled.gif b/src/chrome/skin/icons/cbox-disabled.gif
similarity index 100%
rename from src/chrome/skin/cbox-disabled.gif
rename to src/chrome/skin/icons/cbox-disabled.gif
diff --git a/src/chrome/skin/firetray128.svg b/src/chrome/skin/icons/firetray128.svg
similarity index 100%
rename from src/chrome/skin/firetray128.svg
rename to src/chrome/skin/icons/firetray128.svg
diff --git a/src/chrome/skin/firetray48.png b/src/chrome/skin/icons/firetray48.png
similarity index 100%
rename from src/chrome/skin/firetray48.png
rename to src/chrome/skin/icons/firetray48.png
diff --git a/src/chrome/skin/firetray64.png b/src/chrome/skin/icons/firetray64.png
similarity index 100%
rename from src/chrome/skin/firetray64.png
rename to src/chrome/skin/icons/firetray64.png
diff --git a/src/chrome/skin/img/chatzilla22.png b/src/chrome/skin/icons/img/chatzilla22.png
similarity index 100%
rename from src/chrome/skin/img/chatzilla22.png
rename to src/chrome/skin/icons/img/chatzilla22.png
diff --git a/src/chrome/skin/img/firefox22.png b/src/chrome/skin/icons/img/firefox22.png
similarity index 100%
rename from src/chrome/skin/img/firefox22.png
rename to src/chrome/skin/icons/img/firefox22.png
diff --git a/src/chrome/skin/img/internet-group-chat.svg b/src/chrome/skin/icons/img/internet-group-chat.svg
similarity index 100%
rename from src/chrome/skin/img/internet-group-chat.svg
rename to src/chrome/skin/icons/img/internet-group-chat.svg
diff --git a/src/chrome/skin/img/internet-mail.svg b/src/chrome/skin/icons/img/internet-mail.svg
similarity index 100%
rename from src/chrome/skin/img/internet-mail.svg
rename to src/chrome/skin/icons/img/internet-mail.svg
diff --git a/src/chrome/skin/img/mail-unread.png b/src/chrome/skin/icons/img/mail-unread.png
similarity index 100%
rename from src/chrome/skin/img/mail-unread.png
rename to src/chrome/skin/icons/img/mail-unread.png
diff --git a/src/chrome/skin/img/pidgin-tray-available.png b/src/chrome/skin/icons/img/pidgin-tray-available.png
similarity index 100%
rename from src/chrome/skin/img/pidgin-tray-available.png
rename to src/chrome/skin/icons/img/pidgin-tray-available.png
diff --git a/src/chrome/skin/img/pidgin-tray-away.png b/src/chrome/skin/icons/img/pidgin-tray-away.png
similarity index 100%
rename from src/chrome/skin/img/pidgin-tray-away.png
rename to src/chrome/skin/icons/img/pidgin-tray-away.png
diff --git a/src/chrome/skin/img/pidgin-tray-busy.png b/src/chrome/skin/icons/img/pidgin-tray-busy.png
similarity index 100%
rename from src/chrome/skin/img/pidgin-tray-busy.png
rename to src/chrome/skin/icons/img/pidgin-tray-busy.png
diff --git a/src/chrome/skin/img/pidgin-tray-offline.png b/src/chrome/skin/icons/img/pidgin-tray-offline.png
similarity index 100%
rename from src/chrome/skin/img/pidgin-tray-offline.png
rename to src/chrome/skin/icons/img/pidgin-tray-offline.png
diff --git a/src/chrome/skin/img/preferences-system-windows.svg b/src/chrome/skin/icons/img/preferences-system-windows.svg
similarity index 100%
rename from src/chrome/skin/img/preferences-system-windows.svg
rename to src/chrome/skin/icons/img/preferences-system-windows.svg
diff --git a/src/chrome/skin/img/preferences-system.svg b/src/chrome/skin/icons/img/preferences-system.svg
similarity index 100%
rename from src/chrome/skin/img/preferences-system.svg
rename to src/chrome/skin/icons/img/preferences-system.svg
diff --git a/src/chrome/skin/img/seamonkey22.png b/src/chrome/skin/icons/img/seamonkey22.png
similarity index 100%
rename from src/chrome/skin/img/seamonkey22.png
rename to src/chrome/skin/icons/img/seamonkey22.png
diff --git a/src/chrome/skin/img/thunderbird22.png b/src/chrome/skin/icons/img/thunderbird22.png
similarity index 100%
rename from src/chrome/skin/img/thunderbird22.png
rename to src/chrome/skin/icons/img/thunderbird22.png
diff --git a/src/chrome/skin/img/zotero22.png b/src/chrome/skin/icons/img/zotero22.png
similarity index 100%
rename from src/chrome/skin/img/zotero22.png
rename to src/chrome/skin/icons/img/zotero22.png
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/apps/chatzilla.png b/src/chrome/skin/icons/linux/hicolor/22x22/apps/chatzilla.png
new file mode 120000
index 0000000..0bf53df
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/apps/chatzilla.png
@@ -0,0 +1 @@
+../../../../img/chatzilla22.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/apps/firefox.png b/src/chrome/skin/icons/linux/hicolor/22x22/apps/firefox.png
new file mode 120000
index 0000000..be7eea5
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/apps/firefox.png
@@ -0,0 +1 @@
+../../../../img/firefox22.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/apps/seamonkey.png b/src/chrome/skin/icons/linux/hicolor/22x22/apps/seamonkey.png
new file mode 120000
index 0000000..25c1150
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/apps/seamonkey.png
@@ -0,0 +1 @@
+../../../../img/seamonkey22.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/apps/thunderbird.png b/src/chrome/skin/icons/linux/hicolor/22x22/apps/thunderbird.png
new file mode 120000
index 0000000..c7733f5
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/apps/thunderbird.png
@@ -0,0 +1 @@
+../../../../img/thunderbird22.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/apps/zotero.png b/src/chrome/skin/icons/linux/hicolor/22x22/apps/zotero.png
new file mode 120000
index 0000000..ed6861f
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/apps/zotero.png
@@ -0,0 +1 @@
+../../../../img/zotero22.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/status/mail-unread.png b/src/chrome/skin/icons/linux/hicolor/22x22/status/mail-unread.png
new file mode 120000
index 0000000..50c5ecb
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/status/mail-unread.png
@@ -0,0 +1 @@
+../../../../img/mail-unread.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/status/user-available.png b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-available.png
new file mode 120000
index 0000000..4a9d15a
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-available.png
@@ -0,0 +1 @@
+../../../../img/pidgin-tray-available.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/status/user-away.png b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-away.png
new file mode 120000
index 0000000..00139c3
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-away.png
@@ -0,0 +1 @@
+../../../../img/pidgin-tray-away.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/status/user-busy.png b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-busy.png
new file mode 120000
index 0000000..2fa96b0
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-busy.png
@@ -0,0 +1 @@
+../../../../img/pidgin-tray-busy.png
\ No newline at end of file
diff --git a/src/chrome/skin/icons/linux/hicolor/22x22/status/user-offline.png b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-offline.png
new file mode 120000
index 0000000..55463da
--- /dev/null
+++ b/src/chrome/skin/icons/linux/hicolor/22x22/status/user-offline.png
@@ -0,0 +1 @@
+../../../../img/pidgin-tray-offline.png
\ No newline at end of file
diff --git a/src/chrome/skin/pref-chat.svg b/src/chrome/skin/icons/pref-chat.svg
similarity index 100%
rename from src/chrome/skin/pref-chat.svg
rename to src/chrome/skin/icons/pref-chat.svg
diff --git a/src/chrome/skin/pref-icon.svg b/src/chrome/skin/icons/pref-icon.svg
similarity index 100%
rename from src/chrome/skin/pref-icon.svg
rename to src/chrome/skin/icons/pref-icon.svg
diff --git a/src/chrome/skin/pref-mail.svg b/src/chrome/skin/icons/pref-mail.svg
similarity index 100%
rename from src/chrome/skin/pref-mail.svg
rename to src/chrome/skin/icons/pref-mail.svg
diff --git a/src/chrome/skin/pref-windows.svg b/src/chrome/skin/icons/pref-windows.svg
similarity index 100%
rename from src/chrome/skin/pref-windows.svg
rename to src/chrome/skin/icons/pref-windows.svg
diff --git a/src/chrome/skin/winnt/application-exit.bmp b/src/chrome/skin/icons/winnt/application-exit.bmp
similarity index 100%
rename from src/chrome/skin/winnt/application-exit.bmp
rename to src/chrome/skin/icons/winnt/application-exit.bmp
diff --git a/src/chrome/skin/winnt/blank-icon.bmp b/src/chrome/skin/icons/winnt/blank-icon.bmp
similarity index 100%
rename from src/chrome/skin/winnt/blank-icon.bmp
rename to src/chrome/skin/icons/winnt/blank-icon.bmp
diff --git a/src/chrome/skin/winnt/document-new.bmp b/src/chrome/skin/icons/winnt/document-new.bmp
similarity index 100%
rename from src/chrome/skin/winnt/document-new.bmp
rename to src/chrome/skin/icons/winnt/document-new.bmp
diff --git a/src/chrome/skin/winnt/gtk-apply.bmp b/src/chrome/skin/icons/winnt/gtk-apply.bmp
similarity index 100%
rename from src/chrome/skin/winnt/gtk-apply.bmp
rename to src/chrome/skin/icons/winnt/gtk-apply.bmp
diff --git a/src/chrome/skin/winnt/gtk-edit.bmp b/src/chrome/skin/icons/winnt/gtk-edit.bmp
similarity index 100%
rename from src/chrome/skin/winnt/gtk-edit.bmp
rename to src/chrome/skin/icons/winnt/gtk-edit.bmp
diff --git a/src/chrome/skin/winnt/gtk-preferences.bmp b/src/chrome/skin/icons/winnt/gtk-preferences.bmp
similarity index 100%
rename from src/chrome/skin/winnt/gtk-preferences.bmp
rename to src/chrome/skin/icons/winnt/gtk-preferences.bmp
diff --git a/src/chrome/skin/winnt/mail-unread.ico b/src/chrome/skin/icons/winnt/mail-unread.ico
similarity index 100%
rename from src/chrome/skin/winnt/mail-unread.ico
rename to src/chrome/skin/icons/winnt/mail-unread.ico
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
deleted file mode 120000
index bee9769..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/chatzilla22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png
deleted file mode 120000
index 7f5ec80..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/firefox22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
deleted file mode 120000
index 833918b..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/seamonkey22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png
deleted file mode 120000
index 616e001..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/thunderbird22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png
deleted file mode 120000
index 1212859..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/zotero22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/status/mail-unread.png b/src/chrome/skin/linux/icons/hicolor/22x22/status/mail-unread.png
deleted file mode 120000
index 0396d4a..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/status/mail-unread.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/mail-unread.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-available.png b/src/chrome/skin/linux/icons/hicolor/22x22/status/user-available.png
deleted file mode 120000
index ff25ef1..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-available.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-available.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-away.png b/src/chrome/skin/linux/icons/hicolor/22x22/status/user-away.png
deleted file mode 120000
index 72e9539..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-away.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-away.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-busy.png b/src/chrome/skin/linux/icons/hicolor/22x22/status/user-busy.png
deleted file mode 120000
index a930256..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-busy.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-busy.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-offline.png b/src/chrome/skin/linux/icons/hicolor/22x22/status/user-offline.png
deleted file mode 120000
index 9d92822..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/status/user-offline.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-offline.png
\ No newline at end of file
diff --git a/src/chrome/skin/overlay.css b/src/chrome/skin/overlay.css
index 14affee..7e5e64d 100644
--- a/src/chrome/skin/overlay.css
+++ b/src/chrome/skin/overlay.css
@@ -5,12 +5,12 @@ treechildren::-moz-tree-checkbox {
treechildren::-moz-tree-checkbox(checked) {
/* css for checked cells */
- list-style-image: url("chrome://firetray/skin/cbox-check.gif");
+ list-style-image: url("chrome://firetray/skin/icons/cbox-check.gif");
}
treechildren::-moz-tree-checkbox(checked, disabled) {
/* css for disabled checkboxes */
- list-style-image: url("chrome://firetray/skin/cbox-disabled.gif");
+ list-style-image: url("chrome://firetray/skin/icons/cbox-disabled.gif");
}
/* properties="disabled" */
diff --git a/src/install.rdf b/src/install.rdf
index 6430747..4a34638 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -12,8 +12,8 @@
<em:homepageURL>https://github.com/foudfou/firetray</em:homepageURL>
<em:description>A system tray extension for linux.</em:description>
<em:optionsURL>chrome://firetray/content/options.xul</em:optionsURL>
- <em:iconURL>chrome://firetray/skin/firetray48.png</em:iconURL>
- <em:icon64URL>chrome://firetray/skin/firetray64.png</em:icon64URL>
+ <em:iconURL>chrome://firetray/skin/icons/firetray48.png</em:iconURL>
+ <em:icon64URL>chrome://firetray/skin/icons/firetray64.png</em:icon64URL>
<em:targetPlatform>Linux</em:targetPlatform>
<em:targetPlatform>WINNT</em:targetPlatform>
diff --git a/src/modules/linux/FiretrayGtkIcons.jsm b/src/modules/linux/FiretrayGtkIcons.jsm
index 3a70da5..6b9af1c 100644
--- a/src/modules/linux/FiretrayGtkIcons.jsm
+++ b/src/modules/linux/FiretrayGtkIcons.jsm
@@ -39,7 +39,7 @@ firetray.GtkIcons = {
},
loadDefaultTheme: function() {
- this.GTK_THEME_ICON_PATH = firetray.Utils.chromeToPath("chrome://firetray/skin/linux/icons");
+ this.GTK_THEME_ICON_PATH = firetray.Utils.chromeToPath("chrome://firetray/skin/icons/linux");
log.debug(this.GTK_THEME_ICON_PATH);
let gtkIconTheme = gtk.gtk_icon_theme_get_default();
log.debug("gtkIconTheme="+gtkIconTheme);
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index cb4f22c..1b1b54f 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -41,7 +41,7 @@ firetray.StatusIcon = {
init: function() {
this.FILENAME_BLANK = firetray.Utils.chromeToPath(
- "chrome://firetray/skin/blank-icon.png");
+ "chrome://firetray/skin/icons/blank-icon.png");
Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm");
firetray.GtkIcons.init();
diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index c901243..b7681c2 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -27,15 +27,16 @@ let log = firetray.Logging.getLogger("firetray.StatusIcon");
if ("undefined" == typeof(firetray.Handler))
log.error("This module MUST be imported from/after FiretrayHandler !");
-const ICON_CHROME_PATHS = {
- 'blank-icon': "chrome://firetray/skin/winnt/blank-icon.bmp",
- 'mail-unread': "chrome://firetray/skin/winnt/mail-unread.ico",
+const ICON_CHROME_PATH = "chrome://firetray/skin/icons/winnt";
+const ICON_CHROME_FILES = {
+ 'blank-icon': ICON_CHROME_PATH+"/blank-icon.bmp",
+ 'mail-unread': ICON_CHROME_PATH+"/mail-unread.ico",
// these are for the popup menu:
- 'prefs': "chrome://firetray/skin/winnt/gtk-preferences.bmp",
- 'quit': "chrome://firetray/skin/winnt/application-exit.bmp",
- 'new-wnd': "chrome://firetray/skin/winnt/document-new.bmp",
- 'new-msg': "chrome://firetray/skin/winnt/gtk-edit.bmp",
- 'reset': "chrome://firetray/skin/winnt/gtk-apply.bmp"
+ 'prefs': ICON_CHROME_PATH+"/gtk-preferences.bmp",
+ 'quit': ICON_CHROME_PATH+"/application-exit.bmp",
+ 'new-wnd': ICON_CHROME_PATH+"/document-new.bmp",
+ 'new-msg': ICON_CHROME_PATH+"/gtk-edit.bmp",
+ 'reset': ICON_CHROME_PATH+"/gtk-apply.bmp"
};
@@ -94,8 +95,8 @@ firetray.StatusIcon = {
/* we'll take the first icon in the .ico file. To get the icon count in the
file, pass ctypes.cast(ctypes.int(-1), win32.UINT); */
- for (let imgName in ICON_CHROME_PATHS) {
- let path = firetray.Utils.chromeToPath(ICON_CHROME_PATHS[imgName]);
+ for (let imgName in ICON_CHROME_FILES) {
+ let path = firetray.Utils.chromeToPath(ICON_CHROME_FILES[imgName]);
let img = this.loadImageFromFile(path);
if (img)
this[this.IMG_TYPES[img['type']]['map']].insert(imgName, img['himg']);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git
More information about the Pkg-mozext-commits
mailing list