From: Bruno Haible Date: Tue, 18 Feb 2003 13:03:06 +0000 (+0000) Subject: Add support for GNOME evolution, OpenOffice and better support for StarOffice. X-Git-Tag: v0.12~218 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6313de7fcfc8f2c50f80e4b61f1103fa8c5059c;p=thirdparty%2Fgettext.git Add support for GNOME evolution, OpenOffice and better support for StarOffice. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 0c1eb4917..01a2f72d8 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,8 @@ +2003-02-15 Bruno Haible + + * user-email.in: Add support for GNOME evolution, OpenOffice and + StarOffice with nonstandard installation directory. + 2003-02-15 Bruno Haible * msgattrib.c (main): Update year in --version output. diff --git a/gettext-tools/src/user-email.in b/gettext-tools/src/user-email.in index 4157831c1..3957e5ee9 100644 --- a/gettext-tools/src/user-email.in +++ b/gettext-tools/src/user-email.in @@ -1,7 +1,7 @@ #!/bin/sh # Prints the user's email address, with confirmation from the user. # -# Copyright (C) 2001-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,11 +77,18 @@ files="$files .kde2/share/config/emaildefaults" # KDE kmail addresses files="$files .kde2/share/config/kmailrc" +# GNOME evolution addresses +files="$files evolution/config.xmldb" + # GNOME balsa addresses files="$files .gnome/balsa" -# StarOffice addresses -files="$files Office51/sofficerc Office52/user/sofficerc" +# StarOffice and OpenOffice addresses +sed_dos2unix='s/\r$//' +sed_soffice51='s,StarOffice 5\.1=\(.*\)$,\1/sofficerc,p' +sed_soffice52='s,StarOffice 5\.2=\(.*\)$,\1/user/sofficerc,p' +sed_ooffice='s,^OpenOffice[^=]*=\(.*\)$,\1/user/config/registry/instance/org/openoffice/UserProfile.xml,p' +files="$files Office51/sofficerc Office52/user/sofficerc "`sed -n -e "$sed_dos2unix" -e "$sed_soffice51" -e "$sed_soffice52" -e "$sed_ooffice" .sversionrc 2>/dev/null | sed -e 's,^file://*,/,'` # mutt addresses files="$files .muttrc" @@ -153,15 +160,28 @@ if test -n "$files"; then addresses="$addresses "`grep -h '^Email Address=' $file 2>/dev/null | sed -e 's/^Email Address=//'` ;; + # GNOME evolution addresses + evolution/config.xmldb) + sedexpr0='s/^.*\(.*\).*$,\1,p' $file 2>/dev/null` + ;; + # StarOffice addresses # Not a typo. They really write "Adress" with a single d. # German orthography... - Office51/sofficerc | Office52/user/sofficerc) + */sofficerc) addresses="$addresses "`grep -h '^User-Adress=' $file 2>/dev/null | sed -e 's/#[^#]*$//' -e 's/^.*#//'` ;;