moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2025-01-09 04:28:16 -05:00
Code Issues Releases Wiki Activity

* add version check in Makefile

Browse Source 
* fix openTab() onVersionChange
* cleaning
This commit is contained in:
foudfou 2012-09-04 14:33:43 +02:00
parent de2a756fc8
commit ca39dec2de
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile
View File

@ -51,7 +51,7 @@ install_rdf := install.rdf
# Version fetched from install.rdf # Version fetched from install.rdf
VERSION := $(shell awk '/<em:version>/ { version=$$1; \ VERSION := $(shell awk '/<em:version>/ { version=$$1; \
version=gensub(/<em:version>(.+)<\/em:version>/, "\\1", "g", version); \ version=gensub(/^.*<em:version>(.+)<\/em:version>.*$$/, "\\1", "g", version); \
print version }' $(install_rdf)) print version }' $(install_rdf))
# The target XPI files. # The target XPI files.
@ -113,7 +113,7 @@ xpi_includes := $(license) \
build_includes := $(foreach f,$(xpi_includes),$(build_dir)/$(f)) build_includes := $(foreach f,$(xpi_includes),$(build_dir)/$(f))
$(xpi_built): $(build_dir) $(build_includes) $(xpi_built): check_version $(build_dir) $(build_includes)
@echo "Creating XPI file." @echo "Creating XPI file."
@cd $(build_dir); $(ZIP) $(xpi_file) $(xpi_includes) @cd $(build_dir); $(ZIP) $(xpi_file) $(xpi_includes)
@echo "Creating XPI file. Done!" @echo "Creating XPI file. Done!"
@ -176,3 +176,12 @@ $(profile_locations):
clean_build: clean_build:
@echo "Removing build dir: $(build_dir)" @echo "Removing build dir: $(build_dir)"
@rm -rf $(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))
check_version:
@echo "checking version consistency"
@[ "$(VERSION)" == "$(VERSION_HARD_CODED)" ]

4
src/install.rdf
View File

@ -19,7 +19,7 @@
<Description> <Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox --> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
<em:minVersion>13.0</em:minVersion> <em:minVersion>13.0</em:minVersion>
<em:maxVersion>15.0a1</em:maxVersion> <em:maxVersion>17.0a1</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>
@ -61,6 +61,8 @@
<em:contributor>Hicham.Haouari</em:contributor> <em:contributor>Hicham.Haouari</em:contributor>
<em:contributor>Jreybert</em:contributor> <em:contributor>Jreybert</em:contributor>
<em:contributor>aedrin</em:contributor> <em:contributor>aedrin</em:contributor>
<em:contributor>David Wille</em:contributor>
<em:contributor>Roland Tapken</em:contributor>
<em:translator>Lachezar [bg-BG]</em:translator> <em:translator>Lachezar [bg-BG]</em:translator>
<em:translator>SoftcatalàAljullu,ellibre [ca-AD]</em:translator> <em:translator>SoftcatalàAljullu,ellibre [ca-AD]</em:translator>

7
src/modules/FiretrayHandler.jsm
View File

@ -372,9 +372,11 @@ firetray.VersionChangeHandler = {
}, },
openTab: function(url) { openTab: function(url) {
if (this.appId === FIRETRAY_THUNDERBIRD_ID) log.info("appId="+firetray.Handler.appId);
if (firetray.Handler.appId === FIRETRAY_THUNDERBIRD_ID)
this.openMailTab(url); this.openMailTab(url);
else if (this.appId === FIRETRAY_FIREFOX_ID || this.appId === FIRETRAY_SEAMONKEY_ID) else if (firetray.Handler.appId === FIRETRAY_FIREFOX_ID ||
firetray.Handler.appId === FIRETRAY_SEAMONKEY_ID)
this.openBrowserTab(url); this.openBrowserTab(url);
else else
log.error("unsupported application"); log.error("unsupported application");
@ -442,6 +444,7 @@ firetray.VersionChangeHandler = {
log.warn("mail notification type set to newmail icon."); log.warn("mail notification type set to newmail icon.");
} }
}, },
correctMailServerTypes: function() { correctMailServerTypes: function() {
let mailAccounts = firetray.Utils.getObjPref('mail_accounts'); let mailAccounts = firetray.Utils.getObjPref('mail_accounts');
let serverTypes = mailAccounts["serverTypes"]; let serverTypes = mailAccounts["serverTypes"];

4
src/modules/linux/FiretrayChatStatusIcon.jsm
View File

@ -105,10 +105,6 @@ firetray.ChatStatusIcon = {
// (http://sourceforge.net/tracker/index.php?func=detail&aid=3190205&group_id=35398&atid=413960) // (http://sourceforge.net/tracker/index.php?func=detail&aid=3190205&group_id=35398&atid=413960)
onFocusIn: function(widget, event, data) { onFocusIn: function(widget, event, data) {
log.debug("onFocusIn"); log.debug("onFocusIn");
// let gdkEventFocus = ctypes.cast(event, gdk.GdkEventFocus.ptr);
// let gdkWin = gdkEventFocus.contents.window;
// let xid = firetray.Window.getXIDFromGdkWindow(gdkWin);
// log.debug("xid="+xid+" in="+gdkEventFocus.contents["in"]);
firetray.Chat.stopIconBlinkingMaybe(); firetray.Chat.stopIconBlinkingMaybe();
} }