diff --git a/src/Makefile b/src/Makefile index d14cda9..968aa76 100755 --- a/src/Makefile +++ b/src/Makefile @@ -133,7 +133,7 @@ xpi_includes := $(license) \ build_includes := $(foreach f,$(xpi_includes),$(build_dir)/$(f)) -$(xpi_built): check_version $(build_dir) $(build_includes) +$(xpi_built): check_version check_loglevel $(build_dir) $(build_includes) @echo "Creating XPI file." @cd $(build_dir); $(ZIP) $(xpi_file) $(xpi_includes) @echo "Creating XPI file. Done!" @@ -189,11 +189,14 @@ clean_build: @echo "Removing build dirs: $(build_dir)*" @rm -rf $(build_dir)* -# Version fetched from install.rdf -const_file := modules/commons.js - VERSION_HARD_CODED := $(shell awk -F\" '/const\W+FIRETRAY_VERSION/ \ - { print $$2}' $(const_file)) + {print $$2}' modules/commons.js) check_version: @echo "checking version consistency" @[ "$(VERSION)" = "$(VERSION_HARD_CODED)" ] + +FIRETRAY_LOG_LEVEL := $(shell awk -F\" '/const\W+FIRETRAY_LOG_LEVEL/ \ + {print $$2}' modules/logging.jsm) +check_loglevel: + @echo "checking loglevel" + @[ "Warn" = "$(FIRETRAY_LOG_LEVEL)" ] diff --git a/src/chrome/skin/preferences-system.svg b/src/chrome/skin/preferences-system.svg index a6183e8..d41028f 100644 --- a/src/chrome/skin/preferences-system.svg +++ b/src/chrome/skin/preferences-system.svg @@ -2,12 +2,12 @@ + sodipodi:docname="preferences-system.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + @@ -251,9 +259,9 @@ inkscape:document-units="px" inkscape:showpageshadow="false" inkscape:window-width="1034" - inkscape:window-height="1010" - inkscape:window-x="296" - inkscape:window-y="83" /> + inkscape:window-height="818" + inkscape:window-x="400" + inkscape:window-y="30" /> @@ -269,7 +277,7 @@ http://jimmac.musichall.cz + rdf:resource="http://creativecommons.org/licenses/publicdomain/" /> Preferences System @@ -282,19 +290,13 @@ + rdf:about="http://creativecommons.org/licenses/publicdomain/"> + rdf:resource="http://creativecommons.org/ns#Reproduction" /> - - + rdf:resource="http://creativecommons.org/ns#Distribution" /> - + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />