Add support for Mozilla Thunderbird and GNOME Evolution 2.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index f6be36a3a0bf5f33b6a2515599bf2d28c99a1676..0957828baf42a8f51c92d471098f35ad162acccd 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-11  Bruno Haible  <bruno@clisp.org>
+
+       * user-email.sh.in: Add support for Mozilla Thunderbird and GNOME
+       Evolution 2. Improve mutt support.
+
 2005-08-26  Bruno Haible  <bruno@clisp.org>
 
        * plural-table.c (plural_table): Add an entry about Romanian.

diff --git a/gettext-tools/src/user-email.sh.in b/gettext-tools/src/user-email.sh.in
index f2d48eff7cf2c4a247bff1621850b3e941b0be7b..873826eb38da520a1c5318eb21437d00fd4a367c 100644 (file)
--- a/gettext-tools/src/user-email.sh.in
+++ b/gettext-tools/src/user-email.sh.in
@@ -95,6 +95,9 @@ files=""
 
 # ----------------------- BEGIN MAILER SPECIFIC CODE -----------------------
 
+# Mozilla Thunderbird addresses
+files="$files .thunderbird/*/prefs.js"
+
 # Mozilla addresses
 files="$files .mozilla/*/prefs.js"
 
@@ -114,7 +117,10 @@ files="$files .kde2/share/config/emaildefaults"
 # KDE kmail addresses
 files="$files .kde2/share/config/kmailrc"
 
-# GNOME evolution addresses
+# GNOME evolution 2 addresses
+files="$files .gconf/apps/evolution/mail/%gconf.xml"
+
+# GNOME evolution 1 addresses
 files="$files evolution/config.xmldb"
 
 # GNOME balsa addresses
@@ -160,8 +166,8 @@ if test -n "$files"; then
 
 # ----------------------- BEGIN MAILER SPECIFIC CODE -----------------------
 
-      # Mozilla addresses
-      .mozilla/*/prefs.js)
+      # Mozilla and Mozilla Thunderbird addresses
+      .mozilla/*/prefs.js | .thunderbird/*/prefs.js)
         addresses="$addresses "`grep -h '^user_pref("mail\.identity\..*\.useremail", ".*");$' $file 2>/dev/null | sed -e 's/^user_pref("mail\.identity\..*\.useremail", "\(.*\)");$/\1/'`
         ;;
 
@@ -197,7 +203,13 @@ if test -n "$files"; then
         addresses="$addresses "`grep -h '^Email Address=' $file 2>/dev/null | sed -e 's/^Email Address=//'`
         ;;
 
-      # GNOME evolution addresses
+      # GNOME evolution 2 addresses
+      .gconf/apps/evolution/mail/%gconf.xml)
+        sedexpr0='s,^.*<addr-spec>\(.*\)</addr-spec>.*$,\1,p'
+        addresses="$addresses "`sed -n -e "$sedexpr0" < $file`
+        ;;
+
+      # GNOME evolution 1 addresses
       evolution/config.xmldb)
         sedexpr0='s/^.*<entry name="identity_address_[0-9]*" type="string" value="\([^"]*\)".*$/\1/p'
         sedexpr1='s/\(..\)/\\x\1/g'
@@ -224,7 +236,15 @@ if test -n "$files"; then
 
       # mutt addresses
       .muttrc)
-        addresses="$addresses "`grep -h '^set from="[^"]*"[    ]*$' $file 2>/dev/null | sed -e 's/^set from="\([^"]*\)"[       ]*$/\1/'`
+        mutt_addresses=`grep -h '^set from="[^"]*"[    ]*$' $file 2>/dev/null | sed -e 's/^set from="\([^"]*\)"[       ]*$/\1/'`
+        if test -n "$mutt_addresses"; then
+          addresses="$addresses $mutt_addresses"
+        else
+          # mutt uses $EMAIL as fallback.
+          if test -n "$EMAIL"; then
+            addresses="$addresses $EMAIL"
+          fi
+        fi
         ;;
 
       # pine addresses