Update files/MozillaFirebird to handle the case when Thunderbird is running. Thanks to Denys Dmytriyenko in bug 38102

3 files changed, 24 insertions, 16 deletions

diff --git a/net-www/mozilla-firebird/ChangeLog b/net-www/mozilla-firebird/ChangeLog
index 10e10e370f2f..c544062fb91d 100644
--- a/net-www/mozilla-firebird/ChangeLog
+++ b/net-www/mozilla-firebird/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for net-www/mozilla-firebird
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/ChangeLog,v 1.33 2004/01/27 19:42:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/ChangeLog,v 1.34 2004/01/28 04:18:50 agriffis Exp $
+
+  27 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird:
+  Update files/MozillaFirebird to handle the case when Thunderbird is running.
+  Thanks to Denys Dmytriyenko in bug 38102
 
   27 Jan 2004; Aron Griffis <agriffis@gentoo.org>
   mozilla-firebird-0.7-r1.ebuild:
   stable on alpha and ia64
 
+  21 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird:
+  Use full path to xdpyinfo which can help when executing MozillaFirebird via ssh
+
   14 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/MozillaFirebird:
   Use more powerful MozillaFirebird startup script from bug 38102. Not doing a
   rev-bump since it's not really necessary to make everybody rebuild for this
diff --git a/net-www/mozilla-firebird/Manifest b/net-www/mozilla-firebird/Manifest
index c71f7a20d97f..87f0128517ee 100644
--- a/net-www/mozilla-firebird/Manifest
+++ b/net-www/mozilla-firebird/Manifest
@@ -1,14 +1,14 @@
-MD5 46d28ed5287285bcab11c88abf6587df ChangeLog 5678
+MD5 087fd6c01c43129eb80bf7f0ebe399fa mozilla-firebird-0.7-r1.ebuild 7741
 MD5 640e135f0a6f9fe2207fe8adbb951464 mozilla-firebird-0.7.ebuild 7596
+MD5 0f894b8cae6442e50840c8c996a0909a mozilla-firebird-0.6.1.ebuild 6878
+MD5 28f15c3d0c3d6f9d817ab927d96840c5 ChangeLog 6030
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 4c27694d99a8b1e6cf6bead88c3ad87d mozilla-firebird-0.6-r7.ebuild 6755
-MD5 087fd6c01c43129eb80bf7f0ebe399fa mozilla-firebird-0.7-r1.ebuild 7741
-MD5 0f894b8cae6442e50840c8c996a0909a mozilla-firebird-0.6.1.ebuild 6878
-MD5 5fbfdfeb03572d0541899b38a05c426a files/MozillaFirebird 1957
-MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r7 81
-MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7 80
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
 MD5 49802181a2284102bb2ed6daab129bb5 files/digest-mozilla-firebird-0.6.1 83
-MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7-r1 80
+MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7 80
+MD5 7d4eb6e7cd080e345548272147cdb2c8 files/MozillaFirebird 2082
 MD5 091c7da0a8cd5585af96a36d65d6c2c7 files/xremote-client-cvs.patch 6759
+MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r7 81
+MD5 d6389059d144d92d25b21b5cb3727cb0 files/digest-mozilla-firebird-0.7-r1 80
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
diff --git a/net-www/mozilla-firebird/files/MozillaFirebird b/net-www/mozilla-firebird/files/MozillaFirebird
index 3f8c2f6ecbc1..8e1dabfa9f24 100644
--- a/net-www/mozilla-firebird/files/MozillaFirebird
+++ b/net-www/mozilla-firebird/files/MozillaFirebird
@@ -2,7 +2,7 @@
 #
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/files/MozillaFirebird,v 1.2 2004/01/14 20:50:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/files/MozillaFirebird,v 1.3 2004/01/28 04:18:50 agriffis Exp $
 
 # Set to "window" if you prefer new Firebird windows instead of new tabs
 newtype=${MOZILLA_NEWTYPE:-"tab"}
@@ -44,7 +44,7 @@ done
 
 # Try to start in an existing session; check all screens
 declare -a screens=(
-  $(xdpyinfo | awk '
+  $(/usr/X11R6/bin/xdpyinfo | awk '
     /^name of display:/ { 
       disp = substr($NF, 0, index($NF, ".")-1) 
     }
@@ -58,14 +58,15 @@ for s in $DISPLAY "${screens[@]}"; do
 done
 retval=$?
 
-if [[ $retval -eq 2 ]] ; then
-  # No running windows found, so start a new instance
-  ${fbpath}/MozillaFirebird "${args[@]}"
+if [[ $retval -eq 2 || $retval -eq 3 ]] ; then
+  # 2 = No running windows found, so start a new instance
+  # 3 = Thunderbird is running, but doesn't handle openURL command
+  #     (or it might be an unresponsive Firebird)
+  ${fbpath}/MozillaFirebird "${args[@]}" && exit 0
   retval=$?
+  echo "MozillaFirebird exited with non-zero status ($retval)" >&2
 elif [[ $retval -eq 1 ]] ; then
   echo "Unable to connect to X server" >&2
-elif [[ $retval -eq 3 ]] ; then
-  echo "Unable to send command to running Mozilla Firebird instance" >&2
 else
   echo "Unknown error $retval from mozilla-xremote-client" >&2
 fi